From 3830ec7a69c82a41ca82f79ad1e9f7a1e887897a Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Fri, 23 Aug 2024 10:50:03 +0800
Subject: [PATCH] fix(projects): fix login redirect

---
 src/hooks/common/router.ts      | 10 +++++++---
 src/store/modules/auth/index.ts |  4 +---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/hooks/common/router.ts b/src/hooks/common/router.ts
index f95a25a5..4a433420 100644
--- a/src/hooks/common/router.ts
+++ b/src/hooks/common/router.ts
@@ -93,11 +93,15 @@ export function useRouterPush(inSetup = true) {
     return routerPushByKey('login', { query, params: { module } });
   }
 
-  /** Redirect from login */
-  async function redirectFromLogin() {
+  /**
+   * Redirect from login
+   *
+   * @param [needRedirect=true] Whether to redirect after login. Default is `true`
+   */
+  async function redirectFromLogin(needRedirect = true) {
     const redirect = route.value.query?.redirect as string;
 
-    if (redirect) {
+    if (needRedirect && redirect) {
       routerPush(redirect);
     } else {
       toHome();
diff --git a/src/store/modules/auth/index.ts b/src/store/modules/auth/index.ts
index 61308e22..8fcdebed 100644
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@@ -71,9 +71,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
       if (pass) {
         await routeStore.initAuthRoute();
 
-        if (redirect) {
-          await redirectFromLogin();
-        }
+        await redirectFromLogin(redirect);
 
         if (routeStore.isInitAuthRoute) {
           window.$notification?.success({