update

Author: edenleung

src/Config/Token.php

@@ -37,7 +37,7 @@ public function getSigningKey()
             throw new JWTException('config signer_key required.', 500);
         }
 
-        return $this->signer_key;
+        return base64_encode($this->signer_key);
     }
 
     public function getIdKey(): string

src/Service/Jwt.php

@@ -4,6 +4,7 @@
 
 namespace xiaodi\JWTAuth\Service;
 
+use DateTime;
 use think\App;
 
 use Lcobucci\JWT\Token as JwtToken;
@@ -38,7 +39,7 @@ public function store(string $store = null): self
         if ($store) {
             $this->store = $store;
         }
-        
+
         return $this;
     }
 
@@ -82,52 +83,21 @@ public function getToken()
      * @param string $token
      * @return boolean
      */
-    public function verify(?string $token = null): bool
+    public function verify(?string $token): bool
     {
+        $service = $this->app->get('jwt.token');
         if (!$token) {
-            $token = $this->app->get('jwt.token')->getRequestToken();
+            $token = $service->getRequestToken();
         }
 
-        return $this->app->get('jwt.token')->verify($token);
-    }
-
-    public function destroyStoreWhitelist($store)
-    {
-        return $this->app->get('jwt.manager')->destroyStoreWhitelist($store);
-    }
-
-    public function user()
-    {
-        return $this->app->get('jwt.user');
-    }
-
-    public function type()
-    {
-        return $this->app->get('jwt.token')->getType();
-    }
-
-    public function refreshTTL()
-    {
-        return $this->app->get('jwt.token')->getRefreshTTL();
-    }
-
-    public function ttl()
-    {
-        return $this->app->get('jwt.token')->getRefreshTTL();
-    }
-
-    public function refresh(?string $token = null)
-    {
-        return $this->app->get('jwt.token')->refresh($token);
-    }
+        if (!$service->verify($token)) {
+            $token = $service->getToken();
+            if ($token->isExpired(new DateTime())) {
+                // todo 过期
+            }
 
-    public function logout(?string $token = null)
-    {
-        return $this->app->get('jwt.token')->logout($token);
-    }
+        }
 
-    public function destroyToken($jti, $store)
-    {
-        return $this->app->get('jwt.manager')->destroyToken($jti, $store);
+        return true;
     }
 }

src/Service/Token.php

@@ -15,6 +15,7 @@
 use Lcobucci\JWT\Validation\Constraint\SignedWith;
 use Lcobucci\JWT\Validation\Constraint\ValidAt;
 use Lcobucci\Clock\SystemClock;
+use xiaodi\JWTAuth\Exception\JWTException;
 
 /**
  *
@@ -58,7 +59,7 @@ protected function init()
         $this->initJwtConfiguration();
     }
 
-    protected function initJwtConfiguration()
+    public function initJwtConfiguration()
     {
         $this->jwtConfiguration = Configuration::forSymmetricSigner(
             $this->config->getSigner(),
@@ -104,14 +105,19 @@ public function getExpiryDateTime($now): DateTimeImmutable
         return $now->modify("+{$ttl} sec");
     }
 
-    public function parseToken(string $token): JwtToken
+    /**
+     *
+     * @param string $token
+     * @return JwtToken
+     */
+    public function parse(string $token): JwtToken
     {
-        $token = $this->jwtConfiguration->parser()->parse($token);
-        return $token;
+        $this->token = $this->jwtConfiguration->parser()->parse($token);
+
+        return $this->token;
     }
 
     /**
-     * 验证成功的Token
      *
      * @return JWTToken
      */
@@ -120,22 +126,32 @@ public function getToken(): ?JwtToken
         return $this->token;
     }
 
+    /**
+     * 
+     * @param string $token
+     * @return boolean|null
+     */
     public function verify(string $token): ?bool
     {
-        $this->token = $this->parseToken($token);
+        $this->validate($token);
+    }
 
+    /**
+     * 效验 Token
+     * @param string $token
+     * @return boolean
+     */
+    public function validate(string $token)
+    {
+        $token = $this->parse($token);
         $this->jwtConfiguration->setValidationConstraints(
             new ValidAt(new SystemClock(new DateTimeZone(\date_default_timezone_get()))),
             new SignedWith($this->jwtConfiguration->signer(), $this->jwtConfiguration->signingKey())
         );
 
         $constraints = $this->jwtConfiguration->validationConstraints();
 
-        if (!$this->jwtConfiguration->validator()->validate($this->token, ...$constraints)) {
-            throw new JWTException('效验失败', 401);
-        }
-
-        return true;
+        return $this->jwtConfiguration->validator()->validate($token, ...$constraints);
     }
 
     public function logout(?string $token): void