From 31599d0ec160f6118f6fe428561b1c0032070a35 Mon Sep 17 00:00:00 2001
From: npmrun <1549469775@qq.com>
Date: Sat, 18 Apr 2026 21:54:49 +0800
Subject: [PATCH] fix(auth): unify login/register error copy without duplicate
 toast

Made-with: Cursor
---
 app/pages/login/index.vue    | 18 ++++++------------
 app/pages/register/index.vue | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/app/pages/login/index.vue b/app/pages/login/index.vue
index 82ce345..e5c2276 100644
--- a/app/pages/login/index.vue
+++ b/app/pages/login/index.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { FormError, FormSubmitEvent } from '@nuxt/ui'
-import { request, unwrapApiBody, type ApiResponse } from '../../utils/http/factory'
 import { DEFAULT_AUTHENTICATED_LANDING_PATH, normalizeSafeRedirect } from '../../utils/auth-routes'
 import { useAuthSession } from '../../composables/useAuthSession'
 
@@ -34,6 +33,7 @@ const resultMessage = ref('')
 const route = useRoute()
 const { refresh } = useAuthSession()
 const { allowRegister } = useGlobalConfig()
+const { fetchData, getApiErrorMessage } = useClientApi()
 
 const validate = (formState: LoginFormState): FormError[] => {
   const errors: FormError[] = []
@@ -59,13 +59,11 @@ const onSubmit = async (_event: FormSubmitEvent<LoginFormState>) => {
   loading.value = true
 
   try {
-    const res = unwrapApiBody(await request<ApiResponse<LoginResult>>('/api/auth/login', {
+    const res = await fetchData<LoginResult>('/api/auth/login', {
       method: 'POST',
-      body: {
-        username: state.username,
-        password: state.password,
-      },
-    }))
+      body: { username: state.username, password: state.password },
+      notify: false,
+    })
 
     await refresh(true)
 
@@ -77,12 +75,8 @@ const onSubmit = async (_event: FormSubmitEvent<LoginFormState>) => {
     const redirectTarget = normalizeSafeRedirect(redirectCandidate, DEFAULT_AUTHENTICATED_LANDING_PATH)
     await navigateTo(redirectTarget)
   } catch (error: unknown) {
-    const message = typeof error === 'object' && error !== null && 'statusMessage' in error
-      ? String(error.statusMessage)
-      : '登录失败，请稍后重试'
-
     resultType.value = 'error'
-    resultMessage.value = message
+    resultMessage.value = getApiErrorMessage(error)
   } finally {
     loading.value = false
   }
diff --git a/app/pages/register/index.vue b/app/pages/register/index.vue
index 12f940e..cac0932 100644
--- a/app/pages/register/index.vue
+++ b/app/pages/register/index.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { FormError, FormSubmitEvent } from '@nuxt/ui'
-import { request, unwrapApiBody } from '../../utils/http/factory'
 import { normalizeSafeRedirect } from '../../utils/auth-routes'
 
 definePageMeta({
@@ -33,6 +32,7 @@ const loading = ref(false)
 const resultType = ref<'error' | ''>('')
 const resultMessage = ref('')
 const route = useRoute()
+const { fetchData, getApiErrorMessage } = useClientApi()
 
 const validate = (formState: RegisterFormState): FormError[] => {
   const errors: FormError[] = []
@@ -58,13 +58,11 @@ const onSubmit = async (_event: FormSubmitEvent<RegisterFormState>) => {
   loading.value = true
 
   try {
-    unwrapApiBody(await request('/api/auth/register', {
+    await fetchData<unknown>('/api/auth/register', {
       method: 'POST',
-      body: {
-        username: state.username,
-        password: state.password,
-      },
-    }))
+      body: { username: state.username, password: state.password },
+      notify: false,
+    })
 
     const redirectCandidate = Array.isArray(route.query.redirect)
       ? route.query.redirect[0]
@@ -75,12 +73,8 @@ const onSubmit = async (_event: FormSubmitEvent<RegisterFormState>) => {
       query: { redirect },
     })
   } catch (error: unknown) {
-    const message = typeof error === 'object' && error !== null && 'statusMessage' in error
-      ? String(error.statusMessage)
-      : '注册失败，请稍后重试'
-
     resultType.value = 'error'
-    resultMessage.value = message
+    resultMessage.value = getApiErrorMessage(error)
   } finally {
     loading.value = false
   }