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: 整合登录

Browse Source
This commit is contained in:
xlsea
2024-08-16 16:33:11 +08:00
parent e6aa25e9f8
commit 243de247f7
49 changed files with 889 additions and 3882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import { SetupStoreId } from '@/enum';
import { useRouterPush } from '@/hooks/common/router';
import { fetchGetUserInfo, fetchLogin } from '@/service/api';
import { localStg } from '@/utils/storage';
import { $t } from '@/locales';
// import { $t } from '@/locales';
import { useRouteStore } from '../route';
import { useTabStore } from '../tab';
import { clearAuthStorage, getToken } from './shared';
@ -21,10 +21,9 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
const token = ref(getToken());
const userInfo: Api.Auth.UserInfo = reactive({
userId: '',
userName: '',
user: undefined,
roles: [],
buttons: []
permissions: []
});
/** is super role in static route */
@ -56,14 +55,20 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
/**
* Login
*
* @param userName User name
* @param password Password
* @param [redirect=true] Whether to redirect after login. Default is `true`
*/
async function login(userName: string, password: string, redirect = true) {
async function login(loginForm: Api.Auth.LoginForm, redirect = true) {
startLoading();
const { data: loginToken, error } = await fetchLogin(userName, password);
const { VITE_APP_CLIENT_ID } = import.meta.env;
const loginData: Api.Auth.LoginData = {
...loginForm,
clientId: VITE_APP_CLIENT_ID!,
grantType: 'password'
};
const { data: loginToken, error } = await fetchLogin(loginData);
if (!error) {
const pass = await loginByToken(loginToken);
@ -76,11 +81,11 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
}
if (routeStore.isInitAuthRoute) {
window.$notification?.success({
title: $t('page.login.common.loginSuccess'),
content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
duration: 4500
});
// window.$notification?.success({
// title: $t('page.login.common.loginSuccess'),
// content: $t('page.login.common.welcomeBack', { userName: userInfo.userName }),
// duration: 4500
// });
}
}
} else {
@ -88,18 +93,20 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
}
endLoading();
return error ? Promise.reject(error) : Promise.resolve();
}
async function loginByToken(loginToken: Api.Auth.LoginToken) {
// 1. stored in the localStorage, the later requests need it in headers
localStg.set('token', loginToken.token);
localStg.set('refreshToken', loginToken.refreshToken);
localStg.set('token', loginToken.access_token);
localStg.set('refreshToken', loginToken.refresh_token);
// 2. get user info
const pass = await getUserInfo();
if (pass) {
token.value = loginToken.token;
token.value = loginToken.access_token;
return true;
}