[AC-2008] [AC-2123] [Pt 2] Transition PolicyService to use StateProvider (#7977)

* fully wire up StateProvider within PolicyService
* migrate old policy data to new location
* minor update to existing interfaces

apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts

@@ -1,4 +1,5 @@
 import { PolicyService as AbstractPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
+import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
 
 import {
   CachedServices,
@@ -9,11 +10,6 @@ import {
   stateProviderFactory,
   StateProviderInitOptions,
 } from "../../../platform/background/service-factories/state-provider.factory";
-import {
-  stateServiceFactory as stateServiceFactory,
-  StateServiceInitOptions,
-} from "../../../platform/background/service-factories/state-service.factory";
-import { BrowserPolicyService } from "../../services/browser-policy.service";
 
 import {
   organizationServiceFactory,
@@ -23,7 +19,6 @@ import {
 type PolicyServiceFactoryOptions = FactoryOptions;
 
 export type PolicyServiceInitOptions = PolicyServiceFactoryOptions &
-  StateServiceInitOptions &
   StateProviderInitOptions &
   OrganizationServiceInitOptions;
 
@@ -36,8 +31,7 @@ export function policyServiceFactory(
     "policyService",
     opts,
     async () =>
-      new BrowserPolicyService(
-        await stateServiceFactory(cache, opts),
+      new PolicyService(
         await stateProviderFactory(cache, opts),
         await organizationServiceFactory(cache, opts),
       ),

apps/browser/src/admin-console/services/browser-policy.service.ts

@@ -1,16 +0,0 @@
-import { BehaviorSubject } from "rxjs";
-import { Jsonify } from "type-fest";
-
-import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
-import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
-
-import { browserSession, sessionSync } from "../../platform/decorators/session-sync-observable";
-
-@browserSession
-export class BrowserPolicyService extends PolicyService {
-  @sessionSync({
-    initializer: (obj: Jsonify<Policy>) => Object.assign(new Policy(), obj),
-    initializeAs: "array",
-  })
-  protected _policies: BehaviorSubject<Policy[]>;
-}

apps/browser/src/background/main.background.ts

@@ -22,6 +22,7 @@ import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abs
 import { InternalPolicyService as InternalPolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service";
+import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service";
 import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service";
 import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
@@ -175,7 +176,6 @@ import {
 } from "@bitwarden/vault-export-core";
 
 import { BrowserOrganizationService } from "../admin-console/services/browser-organization.service";
-import { BrowserPolicyService } from "../admin-console/services/browser-policy.service";
 import ContextMenusBackground from "../autofill/background/context-menus.background";
 import NotificationBackground from "../autofill/background/notification.background";
 import OverlayBackground from "../autofill/background/overlay.background";
@@ -501,11 +501,7 @@ export default class MainBackground {
       this.stateService,
       this.stateProvider,
     );
-    this.policyService = new BrowserPolicyService(
-      this.stateService,
-      this.stateProvider,
-      this.organizationService,
-    );
+    this.policyService = new PolicyService(this.stateProvider, this.organizationService);
     this.autofillSettingsService = new AutofillSettingsService(
       this.stateProvider,
       this.policyService,

apps/browser/src/popup/services/services.module.ts

@@ -102,7 +102,6 @@ import { ImportServiceAbstraction } from "@bitwarden/importer/core";
 import { VaultExportServiceAbstraction } from "@bitwarden/vault-export-core";
 
 import { BrowserOrganizationService } from "../../admin-console/services/browser-organization.service";
-import { BrowserPolicyService } from "../../admin-console/services/browser-policy.service";
 import { UnauthGuardService } from "../../auth/popup/services";
 import { AutofillService } from "../../autofill/services/abstractions/autofill.service";
 import MainBackground from "../../background/main.background";
@@ -293,17 +292,6 @@ function getBgService<T>(service: keyof MainBackground) {
       useFactory: getBgService<EventCollectionService>("eventCollectionService"),
       deps: [],
     },
-    {
-      provide: PolicyService,
-      useFactory: (
-        stateService: StateServiceAbstraction,
-        stateProvider: StateProvider,
-        organizationService: OrganizationService,
-      ) => {
-        return new BrowserPolicyService(stateService, stateProvider, organizationService);
-      },
-      deps: [StateServiceAbstraction, StateProvider, OrganizationService],
-    },
     {
       provide: PlatformUtilsService,
       useFactory: getBgService<PlatformUtilsService>("platformUtilsService"),