vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Merge pull request #2322 from bitwarden/Bug/AccountSwitching/LogoutRedirect 

[bug] Dont block redirecting on logout
This commit is contained in:
Addison Beck 2022-02-08 10:10:01 -05:00 committed by GitHub
parent 0a44bf4dd9 55850e6cc6
commit ca7381af35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/background/main.background.ts
View File

@ -556,10 +556,6 @@ export default class MainBackground {
}
async logout(expired: boolean, userId?: string) {
if (!userId) {
userId = await this.stateService.getUserId();
}
await this.eventService.uploadEvents(userId);
await Promise.all([
@ -577,7 +573,7 @@ export default class MainBackground {
this.keyConnectorService.clear(),
]);
await this.stateService.clean();
await this.stateService.clean({ userId: userId });
if (userId == null || userId === (await this.stateService.getUserId())) {
this.searchService.clearIndex();
@ -996,13 +992,14 @@ export default class MainBackground {
}
private async reloadProcess(): Promise<void> {
const accounts = Object.keys(this.stateService.accounts.getValue());
for (const userId of accounts) {
if (!(await this.vaultTimeoutService.isLocked(userId))) {
return;
const accounts = this.stateService.accounts.getValue();
if (accounts != null) {
for (const userId of Object.keys(accounts)) {
if (!(await this.vaultTimeoutService.isLocked(userId))) {
return;
}
}
}
await this.systemService.startProcessReload();
}
}

2
src/popup/app.component.ts
View File

@ -75,8 +75,6 @@ export class AppComponent implements OnInit {
});
}
await this.stateService.clean({ userId: msg.userId });
if (this.stateService.activeAccount.getValue() == null) {
this.router.navigate(["home"]);
}