merge: 合并 soy 1.3.6

src/service/request/index.ts

@@ -5,7 +5,7 @@ import { localStg, sessionStg } from '@/utils/storage';
 import { getServiceBaseURL } from '@/utils/service';
 import { decryptBase64, decryptWithAes, encryptBase64, encryptWithAes, generateAesKey } from '@/utils/crypto';
 import { decrypt, encrypt } from '@/utils/jsencrypt';
-import { handleRefreshToken, showErrorMsg } from './shared';
+import { getAuthorization, handleExpiredRequest, showErrorMsg } from './shared';
 import type { RequestInstanceState } from './type';
 
 const encryptHeader = 'encrypt-key';
@@ -21,21 +21,19 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
   },
   {
     async onRequest(config) {
-      const { headers } = config;
-
-      // 对应国际化资源文件后缀
-      config.headers['Content-Language'] = 'zh_CN';
-
       const isToken = config.headers?.isToken === false;
-
       // set token
       const token = localStg.get('token');
       if (token && !isToken) {
-        config.headers.Clientid = import.meta.env.VITE_APP_CLIENT_ID;
-        const Authorization = token ? `Bearer ${token}` : null;
-        Object.assign(headers, { Authorization });
+        const Authorization = getAuthorization();
+        Object.assign(config.headers, { Authorization });
       }
 
+      // 客户端 ID
+      config.headers.Clientid = import.meta.env.VITE_APP_CLIENT_ID;
+      // 对应国际化资源文件后缀
+      config.headers['Content-Language'] = 'zh_CN';
+
       handleRepeatSubmit(config);
 
       handleEncrypt(config);
@@ -100,15 +98,13 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       // when the backend response code is in `expiredTokenCodes`, it means the token is expired, and refresh token
       // the api `refreshToken` can not return error code in `expiredTokenCodes`, otherwise it will be a dead loop, should return `logoutCodes` or `modalLogoutCodes`
       const expiredTokenCodes = import.meta.env.VITE_SERVICE_EXPIRED_TOKEN_CODES?.split(',') || [];
-      if (expiredTokenCodes.includes(responseCode) && !request.state.isRefreshingToken) {
-        request.state.isRefreshingToken = true;
+      if (expiredTokenCodes.includes(responseCode)) {
+        const success = await handleExpiredRequest(request.state);
+        if (success) {
+          const Authorization = getAuthorization();
+          Object.assign(response.config.headers, { Authorization });
 
-        const refreshConfig = await handleRefreshToken(response.config);
-
-        request.state.isRefreshingToken = false;
-
-        if (refreshConfig) {
-          return instance.request(refreshConfig) as Promise<AxiosResponse>;
+          return instance.request(response.config) as Promise<AxiosResponse>;
         }
       }
 

src/service/request/shared.ts

@@ -1,22 +1,43 @@
-import type { AxiosRequestConfig } from 'axios';
 import { useAuthStore } from '@/store/modules/auth';
-// import { localStg } from '@/utils/storage';
+import { localStg } from '@/utils/storage';
 import type { RequestInstanceState } from './type';
 
-/**
- * refresh token
- *
- * @param axiosConfig - request config when the token is expired
- */
-export async function handleRefreshToken(_: AxiosRequestConfig) {
+export function getAuthorization() {
+  const token = localStg.get('token');
+  const Authorization = token ? `Bearer ${token}` : null;
+
+  return Authorization;
+}
+
+/** refresh token */
+async function handleRefreshToken() {
   const { resetStore } = useAuthStore();
 
-  // request
-  // const refreshToken = localStg.get('refreshToken') || '';
+  // const rToken = localStg.get('refreshToken') || '';
+  // const { error, data } = await fetchRefreshToken(rToken);
+  // if (!error) {
+  //   localStg.set('token', data.token);
+  //   localStg.set('refreshToken', data.refreshToken);
+  //   return true;
+  // }
 
   resetStore();
 
-  return null;
+  return false;
+}
+
+export async function handleExpiredRequest(state: RequestInstanceState) {
+  if (!state.refreshTokenFn) {
+    state.refreshTokenFn = handleRefreshToken();
+  }
+
+  const success = await state.refreshTokenFn;
+
+  setTimeout(() => {
+    state.refreshTokenFn = null;
+  }, 1000);
+
+  return success;
 }
 
 export function showErrorMsg(state: RequestInstanceState, message: string) {

src/service/request/type.ts

@@ -1,6 +1,6 @@
 export interface RequestInstanceState {
   /** whether the request is refreshing token */
-  isRefreshingToken: boolean;
+  refreshTokenFn: Promise<boolean> | null;
   /** the request error message stack */
   errMsgStack: string[];
 }