1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-22 12:24:01 +00:00

Merge branch 'main' into auth/pm-9115/implement-view-data-persistence-in-2FA-flows

This commit is contained in:
Alec Rippberger
2025-03-10 10:55:38 -05:00
committed by GitHub
395 changed files with 10432 additions and 9090 deletions

View File

@@ -108,6 +108,8 @@ export class TwoFactorAuthWebAuthnComponent implements OnInit, OnDestroy {
this.webAuthnResultEmitter.emit({ token });
},
(error: string) => {
this.logService.error("WebAuthn error: ", error);
this.toastService.showToast({
variant: "error",
title: this.i18nService.t("errorOccurred"),

View File

@@ -4,7 +4,6 @@ import { ActivatedRoute, Router, convertToParamMap } from "@angular/router";
import { mock, MockProxy } from "jest-mock-extended";
import { BehaviorSubject, of } from "rxjs";
// eslint-disable-next-line no-restricted-imports
import { WINDOW } from "@bitwarden/angular/services/injection-tokens";
import {
LoginStrategyServiceAbstraction,