Merge pull request #17 from tx9991/a9991

refresh_token进行储存reids

Author: Tinywan

src/JwtToken.php

@@ -121,7 +121,8 @@ public static function refreshToken(): array
         }
         if ($config['is_single_device']) {
             $client = $extend['extend']['client'] ?? self::TOKEN_CLIENT_WEB;
-            RedisHandler::generateToken($config['cache_token_pre'], (string)$client, (string)$extend['extend']['id'], $extend['exp'], $newToken['access_token']);
+            RedisHandler::generateToken($config['cache_token_pre'], (string)$client, (string)$extend['extend']['id'], $config['access_exp'], $newToken['access_token']);
+            RedisHandler::refreshToken($config["cache_refresh_token_pre"], (string)$client, (string)$extend['extend']['id'], $config['refresh_exp'], $newToken['refresh_token']);
         }
         return $newToken;
     }
@@ -154,6 +155,7 @@ public static function generateToken(array $extend): array
         if ($config['is_single_device']) {
             $client = $extend['client'] ?? self::TOKEN_CLIENT_WEB;
             RedisHandler::generateToken($config['cache_token_pre'], (string)$client, (string)$extend['id'], $config['access_exp'], $token['access_token']);
+            RedisHandler::generateToken($config["cache_refresh_token_pre"], (string)$client, (string)$extend['id'], $config['refresh_exp'], $token['refresh_token']);
         }
         return $token;
     }
@@ -250,9 +252,13 @@ private static function verifyToken(string $token, int $tokenType): array
 
         $decoded = JWT::decode($token, new Key($publicKey, $config['algorithms']));
         $decodeToken = json_decode(json_encode($decoded), true);
-        if ($config['is_single_device'] && self::ACCESS_TOKEN == $tokenType) {
+        if ($config['is_single_device']) {
+            $cacheTokenPre = $config['cache_token_pre'];
+            if ($tokenType == self::REFRESH_TOKEN) {
+                $cacheTokenPre = $config['cache_refresh_token_pre'];
+            }
             $client = $decodeToken['extend']['client'] ?? self::TOKEN_CLIENT_WEB;
-            RedisHandler::verifyToken($config['cache_token_pre'], $client, (string)$decodeToken['extend']['id'], $token);
+            RedisHandler::verifyToken($cacheTokenPre, $client, (string)$decodeToken['extend']['id'], $token);
         }
         return $decodeToken;
     }
@@ -365,7 +371,9 @@ public static function clear(string $client = self::TOKEN_CLIENT_WEB): bool
     {
         $config = self::_getConfig();
         if ($config['is_single_device']) {
-            return RedisHandler::clearToken($config['cache_token_pre'], $client, (string)self::getCurrentId());
+            $clearCacheRefreshTokenPre = RedisHandler::clearToken($config['cache_refresh_token_pre'], $client, (string)self::getCurrentId());
+            $clearCacheTokenPre = RedisHandler::clearToken($config['cache_token_pre'], $client, (string)self::getCurrentId());
+            return $clearCacheTokenPre && $clearCacheRefreshTokenPre;
         }
         return true;
     }

src/RedisHandler.php

@@ -36,6 +36,26 @@ public static function generateToken(string $pre, string $client, string $uid, i
         Redis::setex($cacheKey, $ttl, $token);
     }
 
+
+    /**
+     * @desc: 刷新存储的缓存令牌
+     * @param string $pre
+     * @param string $client
+     * @param string $uid
+     * @param int $ttl
+     * @param string $token
+     * @return void
+     */
+    public static function refreshToken(string $pre, string $client, string $uid, int $ttl, string $token): void
+    {
+        $cacheKey = $pre . $client . ':' . $uid;
+        $key = Redis::keys($cacheKey . '*');
+        if (!empty($key)) {
+            $ttl = Redis::ttl($cacheKey);
+        }
+        Redis::setex($cacheKey, $ttl, $token);
+    }
+
     /**
      * @desc: 检查设备缓存令牌
      * @param string $pre

src/config/plugin/tinywan/jwt/app.php

@@ -39,6 +39,9 @@
         /** 缓存令牌前缀，默认 JWT:TOKEN: */
         'cache_token_pre' => 'JWT:TOKEN:',
 
+        /** 缓存刷新令牌前缀，默认 JWT:REFRESH_TOKEN: */
+        'cache_refresh_token_pre' => 'JWT:REFRESH_TOKEN:',
+
         /** 用户信息模型 */
         'user_model' => function ($uid) {
             return [];