fix(client): 修复登录会话自动续期

This commit is contained in:
2026-09-03 18:11:07 +08:00
parent 39e1c8e6ee
commit b3649c314a
9 changed files with 128 additions and 28 deletions
+21 -8
View File
@@ -2,7 +2,7 @@ import { computed, ref } from 'vue'
import { defineStore } from 'pinia'
import type { CurrentUser } from '@chongchong/shared'
import { exchangeImpersonationCode, loginMerchant, logoutMerchant } from '@/modules/auth/api/auth'
import { ApiError } from '@/api/http'
import { ApiError, refreshAuthenticatedSession } from '@/api/http'
import {
FRONTEND_TO_MERCHANT_PERMISSION_CODES,
hasMappedMerchantPermission,
@@ -11,8 +11,8 @@ import {
getTenantProfile,
updateMerchantPersonalProfile,
} from '@/modules/tenant-management/public'
import { clearSessionTokens, getAccessToken, getRefreshToken, persistTemporaryAccessToken, persistTokenPair } from '@/api/session'
import { decodeMerchantToken, type MerchantJwtPayload } from '@/modules/auth/utils/jwt'
import { clearSessionTokens, getAccessToken, getRefreshToken, persistRememberedLoginId, persistTemporaryAccessToken, persistTokenPair } from '@/api/session'
import { decodeMerchantToken, MerchantTokenExpiredError, type MerchantJwtPayload } from '@/modules/auth/utils/jwt'
export interface ClientAccountProfile {
username: string
@@ -103,8 +103,8 @@ export const useAuthStore = defineStore('client-auth', () => {
if (token.value) {
try {
applyToken(token.value)
} catch {
clearSession()
} catch (error) {
if (!(error instanceof MerchantTokenExpiredError && getRefreshToken())) clearSession()
}
}
@@ -133,8 +133,20 @@ export const useAuthStore = defineStore('client-auth', () => {
async function restoreSession() {
if (sessionRestored.value) return
if (!isAuthenticated.value) {
sessionRestored.value = true
return
if (!getRefreshToken()) {
sessionRestored.value = true
return
}
try {
applyToken(await refreshAuthenticatedSession())
} catch (error) {
if (isExpiredSessionError(error)) {
clearSession()
throw error
}
sessionRestored.value = true
return
}
}
try {
await loadSessionContext()
@@ -152,7 +164,8 @@ export const useAuthStore = defineStore('client-auth', () => {
async function login(loginId: string, password: string, remember = false) {
const tokens = await loginMerchant(loginId, password)
const decoded = decodeMerchantToken(tokens.accessToken)
persistTokenPair(tokens, remember)
persistTokenPair(tokens)
persistRememberedLoginId(loginId, remember)
token.value = tokens.accessToken
payload.value = decoded
user.value = currentUser(decoded)