update

Author: edenleung

src/JwtService.php

@@ -8,6 +8,7 @@
 use xiaodi\JWTAuth\Service\Manager;
 use xiaodi\JWTAuth\Service\Token;
 use xiaodi\JWTAuth\Service\SSO;
+use xiaodi\JWTAuth\Service\User;
 
 class JwtService extends \think\Service
 {
@@ -17,6 +18,7 @@ public function register()
         $this->app->bind('jwt.manager', Manager::class);
         $this->app->bind('jwt.token', Token::class);
         $this->app->bind('jwt.sso', SSO::class);
+        $this->app->bind('jwt.user', User::class);
     }
 
     public function boot()

src/Service/Jwt.php

@@ -67,8 +67,9 @@ public function token(array $claims): JwtToken
         return $token;
     }
 
-    public function user()
+    public function getToken()
     {
+        return $this->app->get('jwt.token')->getToken();
     }
 
     /**
@@ -86,4 +87,9 @@ public function destroyStoreWhitelist($store)
     {
         return $this->app->get('jwt.manager')->destroyStoreWhitelist($store);
     }
+
+    public function user()
+    {
+        return $this->app->get('jwt.user');
+    }
 }

src/Service/Token.php

@@ -33,6 +33,12 @@ class Token
      */
     protected $claims;
 
+    /**
+     *
+     * @var JwtToken
+     */
+    protected $token;
+
     public function __construct(App $app)
     {
         $this->app = $app;
@@ -141,27 +147,37 @@ protected function parseToken(string $token): JwtToken
         return $token;
     }
 
+    /**
+     * 验证成功的Token
+     *
+     * @return JWTToken
+     */
+    public function getToken(): ?JwtToken
+    {
+        return $this->token;
+    }
+
     public function verify(string $token): ?bool
     {
-        $token = $this->parseToken($token);
+        $this->token = $this->parseToken($token);
 
-        if (false === $token->verify($this->config->getSigner(), $this->config->makeSignerKey())) {
+        if (false === $this->token->verify($this->config->getSigner(), $this->config->makeSignerKey())) {
             throw new JWTException('此 Token 与 密钥不匹配', $this->config->getReloginCode());
         }
 
         // Token 是否已可用
         $now = time();
-        $exp = $token->getClaim('nbf');
+        $exp = $this->token->getClaim('nbf');
         if ($now < $exp) {
             throw new JWTException('此 Token 暂未可用', 500);
         }
 
         // 是否已过期
-        if (true === $token->isExpired()) {
-            if ($now <= $token->getClaim('refreshAt')) {
+        if (true === $this->token->isExpired()) {
+            if ($now <= $this->token->getClaim('refreshAt')) {
                 // 是否开启自动续签
                 if ($this->config->getAutomaticRenewal()) {
-                    $token = $this->automaticRenewalToken($token);
+                    $this->token = $this->automaticRenewalToken($this->token);
                 } else {
                     throw new TokenAlreadyEexpired('Token 已过期，请重新刷新', $this->config->getReloginCode());
                 }
@@ -172,12 +188,12 @@ public function verify(string $token): ?bool
 
         $data = new ValidationData();
 
-        $jwt_id = $token->getHeader('jti');
+        $jwt_id = $this->token->getHeader('jti');
         $data->setIssuer($this->config->getIss());
         $data->setAudience($this->config->getAud());
         $data->setId($jwt_id);
 
-        if (!$token->validate($data)) {
+        if (!$this->token->validate($data)) {
             throw new JWTException('此 Token 效验不通过', $this->config->getReloginCode());
         }
 

src/Service/User.php

@@ -4,9 +4,11 @@
 
 namespace xiaodi\JWTAuth\Service;
 
+use Exception;
 use think\App;
 use think\Model;
 use xiaodi\JWTAuth\Config\User as Config;
+use xiaodi\JWTAuth\Exception\JWTException;
 
 class User
 {
@@ -39,4 +41,25 @@ protected function resolveConfig(): array
 
         return $options;
     }
+
+    protected function getClass(): string
+    {
+        $store = $this->getStore();
+        $class = $this->config->getClass();
+        if (!$class) {
+            throw new JWTException("{$store}应用未配置用户模型文件");
+        }
+
+        return $class;
+    }
+
+    public function get()
+    {
+        $class = $this->getClass();
+        $token = $this->app->get('jwt')->getToken();
+        $uid = $token->getHeader('jti');
+
+        $model = new $class();
+        return $model->find($uid);
+    }
 }