Combined State (#7383)

* Introduce Combined State

* Cleanup Test

* Update Fakes

* Address PR Feedback

* Update libs/common/src/platform/state/implementations/default-active-user-state.ts

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>

* Prettier

* Get rid of ReplaySubject reference

---------

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>

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

@@ -321,7 +321,6 @@ export default class MainBackground {
       : new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, true);
 
     this.singleUserStateProvider = new DefaultSingleUserStateProvider(
-      this.encryptService,
       this.memoryStorageService as BackgroundMemoryStorageService,
       this.storageService as BrowserLocalStorageService,
     );
@@ -332,7 +331,6 @@ export default class MainBackground {
     );
     this.activeUserStateProvider = new DefaultActiveUserStateProvider(
       this.accountService,
-      this.encryptService,
       this.memoryStorageService as BackgroundMemoryStorageService,
       this.storageService as BrowserLocalStorageService,
     );

apps/browser/src/platform/background/service-factories/active-user-state-provider.factory.ts

@@ -7,7 +7,6 @@ import {
   accountServiceFactory,
 } from "../../../auth/background/service-factories/account-service.factory";
 
-import { EncryptServiceInitOptions, encryptServiceFactory } from "./encrypt-service.factory";
 import { CachedServices, FactoryOptions, factory } from "./factory-options";
 import {
   DiskStorageServiceInitOptions,
@@ -20,7 +19,6 @@ type ActiveUserStateProviderFactory = FactoryOptions;
 
 export type ActiveUserStateProviderInitOptions = ActiveUserStateProviderFactory &
   AccountServiceInitOptions &
-  EncryptServiceInitOptions &
   MemoryStorageServiceInitOptions &
   DiskStorageServiceInitOptions;
 
@@ -35,7 +33,6 @@ export async function activeUserStateProviderFactory(
     async () =>
       new DefaultActiveUserStateProvider(
         await accountServiceFactory(cache, opts),
-        await encryptServiceFactory(cache, opts),
         await observableMemoryStorageServiceFactory(cache, opts),
         await observableDiskStorageServiceFactory(cache, opts),
       ),

apps/browser/src/platform/background/service-factories/single-user-state-provider.factory.ts

@@ -2,7 +2,6 @@ import { SingleUserStateProvider } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- We need the implementation to inject, but generally this should not be accessed
 import { DefaultSingleUserStateProvider } from "@bitwarden/common/platform/state/implementations/default-single-user-state.provider";
 
-import { EncryptServiceInitOptions, encryptServiceFactory } from "./encrypt-service.factory";
 import { CachedServices, FactoryOptions, factory } from "./factory-options";
 import {
   DiskStorageServiceInitOptions,
@@ -14,7 +13,6 @@ import {
 type SingleUserStateProviderFactoryOptions = FactoryOptions;
 
 export type SingleUserStateProviderInitOptions = SingleUserStateProviderFactoryOptions &
-  EncryptServiceInitOptions &
   MemoryStorageServiceInitOptions &
   DiskStorageServiceInitOptions;
 
@@ -28,7 +26,6 @@ export async function singleUserStateProviderFactory(
     opts,
     async () =>
       new DefaultSingleUserStateProvider(
-        await encryptServiceFactory(cache, opts),
         await observableMemoryStorageServiceFactory(cache, opts),
         await observableDiskStorageServiceFactory(cache, opts),
       ),

apps/cli/src/bw.ts

@@ -226,7 +226,6 @@ export class Main {
     );
 
     this.singleUserStateProvider = new DefaultSingleUserStateProvider(
-      this.encryptService,
       this.memoryStorageService,
       this.storageService,
     );
@@ -241,7 +240,6 @@ export class Main {
 
     this.activeUserStateProvider = new DefaultActiveUserStateProvider(
       this.accountService,
-      this.encryptService,
       this.memoryStorageService,
       this.storageService,
     );