修复认证繁忙时前端恢复重试并补齐远程测试
This commit is contained in:
1 parent
36e05aaf94
commit
3a6d3a0810
11 files changed
+306
-3
No files matched your search
@@ -21,6 +21,7 @@ export async function postPublicRecovery(endpoint, payload) {
|
||||
|
||||
return {
|
||||
ok: response.ok,
|
||||
status: response.status,
|
||||
data: result
|
||||
}
|
||||
}
|
||||
@@ -42,7 +42,9 @@ export function usePage() {
|
||||
globalStatus.setUser(res.data, true)
|
||||
await router.replace(redirect)
|
||||
} catch (error) {
|
||||
ElMessage.error("登录请求失败,请稍后重试")
|
||||
ElMessage.error(error.response?.status === 503
|
||||
? "认证服务暂时繁忙,请稍后重试"
|
||||
: "登录请求失败,请稍后重试")
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -281,6 +281,12 @@ export function usePage() {
|
||||
acceptVerificationTicket(result.data.ticket)
|
||||
} catch (err) {
|
||||
if (version !== requestVersion) return
|
||||
// 临时不可用不代表恢复码错误,保留输入及附加验证凭证。
|
||||
if ([408, 429, 500, 502, 503, 504].includes(err.response?.status)
|
||||
|| (err.isAxiosError && !err.response)) {
|
||||
adminRecoveryError.value = '验证服务暂时不可用,请稍后重试'
|
||||
return
|
||||
}
|
||||
recovery.recoveryCode = ''
|
||||
continuationAttempts++
|
||||
if (continuationAttempts >= 5) {
|
||||
|
||||
@@ -94,6 +94,10 @@ export function usePage() {
|
||||
if (resetToken.value !== token || page.value !== 'reset') {
|
||||
return
|
||||
}
|
||||
if (result.status === 429 || result.status >= 500) {
|
||||
errorMessage.value = '暂时无法验证恢复链接,请稍后刷新重试。'
|
||||
return
|
||||
}
|
||||
if (!result.ok || result.data?.available !== true) {
|
||||
errorMessage.value = '恢复链接无效或已失效,请重新申请。'
|
||||
return
|
||||
@@ -139,6 +143,10 @@ export function usePage() {
|
||||
new_password: form.newPassword,
|
||||
recovery_code: requiresRecoveryCode.value ? form.recoveryCode.trim() : ''
|
||||
})
|
||||
if (result.status === 429 || result.status >= 500) {
|
||||
errorMessage.value = '重置服务暂时不可用,请稍后重试。'
|
||||
return
|
||||
}
|
||||
if (!result.ok || result.data?.reset !== true) {
|
||||
errorMessage.value = '重置失败。恢复链接可能已失效,请重新申请。'
|
||||
return
|
||||
@@ -149,7 +157,7 @@ export function usePage() {
|
||||
form.recoveryCode = ''
|
||||
page.value = 'success'
|
||||
} catch {
|
||||
errorMessage.value = '重置失败。恢复链接可能已失效,请重新申请。'
|
||||
errorMessage.value = '暂时无法确认重置结果,请稍后重试;若链接已失效,请尝试使用新密码登录。'
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user