Skip to content

Commit 6f0a725

Browse files
authored
[PM-30483] Remove feature flagged logic for passkey unlock (#19798)
Now that passkey unlock has been released, this change removes the logic related to the passkey unlock feature flag pm-2035-passkey-unlock.
1 parent 04b1714 commit 6f0a725

5 files changed

Lines changed: 0 additions & 21 deletions

File tree

apps/browser/src/popup/services/services.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -659,14 +659,12 @@ const safeProviders: SafeProvider[] = [
659659
useClass: DefaultWebAuthnPrfUnlockService,
660660
deps: [
661661
WebAuthnLoginPrfKeyServiceAbstraction,
662-
KeyService,
663662
UserDecryptionOptionsServiceAbstraction,
664663
EncryptService,
665664
EnvironmentService,
666665
PlatformUtilsService,
667666
WINDOW,
668667
LogService,
669-
ConfigService,
670668
],
671669
}),
672670
safeProvider({

apps/desktop/src/app/services/services.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,14 +444,12 @@ const safeProviders: SafeProvider[] = [
444444
useClass: DefaultWebAuthnPrfUnlockService,
445445
deps: [
446446
WebAuthnLoginPrfKeyServiceAbstraction,
447-
KeyServiceAbstraction,
448447
UserDecryptionOptionsServiceAbstraction,
449448
EncryptService,
450449
EnvironmentService,
451450
PlatformUtilsServiceAbstraction,
452451
WINDOW,
453452
LogServiceAbstraction,
454-
ConfigService,
455453
],
456454
}),
457455
safeProvider({

apps/web/src/app/core/core.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,14 +497,12 @@ const safeProviders: SafeProvider[] = [
497497
useClass: DefaultWebAuthnPrfUnlockService,
498498
deps: [
499499
WebAuthnLoginPrfKeyServiceAbstraction,
500-
KeyServiceAbstraction,
501500
InternalUserDecryptionOptionsServiceAbstraction,
502501
EncryptService,
503502
EnvironmentService,
504503
PlatformUtilsService,
505504
WINDOW,
506505
LogService,
507-
ConfigService,
508506
],
509507
}),
510508
safeProvider({

libs/common/src/enums/feature-flag.enum.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export enum FeatureFlag {
4949
SdkKeyRotation = "pm-30144-sdk-key-rotation",
5050
LinuxBiometricsV2 = "pm-26340-linux-biometrics-v2",
5151
NoLogoutOnKdfChange = "pm-23995-no-logout-on-kdf-change",
52-
PasskeyUnlock = "pm-2035-passkey-unlock",
5352
PM27279_V2RegistrationTdeJit = "pm-27279-v2-registration-tde-jit",
5453
EnableAccountEncryptionV2KeyConnectorRegistration = "enable-account-encryption-v2-key-connector-registration",
5554
EnableAccountEncryptionV2JitPasswordRegistration = "enable-account-encryption-v2-jit-password-registration",
@@ -189,7 +188,6 @@ export const DefaultFeatureFlagValue = {
189188
[FeatureFlag.SdkKeyRotation]: FALSE,
190189
[FeatureFlag.LinuxBiometricsV2]: FALSE,
191190
[FeatureFlag.NoLogoutOnKdfChange]: FALSE,
192-
[FeatureFlag.PasskeyUnlock]: FALSE,
193191
[FeatureFlag.PM27279_V2RegistrationTdeJit]: FALSE,
194192
[FeatureFlag.EnableAccountEncryptionV2KeyConnectorRegistration]: FALSE,
195193
[FeatureFlag.EnableAccountEncryptionV2JitPasswordRegistration]: FALSE,

libs/key-management-ui/src/lock/services/default-webauthn-prf-unlock.service.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,15 @@ import {
77
} from "@bitwarden/auth/common";
88
import { WebAuthnLoginPrfKeyServiceAbstraction } from "@bitwarden/common/auth/abstractions/webauthn/webauthn-login-prf-key.service.abstraction";
99
import { ClientType } from "@bitwarden/common/enums";
10-
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
1110
import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
1211
import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string";
13-
import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
1412
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
1513
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
1614
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
1715
import { Utils } from "@bitwarden/common/platform/misc/utils";
1816
import { Fido2Utils } from "@bitwarden/common/platform/services/fido2/fido2-utils";
1917
import { UserId } from "@bitwarden/common/types/guid";
2018
import { PrfKey, UserKey } from "@bitwarden/common/types/key";
21-
import { KeyService } from "@bitwarden/key-management";
2219

2320
import { WebAuthnPrfUnlockService } from "./webauthn-prf-unlock.service";
2421

@@ -27,28 +24,18 @@ export class DefaultWebAuthnPrfUnlockService implements WebAuthnPrfUnlockService
2724

2825
constructor(
2926
private webAuthnLoginPrfKeyService: WebAuthnLoginPrfKeyServiceAbstraction,
30-
private keyService: KeyService,
3127
private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction,
3228
private encryptService: EncryptService,
3329
private environmentService: EnvironmentService,
3430
private platformUtilsService: PlatformUtilsService,
3531
private window: Window,
3632
private logService: LogService,
37-
private configService: ConfigService,
3833
) {
3934
this.navigatorCredentials = this.window.navigator.credentials;
4035
}
4136

4237
async isPrfUnlockAvailable(userId: UserId): Promise<boolean> {
4338
try {
44-
// Check if feature flag is enabled
45-
const passkeyUnlockEnabled = await this.configService.getFeatureFlag(
46-
FeatureFlag.PasskeyUnlock,
47-
);
48-
if (!passkeyUnlockEnabled) {
49-
return false;
50-
}
51-
5239
// Check if browser supports WebAuthn
5340
if (!this.navigatorCredentials || !this.navigatorCredentials.get) {
5441
return false;

0 commit comments

Comments
 (0)