Upgrade "jwt-auth" package to ^2.2 (#6)

Author: Shishamou

composer.json

@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "php-open-source-saver/jwt-auth": "^1.4"
+        "php-open-source-saver/jwt-auth": "^2.2"
     },
     "require-dev": {
         "orchestra/testbench": "6.x"

src/AuthenticatesUsers.php

@@ -10,7 +10,7 @@
 trait AuthenticatesUsers
 {
     /**
-     * 處理登入請求
+     * Handle login request.
      *
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
@@ -27,7 +27,7 @@ public function login(Request $request)
     }
 
     /**
-     * 自 Request 取得驗證所需的欄位
+     * Get the needed authorization credentials from the request.
      *
      * @param  \Illuminate\Http\Request  $request
      * @return array
@@ -38,7 +38,7 @@ protected function credentials(Request $request)
     }
 
     /**
-     * 回傳認證守衛
+     * Get the guard to be used during authentication.
      *
      * @return \PHPOpenSourceSaver\JWTAuth\JWTGuard
      */
@@ -48,7 +48,8 @@ protected function guard(): JWTGuard
     }
 
     /**
-     * 取得驗證使用者名稱的欄位
+     * Get the login username to be used by the controller.
+     *
      *
      * @return string
      */
@@ -60,8 +61,7 @@ protected function username()
     /**
      * Get the token array structure.
      *
-     * @param  string $token
-     *
+     * @param  string  $token
      * @return \Illuminate\Http\JsonResponse
      */
     protected function respondWithToken($token)
@@ -74,9 +74,9 @@ protected function respondWithToken($token)
     }
 
     /**
-     * 處理登出請求
+     * Handle logout request.
      *
-     * @param \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function logout(Request $request)
@@ -87,31 +87,64 @@ public function logout(Request $request)
     }
 
     /**
-     * 刷新 token
+     * Handle refresh token request.
      *
      * @return \Illuminate\Http\JsonResponse
      */
     public function refresh()
     {
         try {
-            return $this->respondWithToken($this->guard()->refresh());
+            $newToken = $this->guard()->refresh();
+            return $this->respondWithToken($newToken);
+        } catch (JWTException $e) {
+            return $this->respondWithInvalidAccess();
+        }
+    }
+
+    /**
+     * Handle reissue token request.
+     *
+     *@return \Illuminate\Http\JsonResponse
+     */
+    protected function reissue()
+    {
+        $jwtGuard = $this->guard();
+
+        try {
+            $temporaryToken = $jwtGuard->refresh();
+
+            $jwtGuard->setToken($temporaryToken);
+            $payload = $jwtGuard->getPayload();
+
+            $newToken = $jwtGuard->tokenById($payload['sub']);
+
+            return $this->respondWithToken($newToken);
         } catch (JWTException $e) {
-            return response()->json(['error' => 'Invalid Access Token'], 401);
+            return $this->respondWithInvalidAccess();
         }
     }
 
     /**
-     * 回傳當前使用者資訊
+     * @param  string|null  $message
+     * @return \Illuminate\Http\JsonResponse
+     */
+    private function respondWithInvalidAccess(string $message = 'Invalid Access Token')
+    {
+        return response()->json(['error' => $message], 401);
+    }
+
+    /**
+     * Handle get user info request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response 回傳使用者資訊
+     * @return \Illuminate\Http\Response
      */
     public function me(Request $request)
     {
         if ($this->guard()->check()) {
             return response()->json($this->guard()->user());
-        } else {
-            return response()->json(['error' => 'Invalid Access Token'], 401);
         }
+
+        return $this->respondWithInvalidAccess();
     }
 }