update

Author: edenleung

src/Service/Jwt.php

@@ -81,4 +81,9 @@ public function verify(string $token): bool
     {
         return $this->app->get('jwt.token')->verify($token);
     }
+
+    public function destroyStoreWhitelist($store)
+    {
+        return $this->app->get('jwt.manager')->destroyStoreWhitelist($store);
+    }
 }

src/Service/Manager.php

@@ -6,9 +6,7 @@
 
 use Lcobucci\JWT\Token;
 use think\App;
-use think\Container;
 use xiaodi\JWTAuth\Config\Manager as Config;
-use xiaodi\JWTAuth\Exception\JWTException;
 
 class Manager
 {
@@ -37,42 +35,106 @@ protected function resloveConfig()
         $this->config = new Config($options);
     }
 
-    public function login(Token $token)
+    public function login(Token $token): void
     {
         $jti = $token->getClaim('jti');
         $store = $token->getClaim('store');
 
         $exp = $token->getClaim('exp') - time();
 
         if ($this->app->get('jwt.sso')->getEnable()) {
-            $this->pushBlacklist($store, $jti, (string) $token, $exp);
+            $this->handleSSO($store, $jti, (string) $token, $exp);
         }
-        
+
         $this->pushWhitelist($store, $jti, (string) $token, $exp);
     }
 
-    protected function pushWhitelist($store, $jti, string $value, $exp)
+    protected function handleSSO($store, $jti, $token, $exp)
+    {
+        $key = $this->formatWhiteKey($store, $jti);
+        if ($this->app->cache->has($key)) {
+            $this->clearCache($store, $this->config->getWhitelist(), $jti);
+            $this->pushBlacklist($store, $jti, (string) $token, $exp);
+        }
+    }
+
+    protected function pushWhitelist($store, $jti, string $value, $exp): void
+    {
+        $this->setCache($store, $this->config->getWhitelist(), $jti, $value, $exp);
+    }
+
+    protected function pushBlacklist($store, $jti, string $value, $exp): void
+    {
+        $this->setCache($store, $this->config->getBlacklist(), $jti, $value, $exp);
+    }
+
+    public function logout(Token $token): void
+    {
+        $jti = $token->getClaim('jti');
+        $store = $token->getClaim('store');
+
+        $exp = $token->getClaim('exp') - time();
+        $this->pushBlacklist($store, $jti, (string) $token, $exp);
+    }
+
+    public function destroyStoreWhitelist($store): void
+    {
+        $this->clearStoreWhitelist($store);
+    }
+
+    public function destroyStoreBlacklist($store): void
+    {
+        $this->clearStoreBlacklist($store);
+    }
+
+    public function destroyToken($id, $store): void
+    {
+        $this->clearCache($store, $this->config->getWhitelist(), $id);
+    }
+
+    protected function clearStoreWhitelist($store): void
+    {
+        $this->clearTag($store . '-' . $this->config->getWhitelist());
+    }
+
+    protected function clearStoreBlacklist($store): void
+    {
+        $this->clearTag($store . '-' . $this->config->getBlacklist());
+    }
+
+    private function clearTag($tag): void
     {
-        $this->setCache($store, 'whitelist', $jti, $value, $exp);
+        $this->app->cache->tag($tag)->clear();
     }
 
-    protected function pushBlacklist($store, $jti, string $value, $exp)
+    private function setCache($store, $type, $uid, $value, $exp): void
     {
-        $this->setCache($store, 'blacklist', $jti, $value, $exp);
+        $key = $this->formatKey($store, $type, $uid);
+
+        $this->app->cache->tag($store . '-' . $type)->set($key, $value, $exp);
     }
 
-    private function setCache($store, $type, $uid, $value, $exp)
+    protected function formatWhitelist($store, $uid): string
     {
-        $key = implode(':', ['jwt', $store, $type, $uid]);
-        $this->app->cache->set($key, $value, $exp);
+        return $this->formatKey($store, $this->config->getWhitelist(), $uid);
     }
 
-    public function logout()
-    {}
+    protected function formatBlacklist($store, $uid): string
+    {
+        return $this->formatKey($store, $this->config->getBlacklist(), $uid);
+    }
 
-    public function destroyStore($store)
-    {}
+    private function formatKey($store, $type, $uid): string
+    {
+        $key = implode(':', [$this->config->getPrefix(), $store, $type, $uid]);
 
-    public function destroyToken($id)
-    {}
+        return $key;
+    }
+
+    private function clearCache($store, $type, $uid): void
+    {
+        $key = $this->formatKey($store, $type, $uid);
+
+        $this->app->cache->delete($key);
+    }
 }