Fixing some regression issues (#2325)

* Pull jslib

* Extend vaultTimeoutServiceCallbacks to use userId

* Remove redundant call to tokenService.clear
This commit is contained in:
Daniel James Smith 2022-02-09 23:56:14 +01:00 committed by GitHub
parent ebbf1d8b90
commit 95d92908f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

2
jslib

@ -1 +1 @@
Subproject commit 8cb029947bff7dda54a45483403c3f505fa3e6bc Subproject commit b7bb16c18a4bcd47988397bcf089fe6d895256b9

View File

@ -272,7 +272,7 @@ export default class MainBackground {
); );
const vaultTimeoutServiceCallbacks = { const vaultTimeoutServiceCallbacks = {
locked: async () => { locked: async (userId?: string) => {
if (this.notificationsService != null) { if (this.notificationsService != null) {
this.notificationsService.updateConnection(false); this.notificationsService.updateConnection(false);
} }
@ -283,7 +283,7 @@ export default class MainBackground {
await this.reloadProcess(); await this.reloadProcess();
} }
}, },
logout: async () => await this.logout(false), logout: async (userId?: string) => await this.logout(false, userId),
}; };
this.vaultTimeoutService = new VaultTimeoutService( this.vaultTimeoutService = new VaultTimeoutService(
@ -561,7 +561,6 @@ export default class MainBackground {
await Promise.all([ await Promise.all([
this.eventService.clearEvents(userId), this.eventService.clearEvents(userId),
this.syncService.setLastSync(new Date(0), userId), this.syncService.setLastSync(new Date(0), userId),
this.tokenService.clearToken(userId),
this.cryptoService.clearKeys(userId), this.cryptoService.clearKeys(userId),
this.settingsService.clear(userId), this.settingsService.clear(userId),
this.cipherService.clear(userId), this.cipherService.clear(userId),