From 606bd02d07a6dadfb58fb2ed0dc479b6af6ac8da Mon Sep 17 00:00:00 2001 From: Alec Rippberger Date: Wed, 16 Oct 2024 10:14:22 -0500 Subject: [PATCH] Add back safeProviders for LoginEmailService --- .../src/popup/services/services.module.ts | 17 +++++++++++++++-- .../desktop/src/app/services/services.module.ts | 16 ++++++++++++++-- apps/web/src/app/core/core.module.ts | 11 ++++++++++- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 72123fe6d7..8164333ab0 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -23,13 +23,21 @@ import { LoginComponentService, LockComponentService, } from "@bitwarden/auth/angular"; -import { LockService, PinServiceAbstraction } from "@bitwarden/auth/common"; +import { + LockService, + LoginEmailService, + LoginEmailService, + PinServiceAbstraction, +} from "@bitwarden/auth/common"; import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service"; +import { + AccountService, + AccountService as AccountServiceAbstraction, +} from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config.service"; import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction"; @@ -611,6 +619,11 @@ const safeProviders: SafeProvider[] = [ useClass: flagEnabled("sdk") ? BrowserSdkClientFactory : NoopSdkClientFactory, deps: [], }), + safeProvider({ + provide: LoginEmailService, + useClass: LoginEmailService, + deps: [AccountService, AuthService, StateProvider], + }), ]; @NgModule({ diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index f25140773e..e1dbb122dc 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -26,14 +26,21 @@ import { } from "@bitwarden/auth/angular"; import { InternalUserDecryptionOptionsServiceAbstraction, + LoginEmailService, PinServiceAbstraction, } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service"; -import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; +import { + AccountService, + AccountService as AccountServiceAbstraction, +} from "@bitwarden/common/auth/abstractions/account.service"; +import { + AuthService, + AuthService as AuthServiceAbstraction, +} from "@bitwarden/common/auth/abstractions/auth.service"; import { KdfConfigService, KdfConfigService as KdfConfigServiceAbstraction, @@ -331,6 +338,11 @@ const safeProviders: SafeProvider[] = [ useClass: flagEnabled("sdk") ? DefaultSdkClientFactory : NoopSdkClientFactory, deps: [], }), + safeProvider({ + provide: LoginEmailService, + useClass: LoginEmailService, + deps: [AccountService, AuthService, StateProvider], + }), ]; @NgModule({ diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts index 59c9da3518..0e89dadd76 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -31,7 +31,10 @@ import { LockComponentService, SetPasswordJitService, } from "@bitwarden/auth/angular"; -import { InternalUserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common"; +import { + InternalUserDecryptionOptionsServiceAbstraction, + LoginEmailService, +} from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; @@ -41,6 +44,7 @@ import { } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountApiService as AccountApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/account-api.service"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config.service"; import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction"; import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction"; @@ -278,6 +282,11 @@ const safeProviders: SafeProvider[] = [ useClass: flagEnabled("sdk") ? WebSdkClientFactory : NoopSdkClientFactory, deps: [], }), + safeProvider({ + provide: LoginEmailService, + useClass: LoginEmailService, + deps: [AccountService, AuthService, StateProvider], + }), ]; @NgModule({