fix(projects): fix login redirect

soybeanjs · Aug 23, 2024 · 3830ec7 · 3830ec7
1 parent ef6cf93
commit 3830ec7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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({