From 5cfb6619fc02c49a9a004511ec0dcb529af84e1e Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Wed, 9 Feb 2022 23:56:14 +0100 Subject: [PATCH] Fixing some regression issues (#2325) * Pull jslib * Extend vaultTimeoutServiceCallbacks to use userId * Remove redundant call to tokenService.clear --- jslib | 2 +- src/background/main.background.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index e0cc754d6f..995ad076cc 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit e0cc754d6fe962a5e7eae6d1dead8b44606d4853 +Subproject commit 995ad076cca1795ec78f87b81ed3cd2e727703d1 diff --git a/src/background/main.background.ts b/src/background/main.background.ts index 6cb78a1694..01830eb159 100644 --- a/src/background/main.background.ts +++ b/src/background/main.background.ts @@ -268,7 +268,7 @@ export default class MainBackground { ); const vaultTimeoutServiceCallbacks = { - locked: async () => { + locked: async (userId?: string) => { if (this.notificationsService != null) { this.notificationsService.updateConnection(false); } @@ -279,7 +279,7 @@ export default class MainBackground { await this.reloadProcess(); } }, - logout: async () => await this.logout(false), + logout: async (userId?: string) => await this.logout(false, userId), }; this.vaultTimeoutService = new VaultTimeoutService( @@ -555,7 +555,6 @@ export default class MainBackground { await Promise.all([ this.eventService.clearEvents(userId), this.syncService.setLastSync(new Date(0), userId), - this.tokenService.clearToken(userId), this.cryptoService.clearKeys(userId), this.settingsService.clear(userId), this.cipherService.clear(userId),