Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-19 02:51:14 +02:00
Code Issues Projects Releases Wiki Activity

[bug] Fix logout timeout action for inactive accounts (#660)

Browse Source 
* [bug] Fix logout timeout action for inactive accounts

* Pass userId in to the logout callback parameter to the vaultTimeoutService. The message handle in desktop already expects this.
* Set lastActive on account login, and null it on account deauthentication. This prevents an issue where newly logged in accounts immediatly time out due to inactivity.

* Add userId to locked callbacks

* Add userId to log out callback
This commit is contained in:
Addison Beck 2022-02-09 12:15:20 -05:00 committed by GitHub
parent 8cb029947b
commit c282ef8575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
angular/src/services/jslib-services.module.ts
View File

@ -313,7 +313,8 @@ import { StateFactory } from "jslib-common/factories/stateFactory";
keyConnectorService, keyConnectorService,
stateService, stateService,
null, null,
async () => messagingService.send("logout", { expired: false }) async (userId?: string) =>
messagingService.send("logout", { expired: false, userId: userId })
), ),
deps: [ deps: [
CipherServiceAbstraction, CipherServiceAbstraction,

2
common/src/services/state.service.ts
View File

@ -121,6 +121,7 @@ export class StateService<
await this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts); await this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts);
this.state.accounts[account.profile.userId] = account; this.state.accounts[account.profile.userId] = account;
await this.scaffoldNewAccountStorage(account); await this.scaffoldNewAccountStorage(account);
await this.setLastActive(new Date().getTime(), { userId: account.profile.userId });
await this.setActiveUser(account.profile.userId); await this.setActiveUser(account.profile.userId);
this.activeAccount.next(account.profile.userId); this.activeAccount.next(account.profile.userId);
} }
@ -2437,6 +2438,7 @@ export class StateService<
protected async deAuthenticateAccount(userId: string) { protected async deAuthenticateAccount(userId: string) {
await this.setAccessToken(null, { userId: userId }); await this.setAccessToken(null, { userId: userId });
await this.setLastActive(null, { userId: userId });
const index = this.state.authenticatedAccounts.indexOf(userId); const index = this.state.authenticatedAccounts.indexOf(userId);
if (index > -1) { if (index > -1) {
this.state.authenticatedAccounts.splice(index, 1); this.state.authenticatedAccounts.splice(index, 1);

8
common/src/services/vaultTimeout.service.ts
View File

@ -29,7 +29,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
private policyService: PolicyService, private policyService: PolicyService,
private keyConnectorService: KeyConnectorService, private keyConnectorService: KeyConnectorService,
private stateService: StateService, private stateService: StateService,
private lockedCallback: () => Promise<void> = null, private lockedCallback: (userId?: string) => Promise<void> = null,
private loggedOutCallback: (userId?: string) => Promise<void> = null private loggedOutCallback: (userId?: string) => Promise<void> = null
) {} ) {}
@ -87,7 +87,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
(pinSet[0] && (await this.stateService.getDecryptedPinProtected()) != null) || pinSet[1]; (pinSet[0] && (await this.stateService.getDecryptedPinProtected()) != null) || pinSet[1];
if (!pinLock && !(await this.isBiometricLockSet())) { if (!pinLock && !(await this.isBiometricLockSet())) {
await this.logOut(); await this.logOut(userId);
} }
} }
@ -110,7 +110,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
this.messagingService.send("locked", { userId: userId }); this.messagingService.send("locked", { userId: userId });
if (this.lockedCallback != null) { if (this.lockedCallback != null) {
await this.lockedCallback(); await this.lockedCallback(userId);
} }
} }
@ -198,6 +198,6 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
private async executeTimeoutAction(userId: string): Promise<void> { private async executeTimeoutAction(userId: string): Promise<void> {
const timeoutAction = await this.stateService.getVaultTimeoutAction({ userId: userId }); const timeoutAction = await this.stateService.getVaultTimeoutAction({ userId: userId });
timeoutAction === "logOut" ? await this.logOut() : await this.lock(true, userId); timeoutAction === "logOut" ? await this.logOut(userId) : await this.lock(true, userId);
} }
} }