feature: 移动 Auth

Author: krissss

README.md

@@ -35,7 +35,7 @@ composer require kriss/webman-auth
 ### 认证授权方法
 
 ```php
-use Kriss\WebmanAuth\facade\Auth;
+use Kriss\WebmanAuth\Auth;
 
 $guard = Auth::guard(); // 获取默认的 guard
 $guard = Auth::guard('admin'); // 获取指定名称的 guard

examples/multi-user/app/admin/controller/AuthController.php

@@ -3,7 +3,7 @@
 namespace app\admin\controller;
 
 use app\model\Admin;
-use Kriss\WebmanAuth\facade\Auth;
+use Kriss\WebmanAuth\Auth;
 use support\Request;
 use support\Response;
 

examples/multi-user/app/api/controller/AuthController.php

@@ -3,7 +3,7 @@
 namespace app\api\controller;
 
 use app\model\User;
-use Kriss\WebmanAuth\facade\Auth;
+use Kriss\WebmanAuth\Auth;
 use support\Request;
 use support\Response;
 

…ser/app/middleware/AuthenticateAdmin.php …ser/app/middleware/SetAuthGuardAdmin.phpexamples/multi-user/app/middleware/AuthenticateAdmin.php renamed to examples/multi-user/app/middleware/SetAuthGuardAdmin.php examples/multi-user/app/middleware/AuthenticateAdmin.php renamed to examples/multi-user/app/middleware/SetAuthGuardAdmin.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Kriss\WebmanAuth;
+
+use Kriss\WebmanAuth\Interfaces\GuardInterface;
+use Kriss\WebmanAuth\Middleware\SetAuthGuard;
+
+class Auth
+{
+    const REQUEST_AUTH_MANAGER = 'auth_manager';
+
+    /**
+     * guard
+     * 当使用 Middleware/SetAuthGuard 后，可以获取到当前的 Guard
+     * @param string|null $name
+     * @return GuardInterface|null
+     */
+    public static function guard(string $name = null): ?GuardInterface
+    {
+        if ($authManager = static::getAuthManager()) {
+            $name = $name ?: request()->{SetAuthGuard::REQUEST_GUARD_NAME};
+            return $authManager->guard($name);
+        }
+        return null;
+    }
+
+    /**
+     * @return AuthManager|null
+     */
+    public static function getAuthManager(): ?AuthManager
+    {
+        $request = request();
+        if (!$request) {
+            return null;
+        }
+        if (!$request->{static::REQUEST_AUTH_MANAGER}) {
+            $request->{static::REQUEST_AUTH_MANAGER} = new AuthManager();
+        }
+        return $request->{static::REQUEST_AUTH_MANAGER};
+    }
+}

src/Auth.php

@@ -2,7 +2,7 @@
 
 namespace Kriss\WebmanAuth\Middleware;
 
-use Kriss\WebmanAuth\facade\Auth;
+use Kriss\WebmanAuth\Auth;
 use Kriss\WebmanAuth\Interfaces\GuardInterface;
 use Kriss\WebmanAuth\Interfaces\IdentityInterface;
 use Webman\Http\Request;

src/Middleware/Authentication.php

@@ -2,41 +2,9 @@
 
 namespace Kriss\WebmanAuth\facade;
 
-use Kriss\WebmanAuth\AuthManager;
-use Kriss\WebmanAuth\Interfaces\GuardInterface;
-use Kriss\WebmanAuth\Middleware\SetAuthGuard;
-
-class Auth
+/**
+ * @deprecated
+ */
+class Auth extends \Kriss\WebmanAuth\Auth
 {
-    const REQUEST_AUTH_MANAGER = 'auth_manager';
-
-    /**
-     * guard
-     * 当使用 Middleware/SetAuthGuard 后，可以获取到当前的 Guard
-     * @param string|null $name
-     * @return GuardInterface|null
-     */
-    public static function guard(string $name = null): ?GuardInterface
-    {
-        if ($authManager = static::getAuthManager()) {
-            $name = $name ?: request()->{SetAuthGuard::REQUEST_GUARD_NAME};
-            return $authManager->guard($name);
-        }
-        return null;
-    }
-
-    /**
-     * @return AuthManager|null
-     */
-    public static function getAuthManager(): ?AuthManager
-    {
-        $request = request();
-        if (!$request) {
-            return null;
-        }
-        if (!$request->{static::REQUEST_AUTH_MANAGER}) {
-            $request->{static::REQUEST_AUTH_MANAGER} = new AuthManager();
-        }
-        return $request->{static::REQUEST_AUTH_MANAGER};
-    }
 }