diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index ff1a928af0..87071b7484 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -492,11 +492,7 @@ export default class MainBackground { this.policyService, ); this.badgeSettingsService = new BadgeSettingsService(this.stateProvider); - this.policyApiService = new PolicyApiService( - this.policyService, - this.apiService, - this.stateService, - ); + this.policyApiService = new PolicyApiService(this.policyService, this.apiService); this.keyConnectorService = new KeyConnectorService( this.stateService, this.cryptoService, diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index bcaf8417c9..35849a98e1 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -24,13 +24,8 @@ import { SettingsService } from "@bitwarden/common/abstractions/settings.service import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.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 { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; -import { - InternalPolicyService, - PolicyService, -} from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; -import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service"; import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; import { DeviceTrustCryptoServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust-crypto.service.abstraction"; @@ -312,17 +307,6 @@ function getBgService(service: keyof MainBackground) { }, deps: [StateServiceAbstraction, StateProvider, OrganizationService], }, - { - provide: PolicyApiServiceAbstraction, - useFactory: ( - policyService: InternalPolicyService, - apiService: ApiService, - stateService: StateService, - ) => { - return new PolicyApiService(policyService, apiService, stateService); - }, - deps: [InternalPolicyService, ApiService, StateService], - }, { provide: PlatformUtilsService, useFactory: getBgService("platformUtilsService"), diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 46c653a87f..e8548e74a0 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -384,11 +384,7 @@ export class Main { this.organizationService, ); - this.policyApiService = new PolicyApiService( - this.policyService, - this.apiService, - this.stateService, - ); + this.policyApiService = new PolicyApiService(this.policyService, this.apiService); this.keyConnectorService = new KeyConnectorService( this.stateService, diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index d20c8be1f8..ec2080e1b4 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -684,7 +684,7 @@ import { ModalService } from "./modal.service"; { provide: PolicyApiServiceAbstraction, useClass: PolicyApiService, - deps: [PolicyServiceAbstraction, ApiServiceAbstraction, StateServiceAbstraction], + deps: [InternalPolicyService, ApiServiceAbstraction], }, { provide: KeyConnectorServiceAbstraction, diff --git a/libs/common/src/admin-console/services/policy/policy-api.service.ts b/libs/common/src/admin-console/services/policy/policy-api.service.ts index 4ca4063f6c..0eb37f2305 100644 --- a/libs/common/src/admin-console/services/policy/policy-api.service.ts +++ b/libs/common/src/admin-console/services/policy/policy-api.service.ts @@ -4,7 +4,6 @@ import { ApiService } from "../../../abstractions/api.service"; import { HttpStatusCode } from "../../../enums"; import { ErrorResponse } from "../../../models/response/error.response"; import { ListResponse } from "../../../models/response/list.response"; -import { StateService } from "../../../platform/abstractions/state.service"; import { Utils } from "../../../platform/misc/utils"; import { PolicyApiServiceAbstraction } from "../../abstractions/policy/policy-api.service.abstraction"; import { InternalPolicyService } from "../../abstractions/policy/policy.service.abstraction"; @@ -18,7 +17,6 @@ export class PolicyApiService implements PolicyApiServiceAbstraction { constructor( private policyService: InternalPolicyService, private apiService: ApiService, - private stateService: StateService, ) {} async getPolicy(organizationId: string, type: PolicyType): Promise {