misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix logging in to an existing account with different token

Browse source
This commit is contained in:
Hazelnoot 2025-06-22 10:31:15 -04:00
parent b00604b89e
commit a1bd5f0f52
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
packages/frontend/src/accounts.ts
View file

@ -40,7 +40,18 @@ export async function getAccounts(): Promise<{
} }
async function addAccount(host: string, user: Misskey.entities.User, token: AccountWithToken['token']) { async function addAccount(host: string, user: Misskey.entities.User, token: AccountWithToken['token']) {
if (!prefer.s.accounts.some(x => x[0] === host && x[1].id === user.id)) { // Check for duplicate accounts
if (prefer.s.accounts.some(x => x[0] === host && x[1].id === user.id)) {
if (store.s.accountTokens[host + '/' + user.id] !== token) {
// Replace account if the token changed
await removeAccount(host, user.id);
} else {
console.debug(`Not adding account ${host}/${user.id}: already logged in with same token.`);
return;
}
}
{
store.set('accountTokens', { ...store.s.accountTokens, [host + '/' + user.id]: token }); store.set('accountTokens', { ...store.s.accountTokens, [host + '/' + user.id]: token });
store.set('accountInfos', { ...store.s.accountInfos, [host + '/' + user.id]: user }); store.set('accountInfos', { ...store.s.accountInfos, [host + '/' + user.id]: user });
prefer.commit('accounts', [...prefer.s.accounts, [host, { id: user.id, username: user.username }]]); prefer.commit('accounts', [...prefer.s.accounts, [host, { id: user.id, username: user.username }]]);