bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 17:53:39 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
gbubemismith
2024-04-11 17:46:35 +01:00
parent b843aa6bd1 dddeb93d64
commit fa810eed6b
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/browser/src/background/main.background.ts
View File

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

1
apps/desktop/src/app/app.component.ts
View File

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

6
libs/common/src/services/search.service.ts
View File

@@ -35,7 +35,7 @@ export const LUNR_SEARCH_INDEX = new UserKeyDefinition<SerializedLunrIndex>(
"searchIndex", "searchIndex",
{ {
deserializer: (obj: Jsonify<SerializedLunrIndex>) => obj, deserializer: (obj: Jsonify<SerializedLunrIndex>) => obj,
clearOn: ["lock"], clearOn: ["lock", "logout"],
}, },
); );
@@ -48,7 +48,7 @@ export const LUNR_SEARCH_INDEXED_ENTITY_ID = new UserKeyDefinition<IndexedEntity
"searchIndexedEntityId", "searchIndexedEntityId",
{ {
deserializer: (obj: Jsonify<IndexedEntityId>) => obj, deserializer: (obj: Jsonify<IndexedEntityId>) => obj,
clearOn: ["lock"], clearOn: ["lock", "logout"],
}, },
); );
@@ -61,7 +61,7 @@ export const LUNR_SEARCH_INDEXING = new UserKeyDefinition<boolean>(
"isIndexing", "isIndexing",
{ {
deserializer: (obj: Jsonify<boolean>) => obj, deserializer: (obj: Jsonify<boolean>) => obj,
clearOn: ["lock"], clearOn: ["lock", "logout"],
}, },
); );