Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-26 12:25:20 +01:00
Code Issues Projects Releases Wiki Activity

Trust our own copy of authenticatedAccounts until all accounts are initialized (#8888)

Browse Source
This commit is contained in:
Justin Baur 2024-04-23 16:57:19 -04:00 committed by GitHub
parent 790c9a6141
commit 8ef5340635
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libs/common/src/platform/services/state.service.ts
View File

@ -115,14 +115,19 @@ export class StateService<
return; return;
} }
// Get all likely authenticated accounts
const authenticatedAccounts = (
(await this.storageService.get<string[]>(keys.authenticatedAccounts)) ?? []
).filter((account) => account != null);
await this.updateState(async (state) => { await this.updateState(async (state) => {
state.authenticatedAccounts = for (const i in authenticatedAccounts) {
(await this.storageService.get<string[]>(keys.authenticatedAccounts)) ?? []; state = await this.syncAccountFromDisk(authenticatedAccounts[i]);
for (const i in state.authenticatedAccounts) {
if (i != null) {
state = await this.syncAccountFromDisk(state.authenticatedAccounts[i]);
}
} }
// After all individual accounts have been added
state.authenticatedAccounts = authenticatedAccounts;
const storedActiveUser = await this.storageService.get<string>(keys.activeUserId); const storedActiveUser = await this.storageService.get<string>(keys.activeUserId);
if (storedActiveUser != null) { if (storedActiveUser != null) {
state.activeUserId = storedActiveUser; state.activeUserId = storedActiveUser;