- 密码重置申请
-
-
-
-
-
- {{ row.email || '-' }}
-
-
-
-
- 批准
- 拒绝
-
-
-
-
- 当未启用邮件找回密码时，用户会提交申请，由管理员在此处处理。
-
diff --git a/app-frontend/src/api/auth.js b/app-frontend/src/api/auth.js
index cfbbfbb..ca5f962 100644
--- a/app-frontend/src/api/auth.js
+++ b/app-frontend/src/api/auth.js
@@ -30,11 +30,6 @@ export async function forgotPassword(payload) {
return data
}
-export async function requestPasswordReset(payload) {
- const { data } = await publicApi.post('/reset_password_request', payload)
- return data
-}
-
export async function confirmPasswordReset(payload) {
const { data } = await publicApi.post('/reset-password-confirm', payload)
return data
diff --git a/app-frontend/src/pages/LoginPage.vue b/app-frontend/src/pages/LoginPage.vue
index 6ba625f..1bf885d 100644
--- a/app-frontend/src/pages/LoginPage.vue
+++ b/app-frontend/src/pages/LoginPage.vue
@@ -8,10 +8,8 @@ import {
forgotPassword,
generateCaptcha,
login,
- requestPasswordReset,
resendVerifyEmail,
} from '../api/auth'
-import { validateStrongPassword } from '../utils/password'
const router = useRouter()
@@ -32,20 +30,14 @@ const registerVerifyEnabled = ref(false)
const forgotOpen = ref(false)
const resendOpen = ref(false)
-const emailResetForm = reactive({
- email: '',
+const forgotForm = reactive({
+ username: '',
captcha: '',
})
-const emailResetCaptchaImage = ref('')
-const emailResetCaptchaSession = ref('')
-const emailResetLoading = ref(false)
-
-const manualResetForm = reactive({
- username: '',
- email: '',
- new_password: '',
-})
-const manualResetLoading = ref(false)
+const forgotCaptchaImage = ref('')
+const forgotCaptchaSession = ref('')
+const forgotLoading = ref(false)
+const forgotHint = ref('')
const resendForm = reactive({
email: '',
@@ -72,12 +64,12 @@ async function refreshLoginCaptcha() {
async function refreshEmailResetCaptcha() {
try {
const data = await generateCaptcha()
- emailResetCaptchaSession.value = data?.session_id || ''
- emailResetCaptchaImage.value = data?.captcha_image || ''
- emailResetForm.captcha = ''
+ forgotCaptchaSession.value = data?.session_id || ''
+ forgotCaptchaImage.value = data?.captcha_image || ''
+ forgotForm.captcha = ''
} catch {
- emailResetCaptchaSession.value = ''
- emailResetCaptchaImage.value = ''
+ forgotCaptchaSession.value = ''
+ forgotCaptchaImage.value = ''
}
}
@@ -136,80 +128,54 @@ async function onSubmit() {
async function openForgot() {
forgotOpen.value = true
-
+ forgotHint.value = ''
+ forgotForm.username = ''
+ forgotForm.captcha = ''
if (emailEnabled.value) {
- emailResetForm.email = ''
- emailResetForm.captcha = ''
await refreshEmailResetCaptcha()
- } else {
- manualResetForm.username = ''
- manualResetForm.email = ''
- manualResetForm.new_password = ''
}
}
async function submitForgot() {
- if (emailEnabled.value) {
- const email = emailResetForm.email.trim()
- if (!email) {
- ElMessage.error('请输入邮箱')
- return
- }
- if (!emailResetForm.captcha.trim()) {
- ElMessage.error('请输入验证码')
- return
- }
+ forgotHint.value = ''
- emailResetLoading.value = true
- try {
- const res = await forgotPassword({
- email,
- captcha_session: emailResetCaptchaSession.value,
- captcha: emailResetForm.captcha.trim(),
- })
- ElMessage.success(res?.message || '已发送重置邮件')
- setTimeout(() => {
- forgotOpen.value = false
- }, 800)
- } catch (e) {
- const data = e?.response?.data
- ElMessage.error(data?.error || '发送失败')
- await refreshEmailResetCaptcha()
- } finally {
- emailResetLoading.value = false
- }
+ if (!emailEnabled.value) {
+ ElMessage.warning('邮件功能未启用，请联系管理员重置密码。')
return
}
- const username = manualResetForm.username.trim()
- const newPassword = manualResetForm.new_password
- if (!username || !newPassword) {
- ElMessage.error('用户名和新密码不能为空')
+ const username = forgotForm.username.trim()
+ if (!username) {
+ ElMessage.error('请输入用户名')
+ return
+ }
+ if (!forgotForm.captcha.trim()) {
+ ElMessage.error('请输入验证码')
return
}
- const check = validateStrongPassword(newPassword)
- if (!check.ok) {
- ElMessage.error(check.message)
- return
- }
-
- manualResetLoading.value = true
+ forgotLoading.value = true
try {
- await requestPasswordReset({
+ const res = await forgotPassword({
username,
- email: manualResetForm.email.trim(),
- new_password: newPassword,
+ captcha_session: forgotCaptchaSession.value,
+ captcha: forgotForm.captcha.trim(),
})
- ElMessage.success('申请已提交，请等待审核')
+ ElMessage.success(res?.message || '已发送重置邮件')
setTimeout(() => {
forgotOpen.value = false
}, 800)
} catch (e) {
const data = e?.response?.data
- ElMessage.error(data?.error || '提交失败')
+ const message = data?.error || '发送失败'
+ if (data?.code === 'email_not_bound') {
+ forgotHint.value = message
+ } else {
+ ElMessage.error(message)
+ }
+ await refreshEmailResetCaptcha()
} finally {
- manualResetLoading.value = false
+ forgotLoading.value = false
}
}
@@ -320,51 +286,55 @@ onMounted(async () => {