Merge pull request #8 from friendsofthinkphp/dev

支持 多应用配置 #7

Author: edenleung

README.md

@@ -29,7 +29,7 @@ $ php think jwt:make
 * `model` 用户模型
 * `refresh` Token过期抛异常code = 50001
 * `relogin` Token失效异常code = 50002
-* `automaticRenewal` [开启过期自动续签](#过期自动续签)
+* `automaticRenewal` [开启过期自动续签](过期自动续签)
 
 以下两个异常都会抛一个HTTP异常 StatusCode = 401
 * `xiaodi\Exception\HasLoggedException`
@@ -142,10 +142,6 @@ return [
 
 `automaticRenewal => true`
 
-满足以下条件 就可以实现过期自动续签
-
-* Token 刷新时间 必须是在有效时间内 
-
 系统检测到 Token 已过期， 会自动续期并返回以下 header 信息。 
 
 * Automatic-Renewal-Token

composer.json

@@ -7,7 +7,7 @@
         "thinkphp"
     ],
     "description": "ThinkPHP Jwt Component",
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "authors": [
         {
             "name": "xiaodi",

config/config.php

@@ -1,25 +1,30 @@
 <?php
 
 return [
-    'default' => [
-        'uniqidKey'    => 'uid',
-        'signerKey'    => '',
-        'notBefore'    => 0,
-        'expiresAt'    => 3600,
-        'refreshTTL'   => 7200,
-        'signer'       => 'Lcobucci\JWT\Signer\Hmac\Sha256',
-        'type'         => 'Header',
-        'refresh'      => 50001,
-        'relogin'      => 50002,
-        'iss'          => '',
-        'aud'          => '',
-        'automaticRenewal' => false,
-    ],
-    'user' => [
-        'inject' => false,
-        'model'  => '',
-    ],
-    'blacklist' => [
-        'cacheName' => 'blacklist',
-    ],
+    'default' => 'admin',
+    'apps' => [
+        'admin' => [
+            'token' => [
+                'uniqidKey'    => 'uid',
+                'signerKey'    => '',
+                'notBefore'    => 0,
+                'expiresAt'    => 3600,
+                'refreshTTL'   => 7200,
+                'signer'       => 'Lcobucci\JWT\Signer\Hmac\Sha256',
+                'type'         => 'Header',
+                'refresh'      => 50001,
+                'relogin'      => 50002,
+                'iss'          => '',
+                'aud'          => '',
+                'automaticRenewal' => false,
+            ],
+            'user' => [
+                'bind' => false,
+                'model'  => '',
+            ],
+            'blacklist' => [
+                'cacheKey' => 'admin',
+            ],
+        ]
+    ]
 ];

src/Blacklist.php

@@ -14,34 +14,35 @@ class Blacklist
 {
     private $app;
 
-    private $store;
+    private $cacheKey;
 
-    protected $cacheName = 'blacklist';
+    protected $cache;
 
     public function __construct(App $app)
     {
         $this->app = $app;
 
-        $this->store = $this->getStore();
+        $this->setStoreConfig();
 
-        $configs = $this->getConfig();
-
-        foreach ($configs as $key => $config) {
-            $this->$key = $config;
-        }
+        $this->cache = $this->getCache();
     }
 
-    public function getConfig()
+    public function setStoreConfig()
     {
-        return $this->app->config->get('jwt.blacklist', []);
+        $store = $this->app->jwt->getStore();
+        $configs = $this->app->config->get("jwt.apps.{$store}.blacklist", []);
+
+        foreach ($configs as $key => $v) {
+            $this->$key = $v;
+        }
     }
 
     /**
      * 获取 缓存驱动.
      *
      * @return void
      */
-    public function getStore()
+    public function getCache()
     {
         return $this->app->cache;
     }
@@ -58,7 +59,7 @@ public function add(Token $token)
         if (false === $this->has($token)) {
             $claims = $token->getClaims();
             $exp = $claims['exp']->getValue() - time();
-            $this->store->push($this->cacheName, (string) $token, $exp);
+            $this->cache->push($this->cacheKey, (string) $token, $exp);
         }
     }
 
@@ -83,6 +84,6 @@ public function has(Token $token): bool
      */
     public function getAll(): array
     {
-        return $this->store->get($this->cacheName, []);
+        return $this->cache->get($this->cacheKey, []);
     }
 }

src/Jwt.php

@@ -17,43 +17,83 @@
 
 class Jwt
 {
-    /**
-     * @var User
-     */
+    use \xiaodi\JWTAuth\Traits\Jwt;
+
+    private $config;
+
+    private $store;
+
     private $user;
 
-    /**
-     * @var Token
-     */
     private $token;
 
-    /**
-     * @var Manager
-     */
-    private $manager;
+    public function __construct(App $app, $store = null)
+    {
+        $this->app = $app;
+        
+        if ($store === null) {
+            $store = $this->getDefaultStore();
+        }
 
-    use \xiaodi\JWTAuth\Traits\Jwt;
+        $this->store = $store;
+        $this->make();
+    }
 
-    public function __construct(App $app, Manager $manager, User $user)
+    public function store(string $name = '')
     {
-        $this->app = $app;
-        $this->manager = $manager;
-        $this->user = $user;
+        $jwt = app('jwt', ['store' => $name], true);
+        $this->app->bind('jwt',  $jwt);
+        return $jwt;
+    }
 
-        $config = $this->getConfig();
-        foreach ($config as $key => $v) {
-            $this->$key = $v;
+    protected function make()
+    {
+        $this->setStoreConfig();
+
+        return $this;
+    }
+
+    public function getStore()
+    {
+        return $this->store;
+    }
+
+    /**
+     * 获取默认 app
+     *
+     * @return void
+     */
+    public function getDefaultStore()
+    {
+        $store = $this->app->config->get("jwt.default", '');
+        if (!$store) {
+            throw new JWTException('默认应用 未配置.', 500);
         }
+
+        return $store;
     }
 
     /**
-     * 获取jwt配置.
+     * 获取 app jwt 配置
      *
-     * @return array
+     * @return void
      */
-    public function getConfig(): array
+    public function getStoreConfig()
     {
-        return $this->app->config->get('jwt.default', []);
+        $config = $this->app->config->get("jwt.apps.{$this->store}.token", []);
+        if (empty($config)) {
+            throw new JWTException("{$this->store} 应用 未配置完整.", 500);
+        }
+
+        return $config;
+    }
+
+    protected function setStoreConfig()
+    {
+        $config = $this->getStoreConfig();
+        foreach ($config as $key => $v) {
+            $this->$key = $v;
+        }
     }
 
     /**
@@ -85,7 +125,7 @@ public function token(array $claims): Token
 
         $token = $builder->getToken($this->getSigner(), $this->makeSignerKey());
 
-        $this->manager->login($token);
+        $this->app['jwt.manager']->login($token);
 
         return $token;
     }
@@ -100,7 +140,7 @@ public function token(array $claims): Token
     private function makeTokenId(array $claims): string
     {
         if (empty($claims[$this->getUniqidKey()])) {
-            throw new JWTException('用户唯一值·uniqidKey·未配置', 500);
+            throw new JWTException('uniqidKey 未配置', 500);
         }
 
         return (string) $claims[$this->getUniqidKey()];
@@ -113,7 +153,12 @@ private function makeTokenId(array $claims): string
      */
     public function user(): Model
     {
-        return $this->user->get();
+        return $this->app['jwt.user']->get();
+    }
+
+    public function getToken()
+    {
+        return $this->token;
     }
 
     /**
@@ -137,7 +182,7 @@ public function refresh(Token $token = null): Token
         unset($claims['aud']);
 
         // 加入黑名单
-        $this->manager->refresh($token);
+        $this->app['jwt.manager']->refresh($token);
 
         return $this->token($claims);
     }
@@ -189,7 +234,7 @@ public function logout(Token $token = null)
     {
         $token = $token ?: $this->getRequestToken();
 
-        $this->manager->logout($token);
+        $this->app['jwt.manager']->logout($token);
     }
 
     /**
@@ -252,7 +297,7 @@ protected function automaticRenewalToken(Token $token)
     protected function validateToken(Token $token)
     {
         // 是否在黑名单
-        if ($this->manager->hasBlacklist($token)) {
+        if ($this->app['jwt.manager']->hasBlacklist($token)) {
             throw new TokenAlreadyEexpired('此 Token 已注销，请重新登录', $this->getReloginCode());
         }
 

src/Middleware/Jwt.php

@@ -14,25 +14,25 @@
 class Jwt
 {
     private $app;
-    private $user;
 
-    public function __construct(App $app, User $user)
+    public function __construct(App $app)
     {
         $this->app = $app;
-        $this->user = $user;
     }
 
-    public function handle($request, \Closure $next)
+    public function handle($request, \Closure $next, $store = 'admin')
     {
-        if (true === $this->app->jwt->verify()) {
-            // 自动注入用户模型
-            if ($this->user->hasInject()) {
-                $user = $this->user->get();
+        if (true === $this->app->jwt->store($store)->verify()) {
+
+            $jwt_user = $this->app['jwt.user'];
+
+            if ($jwt_user->bind()) {
+                $user = $jwt_user->get();
                 // 路由注入
                 $request->user = $user;
 
                 // 绑定当前用户模型
-                $model = $this->user->getModel();
+                $model = $jwt_user->getClass();
                 $this->app->bind($model, $user);
             }