bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-03-02 11:31:44 +00:00
Code Issues Releases Wiki Activity

Cleanup and fix process reload on non-desktop

Browse Source
This commit is contained in:
Bernd Schoolmann
2024-12-02 12:03:57 +01:00
parent d8da1a95d5
commit df846a058d
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/common/src/key-management/services/default-process-reload.service.ts
View File

@@ -1,7 +1,10 @@
import { firstValueFrom, map, timeout } from "rxjs";
import { PinServiceAbstraction } from "@bitwarden/auth/common";
import { ClientType } from "@bitwarden/common/enums";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { BiometricStateService } from "@bitwarden/key-management";
import { VaultTimeoutSettingsService } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
@@ -22,6 +25,8 @@ export class DefaultProcessReloadService implements ProcessReloadServiceAbstract
private biometricStateService: BiometricStateService,
private accountService: AccountService,
private logService: LogService,
private platformUtilsService: PlatformUtilsService,
private pinService: PinServiceAbstraction,
) {}
async startProcessReload(authService: AuthService): Promise<void> {
@@ -49,6 +54,20 @@ export class DefaultProcessReloadService implements ProcessReloadServiceAbstract
return;
}
if (this.platformUtilsService.getClientType() !== ClientType.Desktop) {
// If there is an active user, check if they have a pinKeyEncryptedUserKeyEphemeral. If so, prevent process reload upon lock.
const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
if (userId != null) {
const ephemeralPin = await this.pinService.getPinKeyEncryptedUserKeyEphemeral(userId);
if (ephemeralPin != null) {
this.logService.info(
`[ProcessReloadService] User ${userId} has ephemeral pin, skipping process reload`,
);
return;
}
}
}
this.cancelProcessReload();
await this.executeProcessReload();
}