mirror of
https://github.com/bitwarden/browser.git
synced 2025-12-05 09:14:28 +01:00
explicitly provided user id
This commit is contained in:
parent
eed31a0594
commit
1b19c856d6
@ -247,7 +247,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
|
||||
pin: await this.pinService.isPinSet(activeAccount.id),
|
||||
pinLockWithMasterPassword:
|
||||
(await this.pinService.getPinLockType(activeAccount.id)) == "EPHEMERAL",
|
||||
biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(),
|
||||
biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(activeAccount.id),
|
||||
enableAutoBiometricsPrompt: await firstValueFrom(
|
||||
this.biometricStateService.promptAutomatically$,
|
||||
),
|
||||
|
||||
@ -377,6 +377,7 @@ describe("ExtensionLockComponentService", () => {
|
||||
const unlockOptions = await firstValueFrom(service.getAvailableUnlockOptions$(userId));
|
||||
|
||||
expect(unlockOptions).toEqual(expectedOutput);
|
||||
expect(biometricStateService.biometricUnlockEnabled$).toHaveBeenCalledWith(userId);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@ -65,7 +65,7 @@ export class ExtensionLockComponentService implements LockComponentService {
|
||||
return combineLatest([
|
||||
// Note: defer is preferable b/c it delays the execution of the function until the observable is subscribed to
|
||||
defer(async () => {
|
||||
if (!(await firstValueFrom(this.biometricStateService.biometricUnlockEnabled$()))) {
|
||||
if (!(await firstValueFrom(this.biometricStateService.biometricUnlockEnabled$(userId)))) {
|
||||
return BiometricsStatus.NotEnabledLocally;
|
||||
} else {
|
||||
// TODO remove after 2025.3
|
||||
|
||||
@ -385,7 +385,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
|
||||
this.vaultTimeoutSettingsService.getVaultTimeoutActionByUserId$(activeAccount.id),
|
||||
),
|
||||
pin: this.userHasPinSet,
|
||||
biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(),
|
||||
biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(activeAccount.id),
|
||||
requireMasterPasswordOnAppRestart: !(await this.biometricsService.hasPersistentKey(
|
||||
activeAccount.id,
|
||||
)),
|
||||
|
||||
@ -39,7 +39,7 @@ export class AccountSecurityNudgeService extends DefaultSingleNudgeService {
|
||||
this.getNudgeStatus$(nudgeType, userId),
|
||||
of(Date.now() - THIRTY_DAYS_MS),
|
||||
from(this.pinService.isPinSet(userId)),
|
||||
this.biometricStateService.biometricUnlockEnabled$(),
|
||||
this.biometricStateService.biometricUnlockEnabled$(userId),
|
||||
this.organizationService.organizations$(userId),
|
||||
this.policyService.policiesByType$(PolicyType.RemoveUnlockWithPin, userId),
|
||||
]).pipe(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user