diff --git a/src/router/guard/route.ts b/src/router/guard/route.ts index 61499c5..56c9847 100644 --- a/src/router/guard/route.ts +++ b/src/router/guard/route.ts @@ -30,7 +30,7 @@ export function createRouteGuard(router: Router) { const loginRoute: RouteKey = 'login'; const noAuthorizationRoute: RouteKey = '403'; - const isLogin = Boolean(localStg.get('token')); + const isLogin = Boolean(localStg.get('tokenSys')); const needLogin = !to.meta.constant; const routeRoles = to.meta.roles || []; @@ -147,7 +147,7 @@ async function checkRoute(to: RouteLocationNormalized): Promise( const { headers } = config; // set token - const token = localStg.get('token'); + const token = localStg.get('tokenSys'); const Authorization = token ? `Bearer ${token}` : null; // set language diff --git a/src/service/request/shared.ts b/src/service/request/shared.ts index 7b06f92..e87aa50 100644 --- a/src/service/request/shared.ts +++ b/src/service/request/shared.ts @@ -11,11 +11,11 @@ import { fetchRefreshToken } from '../api/auth'; export async function handleRefreshToken(axiosConfig: AxiosRequestConfig) { const { resetStore } = useAuthStore(); - const refreshToken = localStg.get('refreshToken') || ''; + const refreshToken = localStg.get('refreshTokenSys') || ''; const { error, data } = await fetchRefreshToken(refreshToken); if (!error) { - localStg.set('token', data.access_token); - localStg.set('refreshToken', data.refreshToken); + localStg.set('tokenSys', data.access_token); + localStg.set('refreshTokenSys', data.refreshToken); const config = { ...axiosConfig }; if (config.headers) { diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts index 3d98a8b..e1c70ba 100644 --- a/src/store/modules/auth/index.ts +++ b/src/store/modules/auth/index.ts @@ -98,8 +98,8 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => { async function loginByToken(loginToken: Api.Auth.LoginToken) { // 1. stored in the localStorage, the later requests need it in headers - localStg.set('token', loginToken.access_token); - localStg.set('refreshToken', loginToken.refreshToken); + localStg.set('tokenSys', loginToken.access_token); + localStg.set('refreshTokenSys', loginToken.refreshToken); token.value = loginToken.access_token; const isSuccess = await refreshUserInfo(); diff --git a/src/store/modules/auth/shared.ts b/src/store/modules/auth/shared.ts index 917b208..94cdcbc 100644 --- a/src/store/modules/auth/shared.ts +++ b/src/store/modules/auth/shared.ts @@ -2,7 +2,7 @@ import { localStg } from '@/utils/storage'; /** Get token */ export function getToken() { - return localStg.get('token') || ''; + return localStg.get('tokenSys') || ''; } export const emptyInfo: Api.Auth.UserInfo = { @@ -13,6 +13,6 @@ export const emptyInfo: Api.Auth.UserInfo = { /** Clear auth storage */ export function clearAuthStorage() { - localStg.remove('token'); - localStg.remove('refreshToken'); + localStg.remove('tokenSys'); + localStg.remove('refreshTokenSys'); } diff --git a/src/typings/storage.d.ts b/src/typings/storage.d.ts index c9ea420..64acf68 100644 --- a/src/typings/storage.d.ts +++ b/src/typings/storage.d.ts @@ -13,9 +13,9 @@ declare namespace StorageType { /** The i18n language */ lang: App.I18n.LangType; /** The token */ - token: string; + tokenSys: string; /** The refresh token */ - refreshToken: string; + refreshTokenSys: string; /** The user info */ userInfo: Api.Auth.UserInfo; /** The theme color */