Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-16932] Fix timeout when desktop app is not started #12799

Merged
merged 6 commits into from
Jan 13, 2025
+12 −4
Merged

[PM-16932] Fix timeout when desktop app is not started #12799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d10baf8
Fix biometrics button showing up when biometrics is not enabled
quexten Jan 9, 2025
2439e23
Fix tests
quexten Jan 9, 2025
f1d93b6
Fix timeout when desktop app is not started
quexten Jan 10, 2025
81d0f67
Merge branch 'main' into km/biometrics-timeout
quexten Jan 13, 2025
6c45d7c
Update comments for legacy biometrics removal
quexten Jan 13, 2025
aabbb42
Merge branch 'km/biometrics-timeout' of github.com:bitwarden/clients …
quexten Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/browser/src/background/nativeMessaging.background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ export class NativeMessagingBackground {
message.command == BiometricsCommands.Unlock ||
message.command == BiometricsCommands.IsAvailable
) {
// TODO remove after 2025.01
// TODO remove after 2025.3
// wait until there is no other callbacks, or timeout
const call = await firstValueFrom(
race(
Expand Down
10 changes: 9 additions & 1 deletion apps/browser/src/key-management/lock/services/extension-lock-component.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,15 @@ export class ExtensionLockComponentService implements LockComponentService {
if (!(await firstValueFrom(this.biometricStateService.biometricUnlockEnabled$))) {
return BiometricsStatus.NotEnabledLocally;
} else {
return await this.biometricsService.getBiometricsStatusForUser(userId);
// TODO remove after 2025.3
// remove after backward compatibility code for old biometrics ipc protocol is removed
const result: BiometricsStatus = (await Promise.race([
this.biometricsService.getBiometricsStatusForUser(userId),
new Promise((resolve) =>
setTimeout(() => resolve(BiometricsStatus.DesktopDisconnected), 1000),
mzieniukbw marked this conversation as resolved.
Show resolved Hide resolved
),
])) as BiometricsStatus;
return result;
}
}),
this.userDecryptionOptionsService.userDecryptionOptionsById$(userId),
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/src/services/biometric-message-handler.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export class BiometricMessageHandlerService {
appId,
);
}
// TODO: legacy, remove after 2025.01
// TODO: legacy, remove after 2025.3
case BiometricsCommands.IsAvailable: {
const available =
(await this.biometricsService.getBiometricsStatus()) == BiometricsStatus.Available;
Expand All @@ -200,7 +200,7 @@ export class BiometricMessageHandlerService {
appId,
);
}
// TODO: legacy, remove after 2025.01
// TODO: legacy, remove after 2025.3
case BiometricsCommands.Unlock: {
const isTemporarilyDisabled =
(await this.biometricStateService.getBiometricUnlockEnabled(message.userId as UserId)) &&
Expand Down
Loading