|
|
|
@ -140,7 +140,7 @@ export const useUserStore = defineStore({ |
|
|
|
async afterLoginAction(goHome?: boolean): Promise<GetUserInfoModel | null> { |
|
|
|
if (!this.getToken) return null; |
|
|
|
// get user info
|
|
|
|
const userInfo = await this.getUserInfoAction(); |
|
|
|
await this.getUserInfoAction(); |
|
|
|
|
|
|
|
const sessionTimeout = this.sessionTimeout; |
|
|
|
if (sessionTimeout) { |
|
|
|
@ -155,9 +155,9 @@ export const useUserStore = defineStore({ |
|
|
|
router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw); |
|
|
|
permissionStore.setDynamicAddedRoute(true); |
|
|
|
} |
|
|
|
goHome && (await router.replace(userInfo?.homePath || PageEnum.BASE_HOME)); |
|
|
|
goHome && (await router.replace(this.userInfo?.homePath || PageEnum.BASE_HOME)); |
|
|
|
} |
|
|
|
return userInfo; |
|
|
|
return this.userInfo; |
|
|
|
}, |
|
|
|
async getUserInfoAction(): Promise<GetUserInfoModel> { |
|
|
|
const abpStore = useAbpStoreWithOut(); |
|
|
|
|