开始密码恢复验收:保存安全邮箱改密现有调整
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-15 20:00:09 +08:00
1 parent b777b2b101
commit 99b4194598
6 files changed
+91 -25

No files matched your search

@@ -58,7 +58,10 @@ export function usePage() {
const externalEmails = ref([])
const externalListLoading = ref(false)
const externalDialogVisible = ref(false)
const primaryEmail = computed(() => externalEmails.value.find(item => item.type === 'primary' && item.status === 'verified'))
const passwordEmail = computed(() => {
const verified = externalEmails.value.filter(item => item.status === 'verified')
return verified.find(item => item.type === 'primary') || verified.find(item => item.type === 'backup')
})
const passwordSending = ref(false)
const passwordSubmitting = ref(false)
const passwordChallenge = ref('')
@@ -273,8 +276,8 @@ export function usePage() {
notify(lang.err_pwd_diff)
return
}
if (isSuperAdmin.value && (!primaryEmail.value || !passwordChallenge.value || !/^\d{8}$/.test(ruleForm.code.trim()))) {
notify('请获取并输入主安全邮箱中的 8 位验证码')
if (isSuperAdmin.value && (!passwordEmail.value || !passwordChallenge.value || !/^\d{8}$/.test(ruleForm.code.trim()))) {
notify('请获取并输入安全邮箱中的 8 位验证码')
return
}
passwordSubmitting.value = true
@@ -297,7 +300,7 @@ export function usePage() {
}
const sendPasswordCode = async () => {
if (passwordSending.value || passwordSubmitting.value || passwordCountdown.value > 0 || !primaryEmail.value) return
if (passwordSending.value || passwordSubmitting.value || passwordCountdown.value > 0 || !passwordEmail.value) return
passwordSending.value = true
passwordChallenge.value = ''
ruleForm.code = ''
@@ -314,7 +317,7 @@ export function usePage() {
passwordCountdown.value = Math.max(0, Math.ceil((deadline - Date.now()) / 1000))
if (!passwordCountdown.value) clearInterval(passwordTimer)
}, 1000)
notify(`验证码已发送至 ${res.data.email || primaryEmail.value.email}`, 'success')
notify(`验证码已发送至 ${res.data.email || passwordEmail.value.email}`, 'success')
} catch (error) {
notify(error?.message || '验证码发送失败')
} finally {
@@ -322,7 +325,7 @@ export function usePage() {
}
}
watch(() => primaryEmail.value?.id, () => {
watch(() => passwordEmail.value?.id, () => {
passwordChallenge.value = ''
ruleForm.code = ''
})
@@ -339,7 +342,7 @@ export function usePage() {
return {
lang, isSuperAdmin, supported, webAuthnEnabled, sectionOptions, selectedSection, selectSection,
globalSecurityPolicyPage,
primaryEmail, passwordSending, passwordSubmitting, passwordCountdown, sendPasswordCode,
passwordEmail, passwordSending, passwordSubmitting, passwordCountdown, sendPasswordCode,
registering, credentialsLoading, credentials, securityLoading,
securityQuestion, questionForm, recoveryConfigured, generatedCodes, externalEmails, externalListLoading,
externalDialogVisible, ruleForm, rules, submit, registerCredential, renameCredential, revokeCredential,
@@ -18,14 +18,14 @@
<section v-if="selectedSection === 'password'" class="security-section">
<div class="settings-header">
<h3>{{ lang.modify_pwd }}</h3>
<p class="settings-desc">{{ isSuperAdmin ? '通过主安全邮箱验证码修改密码,完成后需重新登录。' : lang.modify_pwd_desc }}</p>
<p class="settings-desc">{{ isSuperAdmin ? '通过已验证安全邮箱修改密码,优先主要邮箱;完成后需重新登录。' : lang.modify_pwd_desc }}</p>
</div>
<div class="settings-body">
<el-form :model="ruleForm" :rules="rules" status-icon label-position="top" class="settings-form">
<template v-if="isSuperAdmin">
<el-form-item label="主要外部安全邮箱">
<div v-if="primaryEmail" class="password-verification-row">
<strong>{{ primaryEmail.email }}</strong>
<el-form-item label="外部安全邮箱">
<div v-if="passwordEmail" class="password-verification-row">
<strong>{{ passwordEmail.email }}</strong>
<el-button
:loading="passwordSending"
:disabled="passwordCountdown > 0 || passwordSubmitting"
@@ -35,7 +35,7 @@
</el-button>
</div>
<el-button v-else type="primary" link @click="selectSection('external-email')">
请先绑定并验证主要外部安全邮箱
请先绑定并验证外部安全邮箱
</el-button>
</el-form-item>
<el-form-item label="邮箱验证码" required>
@@ -45,7 +45,7 @@
autocomplete="one-time-code"
maxlength="8"
placeholder="请输入邮箱中的 8 位验证码"
:disabled="!primaryEmail || passwordSubmitting"
:disabled="!passwordEmail || passwordSubmitting"
/>
</el-form-item>
</template>
@@ -59,7 +59,7 @@
<el-input v-model="ruleForm.new_pwd2" type="password" autocomplete="new-password" :placeholder="lang.confirm_new_pwd" show-password class="premium-input" />
</el-form-item>
<div class="form-actions">
<el-button type="primary" :loading="passwordSubmitting" :disabled="passwordSending || (isSuperAdmin && !primaryEmail)" @click="submit" class="submit-btn">
<el-button type="primary" :loading="passwordSubmitting" :disabled="passwordSending || (isSuperAdmin && !passwordEmail)" @click="submit" class="submit-btn">
{{ lang.submit }}
</el-button>
</div>
@@ -146,7 +146,7 @@ import ExternalEmailBindingDialog from './ExternalEmailBindingDialog/ExternalEma
const {
lang, isSuperAdmin, supported, webAuthnEnabled, sectionOptions, selectedSection, selectSection,
globalSecurityPolicyPage,
primaryEmail, passwordSending, passwordSubmitting, passwordCountdown, sendPasswordCode,
passwordEmail, passwordSending, passwordSubmitting, passwordCountdown, sendPasswordCode,
registering, credentialsLoading, credentials, securityLoading,
securityQuestion, questionForm, recoveryConfigured, generatedCodes, externalEmails, externalListLoading,
externalDialogVisible, ruleForm, rules, submit, registerCredential, renameCredential, revokeCredential,