1
0

2 Revīzijas 5c2378aa67 ... 4e9f11f39e

Autors SHA1 Ziņojums Datums
  maa3606 4e9f11f39e Merge branch 'kevin' 2 gadi atpakaļ
  maa3520 52b8a32d8b 修改重登機制 2 gadi atpakaļ
2 mainītis faili ar 12 papildinājumiem un 5 dzēšanām
  1. 11 4
      resources/js/src/@core/auth/jwt/jwtService.js
  2. 1 1
      routes/api.php

+ 11 - 4
resources/js/src/@core/auth/jwt/jwtService.js

@@ -1,4 +1,5 @@
 import jwtDefaultConfig from './jwtDefaultConfig'
+import router from '../../../router'
 
 export default class JwtService {
     // Will be used by this service for making API calls
@@ -47,7 +48,13 @@ export default class JwtService {
                     let failedRequest = error.config;
 
                     //Method to get new token
-                    error = "401錯誤! \n你沒有在" + failedRequest.url + "使用" + failedRequest.method + "的權限! 如有問題請聯絡管理員"
+                    error = "401錯誤! \n你尚未登入! 如有問題請聯絡管理員"
+                    localStorage.removeItem(this.jwtConfig.storageTokenKeyName)
+                    localStorage.removeItem(this.jwtConfig.storageRefreshTokenKeyName)
+                    // Remove userData from localStorage
+                    localStorage.removeItem('userData')
+                    router.push({ name: 'login' });
+
                 } else if (error.request && error.request.status === 403) {
                     // Set Failed Request
                     let failedRequest = error.config;
@@ -60,20 +67,20 @@ export default class JwtService {
 
                     //Method to get new token
                     error = "422錯誤! 請檢查是否有未填寫的欄位!"
-                }else if (error.request && error.request.status === 500) {
+                } else if (error.request && error.request.status === 500) {
                     // Set Failed Request
                     let failedRequest = error.config;
 
                     //Method to get new token
                     error = "500錯誤! 伺服器發生錯誤!"
-                }else if (error.request && error.request.status === 408) {
+                } else if (error.request && error.request.status === 408) {
                     // Set Failed Request
                     let failedRequest = error.config;
 
                     //Method to get new token
                     error = "408錯誤! 伺服器沒有回應!"
                 }
-                
+
                 throw error;
             },
         )

+ 1 - 1
routes/api.php

@@ -71,7 +71,7 @@ Route::post('/refresh', function (Request $request) {
     $user = $request->user();
     $user->tokens()->delete();
 
-    $token = $user->createToken('test-token', ['uploader', 'tester'])->plainTextToken;
+    $token = $user->createToken('test-token', [$user->role])->plainTextToken;
 
     $response = [
         'user' => $user,