jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(projects): get user info in router guard and remove in localStorage. close #459

Browse Source
This commit is contained in:
Soybean
2024-06-06 20:22:28 +08:00
parent 584cd54d6d
commit 5531a68641
4 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/store/modules/auth/index.ts
View File

@ -8,7 +8,7 @@ import { fetchGetUserInfo, fetchLogin } from '@/service/api';
import { localStg } from '@/utils/storage';
import { $t } from '@/locales';
import { useRouteStore } from '../route';
import { clearAuthStorage, getToken, getUserInfo } from './shared';
import { clearAuthStorage, getToken } from './shared';
export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
const route = useRoute();
@ -18,7 +18,12 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
const token = ref(getToken());
const userInfo: Api.Auth.UserInfo = reactive(getUserInfo());
const userInfo: Api.Auth.UserInfo = reactive({
userId: '',
userName: '',
roles: [],
buttons: []
});
/** is super role in static route */
const isStaticSuper = computed(() => {
@ -87,14 +92,23 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
localStg.set('token', loginToken.token);
localStg.set('refreshToken', loginToken.refreshToken);
// 2. get user info and update store
const pass = await updateUserInfo();
if (pass) {
token.value = loginToken.token;
return true;
}
return false;
}
async function updateUserInfo() {
const { data: info, error } = await fetchGetUserInfo();
if (!error) {
// 2. store user info
localStg.set('userInfo', info);
// 3. update store
token.value = loginToken.token;
// update store
Object.assign(userInfo, info);
return true;
@ -110,6 +124,7 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
isLogin,
loginLoading,
resetStore,
login
login,
updateUserInfo
};
});