From ab9858c7d0534a3277065b9a29dd6873afdb29be Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Tue, 10 Dec 2024 12:45:00 +0800
Subject: [PATCH] fix(projects): fix route guard hook
 `onRouteSwitchWhenLoggedIn`. fixed #680

---
 src/router/guard/route.ts        | 4 ++--
 src/store/modules/route/index.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/guard/route.ts b/src/router/guard/route.ts
index a6b7b9d7..13b1e633 100644
--- a/src/router/guard/route.ts
+++ b/src/router/guard/route.ts
@@ -117,6 +117,8 @@ async function initRoute(to: RouteLocationNormalized): Promise<RouteLocationRaw
     return location;
   }
 
+  await routeStore.onRouteSwitchWhenLoggedIn();
+
   if (!routeStore.isInitAuthRoute) {
     // initialize the auth route
     await routeStore.initAuthRoute();
@@ -141,8 +143,6 @@ async function initRoute(to: RouteLocationNormalized): Promise<RouteLocationRaw
   // the auth route is initialized
   // it is not the "not-found" route, then it is allowed to access
   if (!isNotFoundRoute) {
-    routeStore.onRouteSwitchWhenLoggedIn();
-
     return null;
   }
 
diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts
index ede9a76f..b1f7afa7 100644
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@@ -311,7 +311,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
   }
 
   async function onRouteSwitchWhenLoggedIn() {
-    authStore.initUserInfo();
+    await authStore.initUserInfo();
   }
 
   async function onRouteSwitchWhenNotLoggedIn() {