可信代码库-生产环境token覆盖问题解决
This commit is contained in:
@@ -11,8 +11,8 @@ export interface AccountInfo {
|
||||
avatar?: string;
|
||||
nickname?: string;
|
||||
username?: string;
|
||||
access_token?: string;
|
||||
refresh_token?: string;
|
||||
op_access_token?: string;
|
||||
op_refresh_token?: string;
|
||||
xauth_token?: string;
|
||||
isFollow?: boolean;
|
||||
atomgit_username?: string;
|
||||
@@ -20,26 +20,26 @@ export interface AccountInfo {
|
||||
}
|
||||
|
||||
export const useAccountStore = defineStore('accountInfo', () => {
|
||||
const cacheInfo = localStorage.getItem('userInfo');
|
||||
const isLogin = ref(Boolean(localStorage.getItem('access_token')));
|
||||
const cacheInfo = localStorage.getItem('opUserInfo');
|
||||
const isLogin = ref(Boolean(localStorage.getItem('op_access_token')));
|
||||
const userInfo = cacheInfo ? JSON.parse(cacheInfo).data : {};
|
||||
const accountInfo = reactive<AccountInfo>({
|
||||
access_token: localStorage.getItem('access_token') || '',
|
||||
refresh_token: localStorage.getItem('refresh_token') || '',
|
||||
op_access_token: localStorage.getItem('op_access_token') || '',
|
||||
op_refresh_token: localStorage.getItem('op_refresh_token') || '',
|
||||
xauth_token: localStorage.getItem('xauth_token') || '',
|
||||
...userInfo
|
||||
});
|
||||
|
||||
const refresh = () => {
|
||||
/** 重定向跳转时强刷使用 */
|
||||
const info = localStorage.getItem('userInfo');
|
||||
isLogin.value = Boolean(localStorage.getItem('access_token'));
|
||||
const info = localStorage.getItem('opUserInfo');
|
||||
isLogin.value = Boolean(localStorage.getItem('op_access_token'));
|
||||
const userData = info ? JSON.parse(info) : {};
|
||||
for (const key in userData) {
|
||||
accountInfo[key] = userData[key];
|
||||
}
|
||||
accountInfo.access_token = localStorage.getItem('access_token') || '';
|
||||
accountInfo.refresh_token = localStorage.getItem('refresh_token') || '';
|
||||
accountInfo.op_access_token = localStorage.getItem('op_access_token') || '';
|
||||
accountInfo.op_refresh_token = localStorage.getItem('op_refresh_token') || '';
|
||||
accountInfo.xauth_token = localStorage.getItem('xauth_token') || '';
|
||||
};
|
||||
|
||||
@@ -59,38 +59,39 @@ export const useAccountStore = defineStore('accountInfo', () => {
|
||||
}
|
||||
};
|
||||
// 可能有从博客跳转过来的,通过接口判断是否登陆
|
||||
const checkIsLogin = async (access_token: string, refresh_token: string) => {
|
||||
const checkIsLogin = async (op_access_token: string, op_refresh_token: string) => {
|
||||
// const { data, error } = await getUserToken();
|
||||
// if (data?.data) {
|
||||
// const { access_token, refresh_token } = data.data;
|
||||
// const { op_access_token, op_refresh_token } = data.data;
|
||||
|
||||
if(!access_token|| !refresh_token) {
|
||||
if(!op_access_token|| !op_refresh_token) {
|
||||
return
|
||||
}
|
||||
localStorage.setItem('access_token', access_token);
|
||||
localStorage.setItem('refresh_token', refresh_token);
|
||||
localStorage.setItem('op_access_token', op_access_token);
|
||||
localStorage.setItem('op_refresh_token', op_refresh_token);
|
||||
saveStatus(true);
|
||||
saveAccountInfo({
|
||||
access_token: localStorage.getItem('access_token') || '',
|
||||
refresh_token: localStorage.getItem('refresh_token') || ''
|
||||
op_access_token: localStorage.getItem('op_access_token') || '',
|
||||
op_refresh_token: localStorage.getItem('op_refresh_token') || ''
|
||||
});
|
||||
debugger
|
||||
const userRes = await getUserInfo();
|
||||
if (userRes.data?.data && userRes.data?.data?.code===200) {
|
||||
localStorage.setItem('userInfo', JSON.stringify(userRes.data?.data));
|
||||
localStorage.setItem('opUserInfo', JSON.stringify(userRes.data?.data));
|
||||
saveAccountInfo({
|
||||
...userRes.data?.data
|
||||
});
|
||||
// }
|
||||
return true;
|
||||
} else {
|
||||
localStorage.removeItem('access_token');
|
||||
localStorage.removeItem('refresh_token');
|
||||
localStorage.removeItem('userInfo');
|
||||
localStorage.removeItem('op_access_token');
|
||||
localStorage.removeItem('op_refresh_token');
|
||||
localStorage.removeItem('opUserInfo');
|
||||
saveAccountInfo({});
|
||||
return false;
|
||||
}
|
||||
// localStorage.removeItem('access_token');
|
||||
// localStorage.removeItem('refresh_token');
|
||||
// localStorage.removeItem('op_access_token');
|
||||
// localStorage.removeItem('op_refresh_token');
|
||||
// localStorage.removeItem('userInfo');
|
||||
// saveAccountInfo({});
|
||||
// return false;
|
||||
@@ -111,7 +112,7 @@ export const useAccountStore = defineStore('accountInfo', () => {
|
||||
});
|
||||
|
||||
export const otherAccountStore = defineStore('otherInfo', () => {
|
||||
const isLogin = ref(Boolean(localStorage.getItem('access_token')));
|
||||
const isLogin = ref(Boolean(localStorage.getItem('op_access_token')));
|
||||
const userInfo = {};
|
||||
const accountInfo = reactive<AccountInfo>({
|
||||
...userInfo
|
||||
|
||||
Reference in New Issue
Block a user