Delete Unused Bits of StateService (#9858)

* Delete Unused Bits of StateService * Fix Tests
2025-12-14 15:23:33 +00:00 · 2024-07-08 20:38:10 -04:00
parent 9b509cd329
commit 053e255a68
33 changed files with 32 additions and 681 deletions
--- a/apps/browser/src/autofill/background/notification.background.spec.ts
+++ b/apps/browser/src/autofill/background/notification.background.spec.ts
@@ -17,7 +17,6 @@ import { CipherService } from "@bitwarden/common/vault/services/cipher.service";
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";

 import { BrowserApi } from "../../platform/browser/browser-api";
-import { DefaultBrowserStateService } from "../../platform/services/default-browser-state.service";
 import { NotificationQueueMessageType } from "../enums/notification-queue-message-type.enum";
 import { FormData } from "../services/abstractions/autofill.service";
 import AutofillService from "../services/autofill.service";
@@ -49,7 +48,6 @@ describe("NotificationBackground", () => {
  const authService = mock<AuthService>();
  const policyService = mock<PolicyService>();
  const folderService = mock<FolderService>();
-  const stateService = mock<DefaultBrowserStateService>();
  const userNotificationSettingsService = mock<UserNotificationSettingsService>();
  const domainSettingsService = mock<DomainSettingsService>();
  const environmentService = mock<EnvironmentService>();
@@ -64,7 +62,6 @@ describe("NotificationBackground", () => {
      authService,
      policyService,
      folderService,
-      stateService,
      userNotificationSettingsService,
      domainSettingsService,
      environmentService,
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -23,7 +23,6 @@ import { LoginView } from "@bitwarden/common/vault/models/view/login.view";

 import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window";
 import { BrowserApi } from "../../platform/browser/browser-api";
-import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
 import { openAddEditVaultItemPopout } from "../../vault/popup/utils/vault-popout-window";
 import { NotificationQueueMessageType } from "../enums/notification-queue-message-type.enum";
 import { AutofillService } from "../services/abstractions/autofill.service";
@@ -76,7 +75,6 @@ export default class NotificationBackground {
    private authService: AuthService,
    private policyService: PolicyService,
    private folderService: FolderService,
-    private stateService: BrowserStateService,
    private userNotificationSettingsService: UserNotificationSettingsServiceAbstraction,
    private domainSettingsService: DomainSettingsService,
    private environmentService: EnvironmentService,
--- a/apps/browser/src/autofill/background/overlay.background.spec.ts
+++ b/apps/browser/src/autofill/background/overlay.background.spec.ts
@@ -33,7 +33,6 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
 import { CipherService } from "@bitwarden/common/vault/services/cipher.service";

 import { BrowserApi } from "../../platform/browser/browser-api";
-import { DefaultBrowserStateService } from "../../platform/services/default-browser-state.service";
 import { BrowserPlatformUtilsService } from "../../platform/services/platform-utils/browser-platform-utils.service";
 import { AutofillService } from "../services/abstractions/autofill.service";
 import {
@@ -73,7 +72,6 @@ describe("OverlayBackground", () => {
      urls: { icons: "https://icons.bitwarden.com/" },
    }),
  );
-  const stateService = mock<DefaultBrowserStateService>();
  const autofillSettingsService = mock<AutofillSettingsService>();
  const i18nService = mock<I18nService>();
  const platformUtilsService = mock<BrowserPlatformUtilsService>();
@@ -104,7 +102,6 @@ describe("OverlayBackground", () => {
      authService,
      environmentService,
      domainSettingsService,
-      stateService,
      autofillSettingsService,
      i18nService,
      platformUtilsService,
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -9,7 +9,6 @@ import { InlineMenuVisibilitySetting } from "@bitwarden/common/autofill/types";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -101,7 +100,6 @@ class OverlayBackground implements OverlayBackgroundInterface {
    private authService: AuthService,
    private environmentService: EnvironmentService,
    private domainSettingsService: DomainSettingsService,
-    private stateService: StateService,
    private autofillSettingsService: AutofillSettingsServiceAbstraction,
    private i18nService: I18nService,
    private platformUtilsService: PlatformUtilsService,
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts
@@ -6,16 +6,15 @@ import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/s
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";

-import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
-
 import { MainContextMenuHandler } from "./main-context-menu-handler";

 describe("context-menu", () => {
-  let stateService: MockProxy<BrowserStateService>;
+  let stateService: MockProxy<StateService>;
  let autofillSettingsService: MockProxy<AutofillSettingsServiceAbstraction>;
  let i18nService: MockProxy<I18nService>;
  let logService: MockProxy<LogService>;
--- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts
+++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts
@@ -20,12 +20,11 @@ import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/s
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";

-import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service";
-
 import { InitContextMenuItems } from "./abstractions/main-context-menu-handler";

 export class MainContextMenuHandler {
@@ -143,7 +142,7 @@ export class MainContextMenuHandler {
  ];

  constructor(
-    private stateService: BrowserStateService,
+    private stateService: StateService,
    private autofillSettingsService: AutofillSettingsServiceAbstraction,
    private i18nService: I18nService,
    private logService: LogService,
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -7,8 +7,6 @@ import { AccountService } from "@bitwarden/common/auth/abstractions/account.serv
 import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
 import { VaultTimeoutStringType } from "@bitwarden/common/types/vault-timeout.type";

-import { BrowserStateService } from "../platform/services/abstractions/browser-state.service";
-
 const IdleInterval = 60 * 5; // 5 minutes

 export default class IdleBackground {
@@ -18,7 +16,6 @@ export default class IdleBackground {

  constructor(
    private vaultTimeoutService: VaultTimeoutService,
-    private stateService: BrowserStateService,
    private notificationsService: NotificationsService,
    private accountService: AccountService,
    private vaultTimeoutSettingsService: VaultTimeoutSettingsService,
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -86,6 +86,7 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platfor
 import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService as StateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
 import {
  AbstractStorageService,
  ObservableStorageService,
@@ -101,6 +102,7 @@ import { Message, MessageListener, MessageSender } from "@bitwarden/common/platf
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
 import { Lazy } from "@bitwarden/common/platform/misc/lazy";
 import { clearCaches } from "@bitwarden/common/platform/misc/sequentialize";
+import { Account } from "@bitwarden/common/platform/models/domain/account";
 import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { AppIdService } from "@bitwarden/common/platform/services/app-id.service";
@@ -116,6 +118,7 @@ import { FileUploadService } from "@bitwarden/common/platform/services/file-uplo
 import { KeyGenerationService } from "@bitwarden/common/platform/services/key-generation.service";
 import { MigrationBuilderService } from "@bitwarden/common/platform/services/migration-builder.service";
 import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
+import { StateService } from "@bitwarden/common/platform/services/state.service";
 import { SystemService } from "@bitwarden/common/platform/services/system.service";
 import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service";
 import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service";
@@ -206,7 +209,6 @@ import { Fido2Background } from "../autofill/fido2/background/fido2.background";
 import { AutofillService as AutofillServiceAbstraction } from "../autofill/services/abstractions/autofill.service";
 import AutofillService from "../autofill/services/autofill.service";
 import { SafariApp } from "../browser/safariApp";
-import { Account } from "../models/account";
 import { BrowserApi } from "../platform/browser/browser-api";
 import { flagEnabled } from "../platform/flags";
 import { UpdateBadge } from "../platform/listeners/update-badge";
@@ -215,13 +217,11 @@ import { ChromeMessageSender } from "../platform/messaging/chrome-message.sender
 /* eslint-enable no-restricted-imports */
 import { OffscreenDocumentService } from "../platform/offscreen-document/abstractions/offscreen-document";
 import { DefaultOffscreenDocumentService } from "../platform/offscreen-document/offscreen-document.service";
-import { BrowserStateService as StateServiceAbstraction } from "../platform/services/abstractions/browser-state.service";
 import { BrowserCryptoService } from "../platform/services/browser-crypto.service";
 import { BrowserEnvironmentService } from "../platform/services/browser-environment.service";
 import BrowserLocalStorageService from "../platform/services/browser-local-storage.service";
 import BrowserMemoryStorageService from "../platform/services/browser-memory-storage.service";
 import { BrowserScriptInjectorService } from "../platform/services/browser-script-injector.service";
-import { DefaultBrowserStateService } from "../platform/services/default-browser-state.service";
 import I18nService from "../platform/services/i18n.service";
 import { LocalBackedSessionStorageService } from "../platform/services/local-backed-session-storage.service";
 import { BackgroundPlatformUtilsService } from "../platform/services/platform-utils/background-platform-utils.service";
@@ -540,7 +540,7 @@ export default class MainBackground {
      ClientType.Browser,
    );

-    this.stateService = new DefaultBrowserStateService(
+    this.stateService = new StateService(
      this.storageService,
      this.secureStorageService,
      this.memoryStorageService,
@@ -968,7 +968,6 @@ export default class MainBackground {
      this.messagingService,
      this.platformUtilsService,
      systemUtilsServiceReloadCallback,
-      this.stateService,
      this.autofillSettingsService,
      this.vaultTimeoutSettingsService,
      this.biometricStateService,
@@ -1028,7 +1027,6 @@ export default class MainBackground {
        this.authService,
        this.policyService,
        this.folderService,
-        this.stateService,
        this.userNotificationSettingsService,
        this.domainSettingsService,
        this.environmentService,
@@ -1042,7 +1040,6 @@ export default class MainBackground {
        this.authService,
        this.environmentService,
        this.domainSettingsService,
-        this.stateService,
        this.autofillSettingsService,
        this.i18nService,
        this.platformUtilsService,
@@ -1100,7 +1097,6 @@ export default class MainBackground {

    this.idleBackground = new IdleBackground(
      this.vaultTimeoutService,
-      this.stateService,
      this.notificationsService,
      this.accountService,
      this.vaultTimeoutSettingsService,
@@ -1227,11 +1223,6 @@ export default class MainBackground {
  async switchAccount(userId: UserId) {
    let nextAccountStatus: AuthenticationStatus;
    try {
-      const currentlyActiveAccount = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(map((account) => account?.id)),
-      );
-      // can be removed once password generation history is migrated to state providers
-      await this.stateService.clearDecryptedData(currentlyActiveAccount);
      // HACK to ensure account is switched before proceeding
      const switchPromise = firstValueFrom(
        this.accountService.activeAccount$.pipe(
--- a/apps/browser/src/models/account.ts
+++ b/apps/browser/src/models/account.ts
@@ -1,36 +0,0 @@
-import { Jsonify } from "type-fest";
-
-import { Account as BaseAccount } from "@bitwarden/common/platform/models/domain/account";
-
-import { BrowserComponentState } from "./browserComponentState";
-import { BrowserGroupingsComponentState } from "./browserGroupingsComponentState";
-import { BrowserSendComponentState } from "./browserSendComponentState";
-
-export class Account extends BaseAccount {
-  groupings?: BrowserGroupingsComponentState;
-  send?: BrowserSendComponentState;
-  ciphers?: BrowserComponentState;
-  sendType?: BrowserComponentState;
-
-  constructor(init: Partial<Account>) {
-    super(init);
-
-    this.groupings = init?.groupings ?? new BrowserGroupingsComponentState();
-    this.send = init?.send ?? new BrowserSendComponentState();
-    this.ciphers = init?.ciphers ?? new BrowserComponentState();
-    this.sendType = init?.sendType ?? new BrowserComponentState();
-  }
-
-  static fromJSON(json: Jsonify<Account>): Account {
-    if (json == null) {
-      return null;
-    }
-
-    return Object.assign(new Account({}), json, super.fromJSON(json), {
-      groupings: BrowserGroupingsComponentState.fromJSON(json.groupings),
-      send: BrowserSendComponentState.fromJSON(json.send),
-      ciphers: BrowserComponentState.fromJSON(json.ciphers),
-      sendType: BrowserComponentState.fromJSON(json.sendType),
-    });
-  }
-}
--- a/apps/browser/src/platform/services/abstractions/browser-state.service.ts
+++ b/apps/browser/src/platform/services/abstractions/browser-state.service.ts
@@ -1,5 +0,0 @@
-import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
-
-import { Account } from "../../../models/account";
-
-export abstract class BrowserStateService extends BaseStateServiceAbstraction<Account> {}
--- a/apps/browser/src/platform/services/browser-state.service.spec.ts
+++ b/apps/browser/src/platform/services/browser-state.service.spec.ts
@@ -1,77 +0,0 @@
-import { mock, MockProxy } from "jest-mock-extended";
-
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
-import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
-import { State } from "@bitwarden/common/platform/models/domain/state";
-import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
-import { mockAccountServiceWith } from "@bitwarden/common/spec";
-import { UserId } from "@bitwarden/common/types/guid";
-
-import { Account } from "../../models/account";
-
-import { DefaultBrowserStateService } from "./default-browser-state.service";
-
-describe("Browser State Service", () => {
-  let secureStorageService: MockProxy<AbstractStorageService>;
-  let diskStorageService: MockProxy<AbstractStorageService>;
-  let logService: MockProxy<LogService>;
-  let stateFactory: MockProxy<StateFactory<GlobalState, Account>>;
-  let environmentService: MockProxy<EnvironmentService>;
-  let tokenService: MockProxy<TokenService>;
-  let migrationRunner: MockProxy<MigrationRunner>;
-
-  let state: State<GlobalState, Account>;
-  const userId = "userId" as UserId;
-  const accountService = mockAccountServiceWith(userId);
-
-  let sut: DefaultBrowserStateService;
-
-  beforeEach(() => {
-    secureStorageService = mock();
-    diskStorageService = mock();
-    logService = mock();
-    stateFactory = mock();
-    environmentService = mock();
-    tokenService = mock();
-    migrationRunner = mock();
-
-    state = new State(new GlobalState());
-    state.accounts[userId] = new Account({
-      profile: { userId: userId },
-    });
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  describe("state methods", () => {
-    let memoryStorageService: MockProxy<AbstractStorageService>;
-
-    beforeEach(() => {
-      memoryStorageService = mock();
-      const stateGetter = (key: string) => Promise.resolve(state);
-      memoryStorageService.get.mockImplementation(stateGetter);
-
-      sut = new DefaultBrowserStateService(
-        diskStorageService,
-        secureStorageService,
-        memoryStorageService,
-        logService,
-        stateFactory,
-        accountService,
-        environmentService,
-        tokenService,
-        migrationRunner,
-      );
-    });
-
-    it("exists", () => {
-      expect(sut).toBeDefined();
-    });
-  });
-});
--- a/apps/browser/src/platform/services/default-browser-state.service.ts
+++ b/apps/browser/src/platform/services/default-browser-state.service.ts
@@ -1,64 +0,0 @@
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
-import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
-import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options";
-import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
-import { StateService as BaseStateService } from "@bitwarden/common/platform/services/state.service";
-
-import { Account } from "../../models/account";
-
-import { BrowserStateService } from "./abstractions/browser-state.service";
-
-export class DefaultBrowserStateService
-  extends BaseStateService<GlobalState, Account>
-  implements BrowserStateService
-{
-  protected accountDeserializer = Account.fromJSON;
-
-  constructor(
-    storageService: AbstractStorageService,
-    secureStorageService: AbstractStorageService,
-    memoryStorageService: AbstractStorageService,
-    logService: LogService,
-    stateFactory: StateFactory<GlobalState, Account>,
-    accountService: AccountService,
-    environmentService: EnvironmentService,
-    tokenService: TokenService,
-    migrationRunner: MigrationRunner,
-  ) {
-    super(
-      storageService,
-      secureStorageService,
-      memoryStorageService,
-      logService,
-      stateFactory,
-      accountService,
-      environmentService,
-      tokenService,
-      migrationRunner,
-    );
-  }
-
-  async addAccount(account: Account) {
-    // Apply browser overrides to default account values
-    account = new Account(account);
-    await super.addAccount(account);
-  }
-
-  // Overriding the base class to prevent deleting the cache on save. We register a storage listener
-  // to delete the cache in the constructor above.
-  protected override async saveAccountToDisk(
-    account: Account,
-    options: StorageOptions,
-  ): Promise<void> {
-    const storageLocation = options.useSecureStorage
-      ? this.secureStorageService
-      : this.storageService;
-
-    await storageLocation.save(`${options.userId}`, account, options);
-  }
-}
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -8,6 +8,7 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { MessageListener } from "@bitwarden/common/platform/messaging";
 import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
@@ -19,7 +20,6 @@ import {
 } from "@bitwarden/components";

 import { BrowserApi } from "../platform/browser/browser-api";
-import { BrowserStateService } from "../platform/services/abstractions/browser-state.service";
 import { BrowserSendStateService } from "../tools/popup/services/browser-send-state.service";
 import { VaultBrowserStateService } from "../vault/services/vault-browser-state.service";

@@ -45,7 +45,7 @@ export class AppComponent implements OnInit, OnDestroy {
    private authService: AuthService,
    private i18nService: I18nService,
    private router: Router,
-    private stateService: BrowserStateService,
+    private stateService: StateService,
    private browserSendStateService: BrowserSendStateService,
    private vaultBrowserStateService: VaultBrowserStateService,
    private cipherService: CipherService,
--- a/apps/browser/src/popup/services/init.service.ts
+++ b/apps/browser/src/popup/services/init.service.ts
@@ -6,16 +6,16 @@ import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";

 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";
@Injectable()
 export class InitService {
  constructor(
    private platformUtilsService: PlatformUtilsService,
    private i18nService: I18nService,
-    private stateService: StateServiceAbstraction,
+    private stateService: StateService,
    private twoFactorService: TwoFactorService,
    private logService: LogServiceAbstraction,
    private themingService: AbstractThemingService,
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -32,7 +32,6 @@ import { KdfConfigService } from "@bitwarden/common/auth/abstractions/kdf-config
 import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import {
  AutofillSettingsService,
@@ -57,20 +56,17 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platfor
 import { KeyGenerationService } from "@bitwarden/common/platform/abstractions/key-generation.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import {
  AbstractStorageService,
  ObservableStorageService,
 } from "@bitwarden/common/platform/abstractions/storage.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency injection
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
-import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
 import { StorageServiceProvider } from "@bitwarden/common/platform/services/storage-service.provider";
 import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service";
 import {
@@ -94,7 +90,6 @@ import { UnauthGuardService } from "../../auth/popup/services";
 import { AutofillService as AutofillServiceAbstraction } from "../../autofill/services/abstractions/autofill.service";
 import AutofillService from "../../autofill/services/autofill.service";
 import MainBackground from "../../background/main.background";
-import { Account } from "../../models/account";
 import { BrowserApi } from "../../platform/browser/browser-api";
 import { runInsideAngular } from "../../platform/browser/run-inside-angular.operator";
 /* eslint-disable no-restricted-imports */
@@ -104,13 +99,11 @@ import { OffscreenDocumentService } from "../../platform/offscreen-document/abst
 import { DefaultOffscreenDocumentService } from "../../platform/offscreen-document/offscreen-document.service";
 import BrowserPopupUtils from "../../platform/popup/browser-popup-utils";
 import { BrowserFileDownloadService } from "../../platform/popup/services/browser-file-download.service";
-import { BrowserStateService as StateServiceAbstraction } from "../../platform/services/abstractions/browser-state.service";
 import { ScriptInjectorService } from "../../platform/services/abstractions/script-injector.service";
 import { BrowserCryptoService } from "../../platform/services/browser-crypto.service";
 import { BrowserEnvironmentService } from "../../platform/services/browser-environment.service";
 import BrowserLocalStorageService from "../../platform/services/browser-local-storage.service";
 import { BrowserScriptInjectorService } from "../../platform/services/browser-script-injector.service";
-import { DefaultBrowserStateService } from "../../platform/services/default-browser-state.service";
 import I18nService from "../../platform/services/i18n.service";
 import { ForegroundPlatformUtilsService } from "../../platform/services/platform-utils/foreground-platform-utils.service";
 import { BrowserStorageServiceProvider } from "../../platform/storage/browser-storage-service.provider";
@@ -219,7 +212,7 @@ const safeProviders: SafeProvider[] = [
      encryptService: EncryptService,
      platformUtilsService: PlatformUtilsService,
      logService: LogService,
-      stateService: StateServiceAbstraction,
+      stateService: StateService,
      accountService: AccountServiceAbstraction,
      stateProvider: StateProvider,
      biometricStateService: BiometricStateService,
@@ -250,7 +243,7 @@ const safeProviders: SafeProvider[] = [
      EncryptService,
      PlatformUtilsService,
      LogService,
-      StateServiceAbstraction,
+      StateService,
      AccountServiceAbstraction,
      StateProvider,
      BiometricStateService,
@@ -436,46 +429,6 @@ const safeProviders: SafeProvider[] = [
    },
    deps: [StateProvider],
  }),
-  safeProvider({
-    provide: StateServiceAbstraction,
-    useFactory: (
-      storageService: AbstractStorageService,
-      secureStorageService: AbstractStorageService,
-      memoryStorageService: AbstractStorageService,
-      logService: LogService,
-      accountService: AccountServiceAbstraction,
-      environmentService: EnvironmentService,
-      tokenService: TokenService,
-      migrationRunner: MigrationRunner,
-    ) => {
-      return new DefaultBrowserStateService(
-        storageService,
-        secureStorageService,
-        memoryStorageService,
-        logService,
-        new StateFactory(GlobalState, Account),
-        accountService,
-        environmentService,
-        tokenService,
-        migrationRunner,
-      );
-    },
-    deps: [
-      AbstractStorageService,
-      SECURE_STORAGE,
-      MEMORY_STORAGE,
-      LogService,
-      AccountServiceAbstraction,
-      EnvironmentService,
-      TokenService,
-      MigrationRunner,
-    ],
-  }),
-  safeProvider({
-    provide: BaseStateServiceAbstraction,
-    useExisting: StateServiceAbstraction,
-    deps: [],
-  }),
  safeProvider({
    provide: FileDownloadService,
    useClass: BrowserFileDownloadService,
--- a/apps/browser/src/tools/popup/send/send-add-edit.component.ts
+++ b/apps/browser/src/tools/popup/send/send-add-edit.component.ts
@@ -13,12 +13,12 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
 import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction";
 import { DialogService, ToastService } from "@bitwarden/components";

 import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
-import { BrowserStateService } from "../../../platform/services/abstractions/browser-state.service";
 import { FilePopoutUtilsService } from "../services/file-popout-utils.service";

@Component({
@@ -37,7 +37,7 @@ export class SendAddEditComponent extends BaseAddEditComponent {
  constructor(
    i18nService: I18nService,
    platformUtilsService: PlatformUtilsService,
-    stateService: BrowserStateService,
+    stateService: StateService,
    messagingService: MessagingService,
    policyService: PolicyService,
    environmentService: EnvironmentService,
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -403,7 +403,6 @@ export class AppComponent implements OnInit, OnDestroy {
            // Clear sequentialized caches
            clearCaches();
            if (message.userId != null) {
-              await this.stateService.clearDecryptedData(message.userId);
              await this.accountService.switchAccount(message.userId);
            }
            const locked =
--- a/apps/desktop/src/app/layout/account-switcher.component.ts
+++ b/apps/desktop/src/app/layout/account-switcher.component.ts
@@ -165,8 +165,6 @@ export class AccountSwitcherComponent {
  async addAccount() {
    this.close();

-    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
-    await this.stateService.clearDecryptedData(activeAccount?.id as UserId);
    await this.accountService.switchAccount(null);
    await this.router.navigate(["/login"]);
  }
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -13,7 +13,6 @@ import {
  SUPPORTS_SECURE_STORAGE,
  SYSTEM_THEME_OBSERVABLE,
  SafeInjectionToken,
-  STATE_FACTORY,
  DEFAULT_VAULT_TIMEOUT,
  INTRAPROCESS_MESSAGING_SUBJECT,
  CLIENT_TYPE,
@@ -25,13 +24,11 @@ import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/a
 import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service";
 import { KdfConfigService as KdfConfigServiceAbstraction } from "@bitwarden/common/auth/abstractions/kdf-config.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
-import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { ClientType } from "@bitwarden/common/enums";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
-import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service";
@@ -45,13 +42,10 @@ import { StateService as StateServiceAbstraction } from "@bitwarden/common/platf
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service";
 import { BiometricStateService } from "@bitwarden/common/platform/biometrics/biometric-state.service";
-import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Message, MessageListener, MessageSender } from "@bitwarden/common/platform/messaging";
 // eslint-disable-next-line no-restricted-imports -- Used for dependency injection
 import { SubjectMessageSender } from "@bitwarden/common/platform/messaging/internal";
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
-import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
 import { SystemService } from "@bitwarden/common/platform/services/system.service";
 import { GlobalStateProvider, StateProvider } from "@bitwarden/common/platform/state";
 // eslint-disable-next-line import/no-restricted-paths -- Implementation for memory storage
@@ -63,7 +57,6 @@ import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legac

 import { PinServiceAbstraction } from "../../../../../libs/auth/src/common/abstractions";
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
-import { Account } from "../../models/account";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
 import { ElectronCryptoService } from "../../platform/services/electron-crypto.service";
 import { ElectronLogRendererService } from "../../platform/services/electron-log.renderer.service";
@@ -74,7 +67,6 @@ import {
 import { ElectronRendererMessageSender } from "../../platform/services/electron-renderer-message.sender";
 import { ElectronRendererSecureStorageService } from "../../platform/services/electron-renderer-secure-storage.service";
 import { ElectronRendererStorageService } from "../../platform/services/electron-renderer-storage.service";
-import { ElectronStateService } from "../../platform/services/electron-state.service";
 import { I18nRendererService } from "../../platform/services/i18n.renderer.service";
 import { fromIpcMessaging } from "../../platform/utils/from-ipc-messaging";
 import { fromIpcSystemTheme } from "../../platform/utils/from-ipc-system-theme";
@@ -90,11 +82,6 @@ import { RendererCryptoFunctionService } from "./renderer-crypto-function.servic

 const RELOAD_CALLBACK = new SafeInjectionToken<() => any>("RELOAD_CALLBACK");

-// Desktop has its own Account definition which must be used in its StateService
-const DESKTOP_STATE_FACTORY = new SafeInjectionToken<StateFactory<GlobalState, Account>>(
-  "DESKTOP_STATE_FACTORY",
-);
-
 /**
 * Provider definitions used in the ngModule.
 * Add your provider definition here using the safeProvider function as a wrapper. This will give you type safety.
@@ -111,14 +98,6 @@ const safeProviders: SafeProvider[] = [
    deps: [InitService],
    multi: true,
  }),
-  safeProvider({
-    provide: DESKTOP_STATE_FACTORY,
-    useValue: new StateFactory(GlobalState, Account),
-  }),
-  safeProvider({
-    provide: STATE_FACTORY,
-    useValue: null,
-  }),
  safeProvider({
    provide: RELOAD_CALLBACK,
    useValue: null,
@@ -194,28 +173,12 @@ const safeProviders: SafeProvider[] = [
      MessagingServiceAbstraction,
      PlatformUtilsServiceAbstraction,
      RELOAD_CALLBACK,
-      StateServiceAbstraction,
      AutofillSettingsServiceAbstraction,
      VaultTimeoutSettingsService,
      BiometricStateService,
      AccountServiceAbstraction,
    ],
  }),
-  safeProvider({
-    provide: StateServiceAbstraction,
-    useClass: ElectronStateService,
-    deps: [
-      AbstractStorageService,
-      SECURE_STORAGE,
-      MEMORY_STORAGE,
-      LogService,
-      DESKTOP_STATE_FACTORY,
-      AccountServiceAbstraction,
-      EnvironmentService,
-      TokenService,
-      MigrationRunner,
-    ],
-  }),
  safeProvider({
    provide: FileDownloadService,
    useClass: DesktopFileDownloadService,
--- a/apps/desktop/src/models/account.ts
+++ b/apps/desktop/src/models/account.ts
@@ -1,20 +0,0 @@
-import {
-  Account as BaseAccount,
-  AccountSettings as BaseAccountSettings,
-} from "@bitwarden/common/platform/models/domain/account";
-
-export class AccountSettings extends BaseAccountSettings {
-  dismissedBiometricRequirePasswordOnStartCallout?: boolean;
-}
-
-export class Account extends BaseAccount {
-  settings?: AccountSettings = new AccountSettings();
-
-  constructor(init: Partial<Account>) {
-    super(init);
-    Object.assign(this.settings, {
-      ...new AccountSettings(),
-      ...this.settings,
-    });
-  }
-}
--- a/apps/desktop/src/platform/services/electron-state.service.ts
+++ b/apps/desktop/src/platform/services/electron-state.service.ts
@@ -1,12 +0,0 @@
-import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
-import { StateService as BaseStateService } from "@bitwarden/common/platform/services/state.service";
-
-import { Account } from "../../models/account";
-
-export class ElectronStateService extends BaseStateService<GlobalState, Account> {
-  async addAccount(account: Account) {
-    // Apply desktop overides to default account values
-    account = new Account(account);
-    await super.addAccount(account);
-  }
-}
--- a/apps/web/src/app/core/core.module.ts
+++ b/apps/web/src/app/core/core.module.ts
@@ -4,7 +4,6 @@ import { APP_INITIALIZER, NgModule, Optional, SkipSelf } from "@angular/core";
 import { SafeProvider, safeProvider } from "@bitwarden/angular/platform/utils/safe-provider";
 import {
  SECURE_STORAGE,
-  STATE_FACTORY,
  LOCALES_DIRECTORY,
  SYSTEM_LANGUAGE,
  MEMORY_STORAGE,
@@ -30,10 +29,9 @@ import { FileDownloadService } from "@bitwarden/common/platform/abstractions/fil
 import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service";
+import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { ThemeType } from "@bitwarden/common/platform/enums";
-import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service";
 // eslint-disable-next-line import/no-restricted-paths -- Implementation for memory storage
 import { MigrationBuilderService } from "@bitwarden/common/platform/services/migration-builder.service";
@@ -64,7 +62,7 @@ import { EventService } from "./event.service";
 import { InitService } from "./init.service";
 import { ModalService } from "./modal.service";
 import { RouterService } from "./router.service";
-import { Account, GlobalState, StateService } from "./state";
+import { StateService as WebStateService } from "./state";
 import { WebFileDownloadService } from "./web-file-download.service";
 import { WebPlatformUtilsService } from "./web-platform-utils.service";

@@ -90,10 +88,6 @@ const safeProviders: SafeProvider[] = [
    deps: [InitService],
    multi: true,
  }),
-  safeProvider({
-    provide: STATE_FACTORY,
-    useValue: new StateFactory(GlobalState, Account),
-  }),
  safeProvider({
    provide: I18nServiceAbstraction,
    useClass: I18nService,
@@ -132,10 +126,10 @@ const safeProviders: SafeProvider[] = [
    useClass: ModalService,
    useAngularDecorators: true,
  }),
-  safeProvider(StateService),
+  safeProvider(WebStateService),
  safeProvider({
-    provide: BaseStateServiceAbstraction,
-    useExisting: StateService,
+    provide: StateService,
+    useExisting: WebStateService,
  }),
  safeProvider({
    provide: FileDownloadService,
--- a/apps/web/src/app/core/state/account.ts
+++ b/apps/web/src/app/core/state/account.ts
@@ -1,8 +0,0 @@
-import { Account as BaseAccount } from "@bitwarden/common/platform/models/domain/account";
-
-// TODO: platform to clean up accounts in later PR
-export class Account extends BaseAccount {
-  constructor(init: Partial<Account>) {
-    super(init);
-  }
-}
--- a/apps/web/src/app/core/state/global-state.ts
+++ b/apps/web/src/app/core/state/global-state.ts
@@ -1,5 +0,0 @@
-import { GlobalState as BaseGlobalState } from "@bitwarden/common/platform/models/domain/global-state";
-
-export class GlobalState extends BaseGlobalState {
-  rememberEmail = true;
-}
--- a/apps/web/src/app/core/state/index.ts
+++ b/apps/web/src/app/core/state/index.ts
@@ -1,3 +1 @@
-export * from "./account";
-export * from "./global-state";
 export * from "./state.service";
--- a/apps/web/src/app/core/state/state.service.ts
+++ b/apps/web/src/app/core/state/state.service.ts
@@ -11,13 +11,12 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
+import { Account } from "@bitwarden/common/platform/models/domain/account";
+import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state";
 import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options";
 import { MigrationRunner } from "@bitwarden/common/platform/services/migration-runner";
 import { StateService as BaseStateService } from "@bitwarden/common/platform/services/state.service";

-import { Account } from "./account";
-import { GlobalState } from "./global-state";
-
@Injectable()
 export class StateService extends BaseStateService<GlobalState, Account> {
  constructor(
@@ -44,12 +43,6 @@ export class StateService extends BaseStateService<GlobalState, Account> {
    );
  }

-  async addAccount(account: Account) {
-    // Apply web overrides to default account values
-    account = new Account(account);
-    await super.addAccount(account);
-  }
-
  override async getLastSync(options?: StorageOptions): Promise<string> {
    options = this.reconcileOptions(options, await this.defaultInMemoryOptions());
    return await super.getLastSync(options);