Skip to content

Reduce GlobalStore accounts in addition to sessionStorage removal #5849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2024
Merged

Reduce GlobalStore accounts in addition to sessionStorage removal #5849

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e673e22
Reduce GlobalStore accounts in addition to sessionStorage removal
martgil Oct 9, 2024
1c34149
use better variable names
martgil Oct 9, 2024
0a5dcc2
pr reviews: apply corrections
martgil Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions extension/js/common/platform/store/global-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ export class GlobalStore extends AbstractStore {
}
}

public static async acctEmailsRemove(acctEmail: string): Promise<void> {
public static async acctEmailsRemove(acctEmail: string, openUninstallUrl = true): Promise<void> {
// todo: concurrency issues with another tab loaded at the same time
const acctEmails = await GlobalStore.acctEmailsGet();
await GlobalStore.set({ account_emails: JSON.stringify(Value.arr.withoutVal(acctEmails, acctEmail)) }); // eslint-disable-line @typescript-eslint/naming-convention
BrowserMsg.send.bg.updateUninstallUrl();
if (openUninstallUrl) {
BrowserMsg.send.bg.updateUninstallUrl();
}
}
}
2 changes: 2 additions & 0 deletions extension/js/common/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ export class Settings {
const acctEmails = await GlobalStore.acctEmailsGet();
if (!acctEmails.includes(acctEmail)) {
throw new Error(`"${acctEmail}" is not a known account_email in "${JSON.stringify(acctEmails)}"`);
} else {
await GlobalStore.acctEmailsRemove(acctEmail, false);
}
const storageIndexesToRemove: AccountIndex[] = [];
const filter = AbstractStore.singleScopeRawIndex(acctEmail, '');
Expand Down
Loading