From 27f061957e1cf1cf6cb770c53748c19bc48daaae Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Wed, 18 Jun 2025 21:07:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E7=94=A8=E6=88=B7=E6=88=96=E7=99=BB=E5=BD=95=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/request/index.ts                 | 6 ++++++
 src/views/_builtin/social-callback/index.vue | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index 8538746b..de5ed288 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -1,3 +1,4 @@
+import { useRoute } from 'vue-router';
 import type { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import { BACKEND_ERROR_CODE, REQUEST_CANCELED_CODE, createFlatRequest } from '@sa/axios';
 import { useAuthStore } from '@/store/modules/auth';
@@ -51,6 +52,7 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       return String(response.data.code) === import.meta.env.VITE_SERVICE_SUCCESS_CODE;
     },
     async onBackendFail(response, instance) {
+      const route = useRoute();
       const authStore = useAuthStore();
       const responseCode = String(response.data.code);
 
@@ -66,6 +68,10 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
       }
 
       // when the backend response code is in `logoutCodes`, it means the user will be logged out and redirected to login page
+      if (route.name === 'login') {
+        handleLogout();
+        return null;
+      }
       // const logoutCodes = import.meta.env.VITE_SERVICE_LOGOUT_CODES?.split(',') || [];
       // if (logoutCodes.includes(responseCode)) {
       //   handleLogout();
diff --git a/src/views/_builtin/social-callback/index.vue b/src/views/_builtin/social-callback/index.vue
index 6b16e248..33d1f705 100644
--- a/src/views/_builtin/social-callback/index.vue
+++ b/src/views/_builtin/social-callback/index.vue
@@ -61,6 +61,7 @@ const callbackByCode = async (data: Api.Auth.SocialLoginForm) => {
 
 const loginByCode = async (data: Api.Auth.SocialLoginForm) => {
   try {
+    await authStore.logout();
     await authStore.login(data);
     await processResponse();
   } catch {