1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-20 02:03:39 +00:00

Merge branches 'vault/PM-7400' and 'main' of github.com:bitwarden/clients

This commit is contained in:
gbubemismith
2024-04-11 17:46:35 +01:00
3 changed files with 3 additions and 9 deletions

View File

@@ -1181,13 +1181,8 @@ export default class MainBackground {
//Needs to be checked before state is cleaned
const needStorageReseed = await this.needsStorageReseed();
const currentUserId = await this.stateService.getUserId();
const newActiveUser = await this.stateService.clean({ userId: userId });
if (userId == null || userId === currentUserId) {
await this.searchService.clearIndex();
}
await this.stateEventRunnerService.handleEvent("logout", userId);
if (newActiveUser != null) {

View File

@@ -609,7 +609,6 @@ export class AppComponent implements OnInit, OnDestroy {
// This must come last otherwise the logout will prematurely trigger
// a process reload before all the state service user data can be cleaned up
if (userBeingLoggedOut === preLogoutActiveUserId) {
await this.searchService.clearIndex();
this.authService.logOut(async () => {
if (expired) {
this.platformUtilsService.showToast(