@@ -140,6 +140,7 @@ export class AppComponent implements OnInit, OnDestroy {
@ViewChild("loginApproval", { read: ViewContainerRef, static: true })
loginApprovalModalRef: ViewContainerRef;
+ showHeader$ = this.accountService.showHeader$;
loading = false;
private lastActivity: Date = null;
diff --git a/apps/desktop/src/app/components/fido2placeholder.component.ts b/apps/desktop/src/app/components/fido2placeholder.component.ts
deleted file mode 100644
index f1f52dae439..00000000000
--- a/apps/desktop/src/app/components/fido2placeholder.component.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { CommonModule } from "@angular/common";
-import { Component, OnDestroy, OnInit } from "@angular/core";
-import { Router } from "@angular/router";
-import { BehaviorSubject, Observable } from "rxjs";
-
-import {
- DesktopFido2UserInterfaceService,
- DesktopFido2UserInterfaceSession,
-} from "../../autofill/services/desktop-fido2-user-interface.service";
-import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
-
-// FIXME(https://bitwarden.atlassian.net/browse/CL-764): Migrate to OnPush
-// eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection
-@Component({
- standalone: true,
- imports: [CommonModule],
- template: `
-
-
Select your passkey
-
-
-
-
-
-
-
-
-
- `,
-})
-export class Fido2PlaceholderComponent implements OnInit, OnDestroy {
- session?: DesktopFido2UserInterfaceSession = null;
- private cipherIdsSubject = new BehaviorSubject
([]);
- cipherIds$: Observable;
-
- constructor(
- private readonly desktopSettingsService: DesktopSettingsService,
- private readonly fido2UserInterfaceService: DesktopFido2UserInterfaceService,
- private readonly router: Router,
- ) {}
-
- ngOnInit() {
- this.session = this.fido2UserInterfaceService.getCurrentSession();
- this.cipherIds$ = this.session?.availableCipherIds$;
- }
-
- async chooseCipher(cipherId: string) {
- // For now: Set UV to true
- this.session?.confirmChosenCipher(cipherId, true);
-
- await this.router.navigate(["/"]);
- await this.desktopSettingsService.setModalMode(false);
- }
-
- ngOnDestroy() {
- this.cipherIdsSubject.complete(); // Clean up the BehaviorSubject
- }
-
- async confirmPasskey() {
- try {
- // Retrieve the current UI session to control the flow
- if (!this.session) {
- // todo: handle error
- throw new Error("No session found");
- }
-
- // If we want to we could submit information to the session in order to create the credential
- // const cipher = await session.createCredential({
- // userHandle: "userHandle2",
- // userName: "username2",
- // credentialName: "zxsd2",
- // rpId: "webauthn.io",
- // userVerification: true,
- // });
-
- this.session.notifyConfirmNewCredential(true);
-
- // Not sure this clean up should happen here or in session.
- // The session currently toggles modal on and send us here
- // But if this route is somehow opened outside of session we want to make sure we clean up?
- await this.router.navigate(["/"]);
- await this.desktopSettingsService.setModalMode(false);
- } catch {
- // TODO: Handle error appropriately
- }
- }
-
- async closeModal() {
- await this.router.navigate(["/"]);
- await this.desktopSettingsService.setModalMode(false);
-
- this.session.notifyConfirmNewCredential(false);
- // little bit hacky:
- this.session.confirmChosenCipher(null);
- }
-}
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index a0ee33a459c..d6f29b122ea 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -336,6 +336,7 @@ const safeProviders: SafeProvider[] = [
ConfigService,
Fido2AuthenticatorServiceAbstraction,
AccountService,
+ AuthService,
],
}),
safeProvider({
diff --git a/apps/desktop/src/autofill/guards/reactive-vault-guard.ts b/apps/desktop/src/autofill/guards/reactive-vault-guard.ts
new file mode 100644
index 00000000000..d16787ef46a
--- /dev/null
+++ b/apps/desktop/src/autofill/guards/reactive-vault-guard.ts
@@ -0,0 +1,42 @@
+import { inject } from "@angular/core";
+import { CanActivateFn, Router } from "@angular/router";
+import { combineLatest, map, switchMap, distinctUntilChanged } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
+import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
+
+import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
+
+/**
+ * Reactive route guard that redirects to the unlocked vault.
+ * Redirects to vault when unlocked in main window.
+ */
+export const reactiveUnlockVaultGuard: CanActivateFn = () => {
+ const router = inject(Router);
+ const authService = inject(AuthService);
+ const accountService = inject(AccountService);
+ const desktopSettingsService = inject(DesktopSettingsService);
+
+ return combineLatest([accountService.activeAccount$, desktopSettingsService.modalMode$]).pipe(
+ switchMap(([account, modalMode]) => {
+ if (!account) {
+ return [true];
+ }
+
+ // Monitor when the vault has been unlocked.
+ return authService.authStatusFor$(account.id).pipe(
+ distinctUntilChanged(),
+ map((authStatus) => {
+ // If vault is unlocked and we're not in modal mode, redirect to vault
+ if (authStatus === AuthenticationStatus.Unlocked && !modalMode?.isModalModeActive) {
+ return router.createUrlTree(["/vault"]);
+ }
+
+ // Otherwise keep user on the lock screen
+ return true;
+ }),
+ );
+ }),
+ );
+};
diff --git a/apps/desktop/src/autofill/modal/credentials/fido2-create.component.html b/apps/desktop/src/autofill/modal/credentials/fido2-create.component.html
new file mode 100644
index 00000000000..67fc76aa317
--- /dev/null
+++ b/apps/desktop/src/autofill/modal/credentials/fido2-create.component.html
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+ {{ "savePasskeyQuestion" | i18n }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ "noMatchingLoginsForSite" | i18n }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ "savePasskeyQuestion" | i18n }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ "passkeyAlreadyExists" | i18n }}
+ {{ "applicationDoesNotSupportDuplicates" | i18n }}
+
+
+
+
+