默认登录了某个账号,无法退出、登录成功之后提示重复、组织成员邀请等新消息没有在消息图标上体现
This commit is contained in:
@@ -45,8 +45,10 @@ export const injectRouter = (router) => {
|
|||||||
const account = useAccountStore();
|
const account = useAccountStore();
|
||||||
|
|
||||||
router.beforeEach(async (to, from) => {
|
router.beforeEach(async (to, from) => {
|
||||||
|
let access_token = localStorage.getItem('access_token') || '';
|
||||||
|
let refresh_token = localStorage.getItem('refresh_token') || '';
|
||||||
// 如果是从blog跳转过来的判断是否登陆,如果登陆则写入storage
|
// 如果是从blog跳转过来的判断是否登陆,如果登陆则写入storage
|
||||||
await account.checkIsLogin();
|
await account.checkIsLogin(access_token,refresh_token);
|
||||||
// 判断命名空间类型
|
// 判断命名空间类型
|
||||||
const globalStore = useGlobalInfoStore();
|
const globalStore = useGlobalInfoStore();
|
||||||
globalStore.setNamespaceType(-1); // 重置namespaceType,防止非组织路由请求组织信息
|
globalStore.setNamespaceType(-1); // 重置namespaceType,防止非组织路由请求组织信息
|
||||||
|
|||||||
@@ -63,6 +63,10 @@ export const useAccountStore = defineStore('accountInfo', () => {
|
|||||||
// const { data, error } = await getUserToken();
|
// const { data, error } = await getUserToken();
|
||||||
// if (data?.data) {
|
// if (data?.data) {
|
||||||
// const { access_token, refresh_token } = data.data;
|
// const { access_token, refresh_token } = data.data;
|
||||||
|
|
||||||
|
if(!access_token|| !refresh_token) {
|
||||||
|
return
|
||||||
|
}
|
||||||
localStorage.setItem('access_token', access_token);
|
localStorage.setItem('access_token', access_token);
|
||||||
localStorage.setItem('refresh_token', refresh_token);
|
localStorage.setItem('refresh_token', refresh_token);
|
||||||
saveStatus(true);
|
saveStatus(true);
|
||||||
|
|||||||
@@ -43,9 +43,9 @@ export function useLogin() {
|
|||||||
unMount();
|
unMount();
|
||||||
const { username, email } = conf;
|
const { username, email } = conf;
|
||||||
RecordInfo(conf);
|
RecordInfo(conf);
|
||||||
Message.success({
|
// Message.success({
|
||||||
message: '欢迎来到GitCode!'
|
// message: '欢迎来到GitCode!'
|
||||||
});
|
// });
|
||||||
if (`${username}@gitcode.com` === email) { // 需要修改默认邮箱的弹窗
|
if (`${username}@gitcode.com` === email) { // 需要修改默认邮箱的弹窗
|
||||||
localStorage.setItem('validator_email', 'invalid');
|
localStorage.setItem('validator_email', 'invalid');
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user