1
0
mirror of https://github.com/bitwarden/browser synced 2026-02-08 04:33:38 +00:00

Merge branch 'main' into tools/pm-23335/use-org-export-api-on-encrypted-and-unencrypted-org-exports

This commit is contained in:
Daniel James Smith
2025-09-05 11:18:44 +02:00
committed by GitHub
171 changed files with 4758 additions and 1987 deletions

View File

@@ -105,7 +105,7 @@ import { WebAuthnLoginServiceAbstraction } from "@bitwarden/common/auth/abstract
import { AccountApiServiceImplementation } from "@bitwarden/common/auth/services/account-api.service";
import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service";
import { AnonymousHubService } from "@bitwarden/common/auth/services/anonymous-hub.service";
import { AuthRequestAnsweringService } from "@bitwarden/common/auth/services/auth-request-answering/auth-request-answering.service";
import { NoopAuthRequestAnsweringService } from "@bitwarden/common/auth/services/auth-request-answering/noop-auth-request-answering.service";
import { AuthService } from "@bitwarden/common/auth/services/auth.service";
import { AvatarService } from "@bitwarden/common/auth/services/avatar.service";
import { DefaultActiveUserAccessor } from "@bitwarden/common/auth/services/default-active-user.accessor";
@@ -951,16 +951,8 @@ const safeProviders: SafeProvider[] = [
}),
safeProvider({
provide: AuthRequestAnsweringServiceAbstraction,
useClass: AuthRequestAnsweringService,
deps: [
AccountServiceAbstraction,
ActionsService,
AuthServiceAbstraction,
I18nServiceAbstraction,
MasterPasswordServiceAbstraction,
PlatformUtilsServiceAbstraction,
SystemNotificationsService,
],
useClass: NoopAuthRequestAnsweringService,
deps: [],
}),
safeProvider({
provide: ServerNotificationsService,