bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00
Code Issues Releases Wiki Activity

[PM-21611] Require userId on KeyService clear methods (#14788)

Browse Source
This commit is contained in:
Thomas Avery
2025-05-22 13:55:26 -05:00
committed by GitHub
parent 57911f210b
commit bd29397fd8
9 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/browser/src/auth/popup/settings/account-security.component.ts
View File

@@ -480,7 +480,8 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
});
await this.vaultNudgesService.dismissNudge(NudgeType.AccountSecurity, userId);
} else {
await this.vaultTimeoutSettingsService.clear();
const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
await this.vaultTimeoutSettingsService.clear(userId);
}
}

2
apps/cli/src/service-container/service-container.ts
View File

@@ -874,7 +874,7 @@ export class ServiceContainer {
const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$));
await Promise.all([
this.eventUploadService.uploadEvents(userId as UserId),
this.keyService.clearKeys(),
this.keyService.clearKeys(userId),
this.cipherService.clear(userId),
this.folderService.clear(userId),
this.collectionService.clear(userId),

3
apps/desktop/src/app/accounts/settings.component.ts
View File

@@ -506,7 +506,8 @@ export class SettingsComponent implements OnInit, OnDestroy {
await this.updateRequirePasswordOnStart();
}
await this.vaultTimeoutSettingsService.clear();
const userId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
await this.vaultTimeoutSettingsService.clear(userId);
}
this.messagingService.send("redrawMenu");

2
apps/web/src/app/app.component.ts
View File

@@ -282,7 +282,7 @@ export class AppComponent implements OnDestroy, OnInit {
);
await Promise.all([
this.keyService.clearKeys(),
this.keyService.clearKeys(userId),
this.cipherService.clear(userId),
this.folderService.clear(userId),
this.collectionService.clear(userId),