优化

src/core/auth/auth.test.ts

@@ -60,6 +60,8 @@ function loginResponse(accessToken = token(), refreshToken = 'refresh-next') {
       expiresIn: 1800,
       refreshToken,
       refreshExpiresIn: 604800,
+      overseasAccessToken: 'overseas-token',
+      overseasExpiresIn: 900,
     },
   }
 }

src/core/auth/auth.ts

@@ -8,6 +8,7 @@ import {
   type ApiEnvelope,
 } from '@/shared/api/http'
 import type { PlatformPermissionResource } from '@/shared/types/platformPermission'
+import { clearOverseasAccessToken, replaceOverseasAccessToken } from '@/shared/api/overseasHttp'
 import { decodeJwtClaims } from './jwt'
 import { listCurrentPlatformPermissionCodes } from './platformAuthorization'
 import { coordinateCrossTabRefresh } from './crossTabRefresh'
@@ -23,6 +24,8 @@ interface LoginResponse {
   expiresIn: number
   refreshToken: string
   refreshExpiresIn: number
+  overseasAccessToken: string | null
+  overseasExpiresIn: number
 }
 
 class ExpiredAccessTokenError extends Error {}
@@ -87,6 +90,7 @@ export const useAuthStore = defineStore('admin-auth', () => {
   async function applySession(result: LoginResponse, expectedGeneration: number) {
     const session = sessionFromToken(result.accessToken)
     ensureCurrentGeneration(expectedGeneration)
+    replaceOverseasAccessToken(result.overseasAccessToken, result.overseasExpiresIn)
     token.value = result.accessToken
     refreshToken.value = result.refreshToken
     user.value = session.user
@@ -106,6 +110,7 @@ export const useAuthStore = defineStore('admin-auth', () => {
 
   function clearSession() {
     sessionGeneration += 1
+    clearOverseasAccessToken()
     token.value = ''
     refreshToken.value = ''
     user.value = null
@@ -133,6 +138,7 @@ export const useAuthStore = defineStore('admin-auth', () => {
     try {
       const session = sessionFromToken(storedToken)
       const cachedPermissions = JSON.parse(localStorage.getItem(PERMISSION_CODES_KEY) || '[]') as unknown
+      if (token.value !== storedToken) clearOverseasAccessToken()
       token.value = storedToken
       refreshToken.value = storedRefreshToken
       user.value = session.user
@@ -187,7 +193,11 @@ export const useAuthStore = defineStore('admin-auth', () => {
           const storedAccessToken = localStorage.getItem(TOKEN_KEY) || ''
           const storedRefreshToken = localStorage.getItem(REFRESH_TOKEN_KEY) || ''
           if (!storedAccessToken || !storedRefreshToken) throw new Error('登录状态已过期')
-          await applySession({ tokenType: 'Bearer', accessToken: storedAccessToken, expiresIn: 0, refreshToken: storedRefreshToken, refreshExpiresIn: 0 }, expectedGeneration)
+          const response = await http.post<ApiEnvelope<LoginResponse>, ApiEnvelope<LoginResponse>>(
+            '/auth/refresh',
+            { refreshToken: storedRefreshToken },
+          )
+          await applySession(unwrapApiResponse<LoginResponse>(response), expectedGeneration)
         },
         refresh: async (currentRefreshToken) => {
           const response = await http.post<ApiEnvelope<LoginResponse>, ApiEnvelope<LoginResponse>>(