From 665e7307e77f9c2aa1b178a1796db730a9b6efaa Mon Sep 17 00:00:00 2001 From: voommen-livefront Date: Fri, 6 Dec 2024 13:18:46 -0600 Subject: [PATCH] PM-14927 changed DI for critical apps service --- .../services/critical-apps-api.service.ts | 10 ++++++---- .../access-intelligence.module.ts | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts index dd60361e9a4..75cb9dfaec2 100644 --- a/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts +++ b/bitwarden_license/bit-common/src/tools/reports/risk-insights/services/critical-apps-api.service.ts @@ -1,4 +1,3 @@ -import { Injectable } from "@angular/core"; import { BehaviorSubject, first, @@ -22,9 +21,6 @@ import { OrganizationId } from "@bitwarden/common/types/guid"; import { OrgKey } from "@bitwarden/common/types/key"; import { KeyService } from "@bitwarden/key-management"; -@Injectable({ - providedIn: "root", -}) /* Retrieves and decrypts critical apps for a given organization * Encrypts and saves data for a given organization */ @@ -176,3 +172,9 @@ export interface PasswordHealthReportApplicationsResponse { } export type PasswordHealthReportApplicationId = Opaque; + +export const criticalServiceFactoryProvider = ( + apiService: ApiService, + keyService: KeyService, + encryptService: EncryptService, +) => new CriticalAppsApiService(apiService, keyService, encryptService); diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts index 3f177119aa8..abcac4a2442 100644 --- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence.module.ts @@ -1,9 +1,24 @@ import { NgModule } from "@angular/core"; +import { + CriticalAppsApiService, + criticalServiceFactoryProvider, +} from "@bitwarden/bit-common/tools/reports/risk-insights"; +import { ApiService } from "@bitwarden/common/abstractions/api.service"; +import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { KeyService } from "@bitwarden/key-management"; + import { AccessIntelligenceRoutingModule } from "./access-intelligence-routing.module"; import { RiskInsightsComponent } from "./risk-insights.component"; @NgModule({ imports: [RiskInsightsComponent, AccessIntelligenceRoutingModule], + providers: [ + { + provide: CriticalAppsApiService, + useFactory: criticalServiceFactoryProvider, + deps: [ApiService, KeyService, EncryptService], + }, + ], }) export class AccessIntelligenceModule {}