更新jwt 可保存 object类型

webguosai · Oct 28, 2022 · 0f991dd · 0f991dd
1 parent 9a88012
commit 0f991dd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 67 deletions.
diff --git a/src/Authentication/Authentication.php b/src/Authentication/Authentication.php
diff --git a/src/Authentication/Driver/Session.php b/src/Authentication/Driver/Session.php
diff --git a/src/Authentication/Driver/Jwt.php → src/Authentication/JwtToken.php b/src/Authentication/Driver/Jwt.php → src/Authentication/JwtToken.php
@@ -1,30 +1,37 @@
 <?php
 
-namespace Webguosai\Authentication\Driver;
+namespace Webguosai\Authentication;
 
-use Webguosai\Authentication\Authentication;
 use Webguosai\Authentication\Exception\TokenExpiredException;
 use Webguosai\Authentication\Exception\TokenInvalidException;
 use Webguosai\Http\Request;
 use Webguosai\Util\Jwt as JWTUtil;
 
-class Jwt implements Authentication
+class JwtToken
 {
     protected $queryKey = 'token';
     public $pre = 'Bearer ';
 
+    public function __construct($jwtSecret)
+    {
+        JWTUtil::setConfig($jwtSecret);
+    }
+
     /**
      * 解析
+     * @param null $jwt
      * @return mixed
      * @throws TokenExpiredException
      * @throws TokenInvalidException
      */
-    public function parse()
+    public function parse($jwt = null)
     {
-        $jwt = $this->fromQuery();
-
         if (is_null($jwt)) {
-            $jwt = $this->fromHeader();
+            $jwt = $this->fromQuery();
+
+            if (is_null($jwt)) {
+                $jwt = $this->fromHeader();
+            }
         }
 
         return $this->parseJwt($jwt);

diff --git a/src/Util/Jwt.php b/src/Util/Jwt.php
@@ -2,22 +2,12 @@
 
 namespace Webguosai\Util;
 
-/**
- * jwt类
- * 演示：
- *
-Jwt::setConfig('key123456', 'domain.com');
-$code = Jwt::encode(1111, 5);
-dump($code);
-dd(JWT::decode($code));
- *
- */
 class Jwt
 {
     const ALG = 'HS256';
     private static $key = 'GkhFiMmJQYFeiUJ8NxXjr22tbgFXFg6IHSaQR2HK8qU3tMHFlYWBTs6gn2kN7QEq';
-    private static $domain = '';
-    public static function setConfig($key, $domain)
+    private static $domain;
+    public static function setConfig($key, $domain = '')
     {
         self::$key = $key;
         self::$domain = $domain;
@@ -43,7 +33,7 @@ public static function encode($data, int $exp = 3600, string $iss = null, string
             "iat" => $time,
             // 定义在什么时间之前，该jwt都是不可用的
             "nbf" => $time,
-            'data' => json_encode($data)
+            'data' => serialize($data)
         ];
         if ($exp) {
             $token['exp'] = $time + $exp;
@@ -60,7 +50,8 @@ public static function decode(string $jwt)
     {
         try {
             $params = \Firebase\JWT\JWT::decode($jwt, new \Firebase\JWT\Key(self::$key, self::ALG));
-            return json_decode($params->data, true);
+//            return json_decode($params->data, true);
+            return unserialize($params->data);
         } catch (\Exception $e) {
             return null;
         }

diff --git a/tests/test.php b/tests/test.php
@@ -97,7 +97,7 @@
 
 
 /** 鉴权 **/
-//$jwt = new \Webguosai\Authentication\Driver\Jwt();
+//$jwt = new \Webguosai\Authentication\JwtToken('123');
 //dump($jwt->authenticate([
 //    'name' => 'guosai',
 //    'password' => 'guosai',
@@ -381,11 +381,10 @@
 
 /** JWT **/
 //Jwt::setConfig('key123456', 'domain.com');
-//$code = Jwt::encode(1111, 5);
+//$code = Jwt::encode([1,2,3,4], 5);
 //dump($code);
 //dd(JWT::decode($code));
 
-
 /** 将整数秒转换成xx天xx时xx分xx秒格式 **/
 //dump(CountdownFormat::getFormat(60*60*24*30+1));//最简单的调用
 //dump(CountdownFormat::getFormat(60*60*24*30+1,'dhm'));//自定义返回格式,默认xx天xx时xx分xx秒