update

Author: edenleung

README.md

@@ -30,26 +30,28 @@ $ php think jwt:make
 <?php
 
 return [
-    'default' => 'admin',
-    'apps' => [
+    'stores' => [
         'admin' => [
+            'sso' => [
+                'enable' => false,
+            ],
             'token' => [
-                'uniqidKey'    => 'uid',
-                'signerKey'    => '',
-                'notBefore'    => 0,
-                'expiresAt'    => 3600,
-                'refreshTTL'   => 7200,
+                'unique_id_key' => 'uid',
+                'signer_key'    => 'tant',
+                'not_before'    => 0,
+                'expires_at'    => 3600,
+                'refresh_ttL'   => 7200,
                 'signer'       => 'Lcobucci\JWT\Signer\Hmac\Sha256',
                 'type'         => 'Header',
-                'refresh'      => 50001,
-                'relogin'      => 50002,
-                'iss'          => '',
-                'aud'          => '',
-                'automaticRenewal' => false,
+                'relogin_code'      => 50001,
+                'refresh_code'      => 50002,
+                'iss'          => 'client.tant',
+                'aud'          => 'server.tant',
+                'automatic_renewal' => false,
             ],
             'user' => [
                 'bind' => false,
-                'model'  => '',
+                'class'  => null,
             ]
         ]
     ],
@@ -65,49 +67,42 @@ return [
 
 ```
 ## token
-* `uniqidKey` 用户唯一标识
-* `signerKey` 密钥
-* `notBefore` 时间前不能使用 默认生成后直接使用
-* `expiresAt` Token有效期（秒）
+* `unique_id_key` 用户唯一标识
+* `signer_key` 密钥
+* `not_before` 时间前不能使用 默认生成后直接使用
+* `refresh_ttL` Token有效期（秒）
 * `signer` 加密算法
 * `type`  获取 Token 途径
-* `refresh` Token过期抛异常code = 50001
-* `relogin` Token失效异常code = 50002
-* `automaticRenewal` [开启过期自动续签](#过期自动续签)
+* `relogin_code` Token过期抛异常code = 50001
+* `refresh_code` Token失效异常code = 50002
+* `automatic_renewal` [开启过期自动续签](#过期自动续签)
 
 ## user
 * `bind` 是否注入用户模型(中间件有效)
-* `model` 用户模型文件 
+* `class` 用户模型类文件 
 
-## blacklist
-* `cacheKey` 黑名单缓存key
+## manager
+* `prefix` 缓存前缀
+* `blacklist` 黑名单缓存名
+* `whitelist` 白名单缓存名
 
 以下两个异常都会抛一个HTTP异常 StatusCode = 401
 * `xiaodi\Exception\HasLoggedException`
 * `xiaodi\Exception\TokenAlreadyEexpired`
 
 ## Token 生成
 ```php
+namespace app\home\controller\Auth;
+
 use xiaodi\JWTAuth\Facade\Jwt;
 
 public function login()
 {
     //...登录判断逻辑
 
-    // 默认应用
+    // 自动获取当前应用下的jwt配置
     return json([
         'token' => Jwt::token(['uid' => 1]),
-        'token_type' => Jwt::type(),
-        'expires_in' => Jwt::ttl(),
-        'refresh_in' => Jwt::refreshTTL()
-    ]);
-    
-    // 指定应用
-    return json([
-        'token' => Jwt::store('wechat')->token(['uid' => 1]),
-        'token_type' => Jwt::type(),
-        'expires_in' => Jwt::ttl(),
-        'refresh_in' => Jwt::refreshTTL()
     ]);
 }
 ```
@@ -124,20 +119,12 @@ class User {
 
     public function test()
     {
-        try {
-            // 默认应用
-            Jwt::verify($token);
-            
-            // 指定应用
-            // Jwt::store('wechat')->verify($token);
-        } catch (HasLoggedException $e) {
-            // 已在其它终端登录
-        } catch (TokenAlreadyEexpired $e) {
-            // Token已过期
+        if (true === Jwt::verify($token)) {
+            // 验证成功
         }
 
         // 验证成功
-        // 如 开启用户注入功能 可获取当前用户信息
+        // 如配置用户模型文件 可获取当前用户信息
         dump(Jwt::user());
     }
 }
@@ -148,11 +135,7 @@ class User {
 ```php
 use xiaodi\JWTAuth\Middleware\Jwt;
 
-// 默认应用
 Route::get('/hello', 'index/index')->middleware(Jwt::class);
-
-// 指定应用
-Route::get('/hello', 'index/index')->middleware(Jwt::class, 'wechat');
 ```
 
 ## Token 自动获取

src/Config/Token.php

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace xiaodi\JWTAuth\Config;
 
@@ -88,4 +88,8 @@ public function getAutomaticRenewal()
         return $this->automatic_renewal;
     }
 
+    public function getTokenType()
+    {
+        return $this->type;
+    }
 }

src/Middleware/Jwt.php

@@ -6,43 +6,39 @@
 
 use think\App;
 use xiaodi\JWTAuth\Exception\JWTException;
-use xiaodi\JWTAuth\User;
 
 /**
  * 中间件.
  */
 class Jwt
 {
-    private $app;
+    protected $app;
 
     public function __construct(App $app)
     {
         $this->app = $app;
     }
 
-    public function handle($request, \Closure $next, $store = 'admin')
+    public function handle($request, \Closure $next)
     {
         // 暂时修复 6.0.3 options 问题
         if ($request->isOptions()) {
             return $next($request);
         }
-        
-        if (true === $this->app->jwt->store($store)->verify()) {
-
-            $user = $this->app['jwt.user'];
-
-            if ($user->bind()) {
-                $info = $user->get();
-                if (!$info){
-                    throw new JWTException('没有此用户', 401);
-                } 
-                
-                // 路由注入
-                $request->user = $info;
-                
-                // 绑定当前用户模型
-                $model = $user->getClass();
-                $this->app->bind($model, $info);
+
+        if (true === $this->app->get('jwt')->verify()) {
+
+            $user = $this->app->get('jwt.user');
+
+            if ($user->getBind()) {
+                if ($info = $user->get()) {
+                    // 路由注入
+                    $request->user = $info;
+
+                    // 绑定当前用户模型
+                    $model = $user->getClass();
+                    $this->app->bind($model, $info);
+                }
             }
 
             return $next($request);

src/Service/Jwt.php

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace xiaodi\JWTAuth\Service;
 
@@ -78,8 +78,12 @@ public function getToken()
      * @param string $token
      * @return boolean
      */
-    public function verify(string $token): bool
+    public function verify(?string $token = null): bool
     {
+        if (!$token) {
+            $token = $this->app->get('jwt.token')->getRequestToken();
+        }
+
         return $this->app->get('jwt.token')->verify($token);
     }
 

src/Service/Token.php

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace xiaodi\JWTAuth\Service;
 
@@ -11,7 +11,9 @@
 use Lcobucci\JWT\Parser;
 use xiaodi\JWTAuth\Config\Token as Config;
 use xiaodi\JWTAuth\Exception\JWTException;
+use xiaodi\JWTAuth\Exception\JWTInvalidArgumentException;
 use xiaodi\JWTAuth\Exception\TokenAlreadyEexpired;
+use xiaodi\JWTAuth\Handle\RequestToken;
 
 /**
  * Undocumented class
@@ -199,4 +201,18 @@ public function verify(string $token): ?bool
 
         return true;
     }
+
+    /**
+     * 自动获取请求下的Token.
+     *
+     * @return string
+     */
+    protected function getRequestToken(): string
+    {
+        $requestToken = new RequestToken($this->app);
+
+        $token = $requestToken->get($this->config->getTokenType());
+
+        return $token;
+    }
 }