mirror of
https://gitlab.com/PronounsPage/PronounsPage.git
synced 2025-09-23 04:34:15 -04:00
troubleshoot
This commit is contained in:
parent
b968fc6f18
commit
ac39968a6d
@ -117,6 +117,7 @@ watch(socialLookup, async (v) => {
|
|||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
const user = await $fetch('/api/user/current');
|
const user = await $fetch('/api/user/current');
|
||||||
|
refreshCookie('token');
|
||||||
if (user) {
|
if (user) {
|
||||||
await setToken(user.token);
|
await setToken(user.token);
|
||||||
}
|
}
|
||||||
@ -213,7 +214,10 @@ const logoutAll = () => {
|
|||||||
const doLogout = async () => {
|
const doLogout = async () => {
|
||||||
await removeToken();
|
await removeToken();
|
||||||
logoutInProgress.value = false;
|
logoutInProgress.value = false;
|
||||||
setTimeout(() => window.location.reload(), 300);
|
setTimeout(() => {
|
||||||
|
console.log(localStorage.getItem('account-tokens'), tokenCookie.value, document.cookie);
|
||||||
|
window.location.reload();
|
||||||
|
}, 300);
|
||||||
};
|
};
|
||||||
|
|
||||||
const deleteAccount = async () => {
|
const deleteAccount = async () => {
|
||||||
|
@ -37,6 +37,7 @@ export default defineNuxtPlugin(async (nuxtApp) => {
|
|||||||
const store = useMainStore(nuxtApp.$pinia as Pinia);
|
const store = useMainStore(nuxtApp.$pinia as Pinia);
|
||||||
|
|
||||||
const tokenCookie = useCookie('token', longtimeCookieSetting);
|
const tokenCookie = useCookie('token', longtimeCookieSetting);
|
||||||
|
console.log('setup', tokenCookie.value, document?.cookie, store.token);
|
||||||
if (tokenCookie.value) {
|
if (tokenCookie.value) {
|
||||||
await store.setToken(tokenCookie.value);
|
await store.setToken(tokenCookie.value);
|
||||||
if (!store.token) {
|
if (!store.token) {
|
||||||
@ -68,12 +69,16 @@ export default defineNuxtPlugin(async (nuxtApp) => {
|
|||||||
accounts[account.username] = { token, account };
|
accounts[account.username] = { token, account };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
console.log('getAccounts', fallback, localStorage.getItem('account-tokens'), accounts, tokenCookie.value, document?.cookie, store.token);
|
||||||
return accounts;
|
return accounts;
|
||||||
};
|
};
|
||||||
const saveAccounts = (accounts: Record<string, Account>): void => {
|
const saveAccounts = (accounts: Record<string, Account>): void => {
|
||||||
store.setAccounts(accounts);
|
store.setAccounts(accounts);
|
||||||
|
console.log('saveAccounts', accounts, localStorage.getItem('account-tokens'));
|
||||||
|
console.trace();
|
||||||
window.localStorage.setItem('account-tokens', Object.values(accounts).map((x) => x.token)
|
window.localStorage.setItem('account-tokens', Object.values(accounts).map((x) => x.token)
|
||||||
.join('|'));
|
.join('|'));
|
||||||
|
console.log('saveAccounts, done', accounts, localStorage.getItem('account-tokens'));
|
||||||
};
|
};
|
||||||
|
|
||||||
const accounts = async (): Promise<void> => {
|
const accounts = async (): Promise<void> => {
|
||||||
@ -105,6 +110,8 @@ export default defineNuxtPlugin(async (nuxtApp) => {
|
|||||||
};
|
};
|
||||||
const removeToken = async (username: string | null = null): Promise<void> => {
|
const removeToken = async (username: string | null = null): Promise<void> => {
|
||||||
const accounts = await getAccounts();
|
const accounts = await getAccounts();
|
||||||
|
console.log('removeToken', username, accounts, toRaw(store.user), localStorage.getItem('account-tokens'), tokenCookie.value, document?.cookie, store.token);
|
||||||
|
console.trace();
|
||||||
|
|
||||||
if (store.user) {
|
if (store.user) {
|
||||||
delete accounts[username || store.user.username];
|
delete accounts[username || store.user.username];
|
||||||
@ -113,12 +120,15 @@ export default defineNuxtPlugin(async (nuxtApp) => {
|
|||||||
if (Object.keys(accounts).length === 0) {
|
if (Object.keys(accounts).length === 0) {
|
||||||
await store.setToken(null);
|
await store.setToken(null);
|
||||||
tokenCookie.value = null;
|
tokenCookie.value = null;
|
||||||
|
console.log('removeToken, set cookie', tokenCookie.value, document?.cookie, store.token);
|
||||||
} else {
|
} else {
|
||||||
await store.setToken(Object.values(accounts)[0].token);
|
await store.setToken(Object.values(accounts)[0].token);
|
||||||
tokenCookie.value = store.token;
|
tokenCookie.value = store.token;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
console.log('removeToken, saving', accounts, toRaw(store.user), localStorage.getItem('account-tokens'), tokenCookie.value, document?.cookie, store.token);
|
||||||
saveAccounts(accounts);
|
saveAccounts(accounts);
|
||||||
|
console.log('removeToken, done', toRaw(store.user), localStorage.getItem('account-tokens'), tokenCookie.value, document?.cookie, store.token);
|
||||||
};
|
};
|
||||||
return {
|
return {
|
||||||
provide: {
|
provide: {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user