feat:完善sso登录测试用例

Author: qbhy

composer.json

@@ -25,7 +25,7 @@
     "require": {
         "php": ">=7.2",
         "ext-swoole": ">=4.4",
-        "96qbhy/simple-jwt": "^v1.2",
+        "96qbhy/simple-jwt": "^v1.3",
         "hyperf/cache": "^2.0",
         "hyperf/di": "^2.0",
         "ext-json": "*",
@@ -53,7 +53,7 @@
         "sort-packages": true
     },
     "scripts": {
-        "test": "co-phpunit -c phpunit.xml --colors=always",
+        "test": "phpunit -c phpunit.xml --colors=always",
         "analyse": "phpstan analyse --memory-limit 300M -l 0 ./src",
         "cs-fix": "php-cs-fixer fix $1",
         "post-install-cmd": "cghooks add --ignore-lock",
@@ -71,5 +71,11 @@
                 "composer test"
             ]
         }
+    },
+    "repositories": {
+        "packagist": {
+            "type": "composer",
+            "url": "https://mirrors.aliyun.com/composer/"
+        }
     }
 }

src/Guard/JwtGuard.php

@@ -66,7 +66,10 @@ public function parseToken()
 
     public function login(Authenticatable $user)
     {
-        $token = $this->jwtManager->make(['uid' => $user->getId()])->token();
+        $token = $this->jwtManager->make([
+            'uid' => $user->getId(),
+            's' => str_random(),
+        ])->token();
 
         Context::set($this->resultKey($token), $user);
 
@@ -81,15 +84,15 @@ public function login(Authenticatable $user)
      */
     public function resultKey($token)
     {
-        return $this->name . '.auth.result.' . $this->getJti($token);
+        return $this->name . '.auth.result' . $this->getJti($token);
     }
 
     public function user(?string $token = null): ?Authenticatable
     {
         $token = $token ?? $this->parseToken();
         if (Context::has($key = $this->resultKey($token))) {
             $result = Context::get($key);
-            if ($result instanceof \Throwable) {
+            if ($result instanceof UnauthorizedException) {
                 throw $result;
             }
             return $result ?: null;
@@ -141,7 +144,7 @@ public function guest(?string $token = null): bool
      */
     public function refresh(?string $token = null): ?string
     {
-        $token = $token ?? $this->parseToken();
+        $token = $token ?: $this->parseToken();
 
         if ($token) {
             Context::set($this->resultKey($token), null);
@@ -180,13 +183,13 @@ public function getJwtManager(): JWTManager
     /**
      * 获取 token 标识.
      *
-     * @throws \Qbhy\SimpleJwt\Exceptions\TokenExpiredException
      * @throws \Qbhy\SimpleJwt\Exceptions\InvalidTokenException
      * @throws \Qbhy\SimpleJwt\Exceptions\SignatureException
+     * @throws \Qbhy\SimpleJwt\Exceptions\TokenExpiredException
      * @return mixed|string
      */
     protected function getJti(string $token): string
     {
-        return $this->getJwtManager()->parse($token)->getPayload()['jti'] ?? md5($token);
+        return $this->getJwtManager()->justParse($token)->getPayload()['jti'] ?? md5($token);
     }
 }

src/Guard/SsoGuard.php

@@ -47,15 +47,14 @@ public function getClients(): array
 
     public function login(Authenticatable $user, string $client = null)
     {
-        $client = $client = $this->getClients()[0]; // 需要至少配置一个客户端
+        $client = $client ?: $this->getClients()[0]; // 需要至少配置一个客户端
         $token = parent::login($user);
         $redisKey = str_replace('{uid}', (string) $user->getId(), $this->config['redis_key'] ?? 'u:token:{uid}');
 
-        if (! empty($previousToken = $this->redis->hGet($redisKey, $client))) {
+        if (! empty($previousToken = $this->redis->hGet($redisKey, $client)) && $previousToken != $token) {
             // 如果存在上一个 token，就给他拉黑，也就是强制下线
-            Context::set($this->resultKey($previousToken), 0);
-            $this->getJwtManager()->addBlacklist($previousToken);
-            $this->redis->hDel($redisKey, $client);
+            Context::set($this->resultKey($previousToken), null);
+            $this->getJwtManager()->addBlacklist($this->getJwtManager()->justParse($previousToken));
             $this->eventDispatcher->dispatch(new ForcedOfflineEvent($user, $client));
         }
 

src/helper.php

@@ -30,3 +30,16 @@ function auth(?string $guard = null)
         return $auth->guard($guard);
     }
 }
+
+if (! function_exists('str_random')) {
+    function str_random($num = 6): string
+    {
+        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $randomString = '';
+        for ($i = 0; $i < $num; ++$i) {
+            $index = rand(0, strlen($characters) - 1);
+            $randomString .= $characters[$index];
+        }
+        return $randomString;
+    }
+}

tests/Cases/ExampleTest.php

@@ -101,18 +101,20 @@ public function testSsoGuard()
         $this->assertTrue(is_string($token));
         $this->assertTrue($guard->check($token));
 
-//        // 抢线登录
-//        $newToken = $guard->login($user, 'pc');
-//        var_dump('抢线的token', $newToken);
-//        $this->assertTrue($newToken != $token);
-//        $this->assertTrue($guard->check($newToken));
-//
-//        // 测试旧 token 还能不能用
-//        $this->assertTrue($guard->guest($token));
-//
-//        // 第二个设备登录
-//        $weappToken = $guard->login($user, 'weapp');
-//        $this->assertTrue($guard->check($weappToken));
+        // 抢线登录
+        $newToken = $guard->login($user, 'pc');
+        $this->assertTrue($newToken != $token);
+        $this->assertTrue($guard->check($newToken));
+
+        // 测试掉线的 token 还能不能用
+        $this->assertTrue($guard->guest($token));
+
+        // 第二个设备登录
+        $weappToken = $guard->login($user, 'weapp');
+        $this->assertTrue($guard->check($weappToken));
+
+        $this->assertTrue((1 ?: 2) == 1);
+        $this->assertTrue((1 ?? 2) == 1);
     }
 
     protected function auth()