2022-04-29 09:48:44 +02:00
|
|
|
import { APP_INITIALIZER, InjectionToken, NgModule } from "@angular/core";
|
|
|
|
|
|
|
|
import {
|
|
|
|
SECURE_STORAGE,
|
|
|
|
STATE_FACTORY,
|
|
|
|
STATE_SERVICE_USE_CACHE,
|
|
|
|
CLIENT_TYPE,
|
|
|
|
LOCALES_DIRECTORY,
|
|
|
|
SYSTEM_LANGUAGE,
|
2022-06-27 19:38:12 +02:00
|
|
|
MEMORY_STORAGE,
|
2022-09-07 22:23:32 +02:00
|
|
|
} from "@bitwarden/angular/services/injection-tokens";
|
|
|
|
import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module";
|
2022-06-23 13:36:05 +02:00
|
|
|
import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction";
|
2022-06-14 17:10:53 +02:00
|
|
|
import { BroadcasterService as BroadcasterServiceAbstraction } from "@bitwarden/common/abstractions/broadcaster.service";
|
|
|
|
import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
|
|
|
|
import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service";
|
2022-10-27 23:38:54 +02:00
|
|
|
import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
|
2022-06-29 23:15:29 +02:00
|
|
|
import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service";
|
2022-06-14 17:10:53 +02:00
|
|
|
import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
|
2022-04-29 09:48:44 +02:00
|
|
|
import {
|
|
|
|
LogService,
|
|
|
|
LogService as LogServiceAbstraction,
|
2022-06-14 17:10:53 +02:00
|
|
|
} from "@bitwarden/common/abstractions/log.service";
|
|
|
|
import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
|
|
|
|
import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service";
|
|
|
|
import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
|
|
|
|
import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service";
|
2022-06-27 19:38:12 +02:00
|
|
|
import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
|
2022-06-14 17:10:53 +02:00
|
|
|
import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service";
|
[AC-1011] Admin Console / Billing code ownership (#4973)
* refactor: move SCIM component to admin-console, refs EC-1011
* refactor: move scimProviderType to admin-console, refs EC-1011
* refactor: move scim-config.api to admin-console, refs EC-1011
* refactor: create models folder and nest existing api contents, refs EC-1011
* refactor: move scim-config to admin-console models, refs EC-1011
* refactor: move billing.component to billing, refs EC-1011
* refactor: remove nested app folder from new billing structure, refs EC-1011
* refactor: move organizations/billing to billing, refs EC-1011
* refactor: move add-credit and adjust-payment to billing/settings, refs EC-1011
* refactor: billing history/sync to billing, refs EC-1011
* refactor: move org plans, payment/method to billing/settings, refs EC-1011
* fix: update legacy file paths for payment-method and tax-info, refs EC-1011
* fix: update imports for scim component, refs EC-1011
* refactor: move subscription and tax-info into billing, refs EC-1011
* refactor: move user-subscription to billing, refs EC-1011
* refactor: move images/cards to billing and update base path, refs EC-1011
* refactor: move payment-method, plan subscription, and plan to billing, refs EC-1011
* refactor: move transaction-type to billing, refs EC-1011
* refactor: move billing-sync-config to billing, refs EC-1011
* refactor: move billing-sync and bit-pay-invoice request to billing, refs EC-1011
* refactor: move org subscription and tax info update requests to billing, refs EC-1011
* fix: broken paths to billing, refs EC-1011
* refactor: move payment request to billing, refs EC-1011
* fix: update remaining imports for payment-request, refs EC-1011
* refactor: move tax-info-update to billing, refs EC-1011
* refactor: move billing-payment, billing-history, and billing responses to billing, refs EC-1011
* refactor: move organization-subscription-responset to billing, refs EC-1011
* refactor: move payment and plan responses to billing, refs EC-1011
* refactor: move subscription response to billing ,refs EC-1011
* refactor: move tax info and rate responses to billing, refs EC-1011
* fix: update remaining path to base response for tax-rate response, refs EC-1011
* refactor: (browser) move organization-service to admin-console, refs EC-1011
* refactor: (browser) move organizaiton-service to admin-console, refs EC-1011
* refactor: (cli) move share command to admin-console, refs EC-1011
* refactor: move organization-collect request model to admin-console, refs EC-1011
* refactor: (web) move organization, collection/user responses to admin-console, refs EC-1011
* refactor: (cli) move selection-read-only to admin-console, refs EC-1011
* refactor: (desktop) move organization-filter to admin-console, refs EC-1011
* refactor: (web) move organization-switcher to admin-console, refs EC-1011
* refactor: (web) move access-selector to admin-console, refs EC-1011
* refactor: (web) move create folder to admin-console, refs EC-1011
* refactor: (web) move org guards folder to admin-console, refs EC-1011
* refactor: (web) move org layout to admin-console, refs EC-1011
* refactor: move manage collections to admin console, refs EC-1011
* refactor: (web) move collection-dialog to admin-console, refs EC-1011
* refactor: (web) move entity users/events and events component to admin-console, refs EC-1011
* refactor: (web) move groups/group-add-edit to admin-console, refs EC-1011
* refactor: (web) move manage, org-manage module, and user-confirm to admin-console, refs EC-1011
* refactor: (web) move people to admin-console, refs EC-1011
* refactor: (web) move reset-password to admin-console, refs EC-1011
* refactor: (web) move organization-routing and module to admin-console, refs EC-1011
* refactor: move admin-console and billing within app scope, refs EC-1011
* fix: update leftover merge conflicts, refs EC-1011
* refactor: (web) member-dialog to admin-console, refs EC-1011
* refactor: (web) move policies to admin-console, refs EC-1011
* refactor: (web) move reporting to admin-console, refs EC-1011
* refactor: (web) move settings to admin-console, refs EC-1011
* refactor: (web) move sponsorships to admin-console, refs EC-1011
* refactor: (web) move tools to admin-console, refs EC-1011
* refactor: (web) move users to admin-console, refs EC-1011
* refactor: (web) move collections to admin-console, refs EC-1011
* refactor: (web) move create-organization to admin-console, refs EC-1011
* refactor: (web) move licensed components to admin-console, refs EC-1011
* refactor: (web) move bit organization modules to admin-console, refs EC-1011
* fix: update leftover import statements for organizations.module, refs EC-1011
* refactor: (web) move personal vault and max timeout to admin-console, refs EC-1011
* refactor: (web) move providers to admin-console, refs EC-1011
* refactor: (libs) move organization service to admin-console, refs EC-1011
* refactor: (libs) move profile org/provider responses and other misc org responses to admin-console, refs EC-1011
* refactor: (libs) move provider request and selectionion-read-only request to admin-console, refs EC-1011
* fix: update missed import path for provider-user-update request, refs EC-1011
* refactor: (libs) move abstractions to admin-console, refs EC-1011
* refactor: (libs) move org/provider enums to admin-console, refs EC-1011
* fix: update downstream import statements from libs changes, refs EC-1011
* refactor: (libs) move data files to admin-console, refs EC-1011
* refactor: (libs) move domain to admin-console, refs EC-1011
* refactor: (libs) move request objects to admin-console, refs EC-1011
* fix: update downstream import changes from libs, refs EC-1011
* refactor: move leftover provider files to admin-console, refs EC-1011
* refactor: (browser) move group policy environment to admin-console, refs EC-1011
* fix: (browser) update downstream import statements, refs EC-1011
* fix: (desktop) update downstream libs moves, refs EC-1011
* fix: (cli) update downstream import changes from libs, refs EC-1011
* refactor: move org-auth related files to admin-console, refs EC-1011
* refactor: (libs) move request objects to admin-console, refs EC-1011
* refactor: move persmissions to admin-console, refs EC-1011
* refactor: move sponsored families to admin-console and fix libs changes, refs EC-1011
* refactor: move collections to admin-console, refs EC-1011
* refactor: move spec file back to spec scope, refs EC-1011
* fix: update downstream imports due to libs changes, refs EC-1011
* fix: udpate downstream import changes due to libs, refs EC-1011
* fix: update downstream imports due to libs changes, refs EC-1011
* fix: update downstream imports from libs changes, refs EC-1011
* fix: update path malformation in jslib-services.module, refs EC-1011
* fix: lint errors from improper casing, refs AC-1011
* fix: update downstream filename changes, refs AC-1011
* fix: (cli) update downstream filename changes, refs AC-1011
* fix: (desktop) update downstream filename changes, refs AC-1011
* fix: (browser) update downstream filename changes, refs AC-1011
* fix: lint errors, refs AC-1011
* fix: prettier, refs AC-1011
* fix: lint fixes for import order, refs AC-1011
* fix: update import path for provider user type, refs AC-1011
* fix: update new codes import paths for admin console structure, refs AC-1011
* fix: lint/prettier, refs AC-1011
* fix: update layout stories path, refs AC-1011
* fix: update comoponents card icons base variable in styles, refs AC-1011
* fix: update provider service path in permissions guard spec, refs AC-1011
* fix: update provider permission guard path, refs AC-1011
* fix: remove unecessary TODO for shared index export statement, refs AC-1011
* refactor: move browser-organization service and cli organization-user response out of admin-console, refs AC-1011
* refactor: move web/browser/desktop collections component to vault domain, refs AC-1011
* refactor: move organization.module out of admin-console scope, refs AC-1011
* fix: prettier, refs AC-1011
* refactor: move organizations-api-key.request out of admin-console scope, refs AC-1011
2023-03-22 16:03:50 +01:00
|
|
|
import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
|
2023-02-06 22:53:37 +01:00
|
|
|
import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
|
|
|
|
import { LoginService as LoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/login.service";
|
|
|
|
import { LoginService } from "@bitwarden/common/auth/services/login.service";
|
[AC-1266] Enums filename conventions (#5140)
* refactor: update clientType enum
* refactor: update deviceType filename
* refactor: update encryptedExportType filename
* refactor: update encryptionType filename
* refactor: update eventType filename
* refactor: update fieldType filename
* refactor: update fileUploadType filename
* refactor: update hashPurpose filename
* refactor: update htmlStorageLocation filename
* refactor: update kdfType filename
* refactor: update keySuffixOptions filename
* refactor: update linkedIdType filename
* refactor: update logLevelType filename
* refactor: update nativeMessagingVersion filename
* refactor: update notificationType filename
* refactor: update productType filename
* refactor: update secureNoteType filename
* refactor: update stateVersion filename
* refactor: update storageLocation filename
* refactor: update themeType filename
* refactor: update uriMatchType filename
* fix: update kdfType classes missed in initial pass, refs AC-1266
* fix: missing import update for device-type
* refactor: add barrel file for enums and update pathed import statements, refs AC-1266
* fix: incorrect import statements for web, refs AC-1266
* fix: missed import statement updates (browser), refs AC-1266
* fix: missed import statement changes (cli), refs AC-1266
* fix: missed import statement changes (desktop), refs AC-1266
* fix: prettier, refs AC-1266
* refactor: (libs) update relative paths to use barrel file, refs AC-1266
* fix: missed find/replace import statements for SecureNoteType, refs AC-1266
* refactor: apply .enum suffix to enums folder and modify leftover relative paths, refs AC-1266
* fix: find/replace errors for native-messaging-version, refs AC-1266
2023-04-05 05:42:21 +02:00
|
|
|
import { ClientType } from "@bitwarden/common/enums";
|
2022-06-14 17:10:53 +02:00
|
|
|
import { StateFactory } from "@bitwarden/common/factories/stateFactory";
|
2022-10-14 18:25:50 +02:00
|
|
|
import { GlobalState } from "@bitwarden/common/models/domain/global-state";
|
2022-06-27 19:38:12 +02:00
|
|
|
import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
|
2022-06-14 17:10:53 +02:00
|
|
|
import { SystemService } from "@bitwarden/common/services/system.service";
|
2023-03-10 21:39:46 +01:00
|
|
|
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
|
2023-01-31 22:08:37 +01:00
|
|
|
import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service";
|
|
|
|
import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
|
2022-04-29 09:48:44 +02:00
|
|
|
|
2023-02-06 22:53:37 +01:00
|
|
|
import { LoginGuard } from "../../auth/guards/login.guard";
|
2022-04-29 09:48:44 +02:00
|
|
|
import { Account } from "../../models/account";
|
2022-12-02 12:45:09 +01:00
|
|
|
import { ElectronCryptoService } from "../../services/electron-crypto.service";
|
|
|
|
import { ElectronLogService } from "../../services/electron-log.service";
|
|
|
|
import { ElectronPlatformUtilsService } from "../../services/electron-platform-utils.service";
|
|
|
|
import { ElectronRendererMessagingService } from "../../services/electron-renderer-messaging.service";
|
|
|
|
import { ElectronRendererSecureStorageService } from "../../services/electron-renderer-secure-storage.service";
|
|
|
|
import { ElectronRendererStorageService } from "../../services/electron-renderer-storage.service";
|
2023-04-18 15:09:47 +02:00
|
|
|
import { ElectronStateService } from "../../services/electron-state.service";
|
|
|
|
import { ElectronStateService as ElectronStateServiceAbstraction } from "../../services/electron-state.service.abstraction";
|
2022-11-24 15:05:45 +01:00
|
|
|
import { EncryptedMessageHandlerService } from "../../services/encrypted-message-handler.service";
|
2022-12-21 23:46:23 +01:00
|
|
|
import { I18nService } from "../../services/i18n.service";
|
2022-11-24 15:05:45 +01:00
|
|
|
import { NativeMessageHandlerService } from "../../services/native-message-handler.service";
|
|
|
|
import { NativeMessagingService } from "../../services/native-messaging.service";
|
2023-01-31 22:08:37 +01:00
|
|
|
import { PasswordRepromptService } from "../../vault/services/password-reprompt.service";
|
2022-04-29 09:48:44 +02:00
|
|
|
import { SearchBarService } from "../layout/search/search-bar.service";
|
|
|
|
|
2022-11-24 15:05:45 +01:00
|
|
|
import { DesktopFileDownloadService } from "./desktop-file-download.service";
|
2022-06-23 13:36:05 +02:00
|
|
|
import { DesktopThemingService } from "./desktop-theming.service";
|
2022-04-29 09:48:44 +02:00
|
|
|
import { InitService } from "./init.service";
|
|
|
|
|
|
|
|
const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK");
|
|
|
|
|
|
|
|
@NgModule({
|
|
|
|
imports: [JslibServicesModule],
|
|
|
|
declarations: [],
|
|
|
|
providers: [
|
|
|
|
InitService,
|
|
|
|
NativeMessagingService,
|
|
|
|
SearchBarService,
|
2022-05-09 14:19:18 +02:00
|
|
|
LoginGuard,
|
2022-04-29 09:48:44 +02:00
|
|
|
{
|
|
|
|
provide: APP_INITIALIZER,
|
|
|
|
useFactory: (initService: InitService) => initService.init(),
|
|
|
|
deps: [InitService],
|
|
|
|
multi: true,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
provide: STATE_FACTORY,
|
|
|
|
useValue: new StateFactory(GlobalState, Account),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
provide: CLIENT_TYPE,
|
|
|
|
useValue: ClientType.Desktop,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
provide: RELOAD_CALLBACK,
|
|
|
|
useValue: null,
|
|
|
|
},
|
|
|
|
{ provide: LogServiceAbstraction, useClass: ElectronLogService, deps: [] },
|
|
|
|
{
|
|
|
|
provide: PlatformUtilsServiceAbstraction,
|
|
|
|
useClass: ElectronPlatformUtilsService,
|
|
|
|
deps: [
|
|
|
|
I18nServiceAbstraction,
|
|
|
|
MessagingServiceAbstraction,
|
|
|
|
CLIENT_TYPE,
|
|
|
|
StateServiceAbstraction,
|
|
|
|
],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
provide: I18nServiceAbstraction,
|
2022-12-21 23:46:23 +01:00
|
|
|
useClass: I18nService,
|
2022-04-29 09:48:44 +02:00
|
|
|
deps: [SYSTEM_LANGUAGE, LOCALES_DIRECTORY],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
provide: MessagingServiceAbstraction,
|
|
|
|
useClass: ElectronRendererMessagingService,
|
|
|
|
deps: [BroadcasterServiceAbstraction],
|
|
|
|
},
|
2022-06-27 19:38:12 +02:00
|
|
|
{ provide: AbstractStorageService, useClass: ElectronRendererStorageService },
|
2022-04-29 09:48:44 +02:00
|
|
|
{ provide: SECURE_STORAGE, useClass: ElectronRendererSecureStorageService },
|
2022-06-27 19:38:12 +02:00
|
|
|
{ provide: MEMORY_STORAGE, useClass: MemoryStorageService },
|
2022-04-29 09:48:44 +02:00
|
|
|
{
|
|
|
|
provide: SystemServiceAbstraction,
|
|
|
|
useClass: SystemService,
|
|
|
|
deps: [
|
|
|
|
MessagingServiceAbstraction,
|
|
|
|
PlatformUtilsServiceAbstraction,
|
|
|
|
RELOAD_CALLBACK,
|
|
|
|
StateServiceAbstraction,
|
|
|
|
],
|
|
|
|
},
|
|
|
|
{ provide: PasswordRepromptServiceAbstraction, useClass: PasswordRepromptService },
|
|
|
|
{
|
|
|
|
provide: StateServiceAbstraction,
|
2023-04-18 15:09:47 +02:00
|
|
|
useClass: ElectronStateService,
|
2022-04-29 09:48:44 +02:00
|
|
|
deps: [
|
2022-06-27 19:38:12 +02:00
|
|
|
AbstractStorageService,
|
2022-04-29 09:48:44 +02:00
|
|
|
SECURE_STORAGE,
|
2022-06-27 19:38:12 +02:00
|
|
|
MEMORY_STORAGE,
|
2022-04-29 09:48:44 +02:00
|
|
|
LogService,
|
|
|
|
StateMigrationServiceAbstraction,
|
|
|
|
STATE_FACTORY,
|
|
|
|
STATE_SERVICE_USE_CACHE,
|
|
|
|
],
|
|
|
|
},
|
2023-04-18 15:09:47 +02:00
|
|
|
{
|
|
|
|
provide: ElectronStateServiceAbstraction,
|
|
|
|
useExisting: StateServiceAbstraction,
|
|
|
|
},
|
2022-06-29 23:15:29 +02:00
|
|
|
{
|
|
|
|
provide: FileDownloadService,
|
|
|
|
useClass: DesktopFileDownloadService,
|
|
|
|
},
|
2022-06-23 13:36:05 +02:00
|
|
|
{
|
|
|
|
provide: AbstractThemingService,
|
|
|
|
useClass: DesktopThemingService,
|
|
|
|
},
|
2022-09-23 21:47:17 +02:00
|
|
|
{
|
|
|
|
provide: EncryptedMessageHandlerService,
|
|
|
|
deps: [
|
|
|
|
StateServiceAbstraction,
|
|
|
|
AuthServiceAbstraction,
|
|
|
|
CipherServiceAbstraction,
|
|
|
|
PolicyServiceAbstraction,
|
|
|
|
MessagingServiceAbstraction,
|
|
|
|
PasswordGenerationServiceAbstraction,
|
|
|
|
],
|
|
|
|
},
|
|
|
|
{
|
|
|
|
provide: NativeMessageHandlerService,
|
|
|
|
deps: [
|
|
|
|
StateServiceAbstraction,
|
|
|
|
CryptoServiceAbstraction,
|
|
|
|
CryptoFunctionServiceAbstraction,
|
|
|
|
MessagingServiceAbstraction,
|
|
|
|
I18nServiceAbstraction,
|
|
|
|
EncryptedMessageHandlerService,
|
|
|
|
],
|
|
|
|
},
|
2022-10-28 20:54:55 +02:00
|
|
|
{
|
|
|
|
provide: LoginServiceAbstraction,
|
|
|
|
useClass: LoginService,
|
2022-12-16 16:08:44 +01:00
|
|
|
deps: [StateServiceAbstraction],
|
2022-10-28 20:54:55 +02:00
|
|
|
},
|
2023-04-18 15:09:47 +02:00
|
|
|
{
|
|
|
|
provide: CryptoServiceAbstraction,
|
|
|
|
useClass: ElectronCryptoService,
|
|
|
|
deps: [
|
|
|
|
CryptoFunctionServiceAbstraction,
|
|
|
|
EncryptService,
|
|
|
|
PlatformUtilsServiceAbstraction,
|
|
|
|
LogService,
|
|
|
|
StateServiceAbstraction,
|
|
|
|
],
|
|
|
|
},
|
2022-04-29 09:48:44 +02:00
|
|
|
],
|
|
|
|
})
|
|
|
|
export class ServicesModule {}
|