From 745a0c987add8dff8061da7e6cc623cd716b0174 Mon Sep 17 00:00:00 2001 From: Todd Martin <106564991+trmartin4@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:08:44 -0500 Subject: [PATCH] Updated CryptoService DI to use getBgService again (#8146) --- .../src/popup/services/services.module.ts | 34 ++----------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 4634ff4a0335..577b958184bc 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -114,7 +114,6 @@ import { BrowserApi } from "../../platform/browser/browser-api"; import BrowserPopupUtils from "../../platform/popup/browser-popup-utils"; import { BrowserStateService as StateServiceAbstraction } from "../../platform/services/abstractions/browser-state.service"; import { BrowserConfigService } from "../../platform/services/browser-config.service"; -import { BrowserCryptoService } from "../../platform/services/browser-crypto.service"; import { BrowserEnvironmentService } from "../../platform/services/browser-environment.service"; import { BrowserFileDownloadService } from "../../platform/services/browser-file-download.service"; import { BrowserI18nService } from "../../platform/services/browser-i18n.service"; @@ -269,39 +268,12 @@ function getBgService(service: keyof MainBackground) { }, { provide: CryptoService, - useFactory: ( - keyGenerationService: KeyGenerationService, - cryptoFunctionService: CryptoFunctionService, - encryptService: EncryptService, - platformUtilsService: PlatformUtilsService, - logService: LogServiceAbstraction, - stateService: StateServiceAbstraction, - accountService: AccountServiceAbstraction, - stateProvider: StateProvider, - ) => { - const cryptoService = new BrowserCryptoService( - keyGenerationService, - cryptoFunctionService, - encryptService, - platformUtilsService, - logService, - stateService, - accountService, - stateProvider, - ); + useFactory: (encryptService: EncryptService) => { + const cryptoService = getBgService("cryptoService")(); new ContainerService(cryptoService, encryptService).attachToGlobal(self); return cryptoService; }, - deps: [ - KeyGenerationService, - CryptoFunctionService, - EncryptService, - PlatformUtilsService, - LogServiceAbstraction, - StateServiceAbstraction, - AccountServiceAbstraction, - StateProvider, - ], + deps: [EncryptService], }, { provide: AuthRequestServiceAbstraction,