Name client services after the client

apps/browser/src/background/idle.background.ts

@@ -1,7 +1,7 @@
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 const IdleInterval = 60 * 5; // 5 minutes
 
@@ -12,7 +12,7 @@ export default class IdleBackground {
 
   constructor(
     private vaultTimeoutService: VaultTimeoutService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private notificationsService: NotificationsService
   ) {
     this.idle = chrome.idle || (browser != null ? browser.idle : null);

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

@@ -88,7 +88,7 @@ import { UpdateBadge } from "../listeners/update-badge";
 import { Account } from "../models/account";
 import { PopupUtilsService } from "../popup/services/popup-utils.service";
 import { AutofillService as AutofillServiceAbstraction } from "../services/abstractions/autofill.service";
-import { StateService as StateServiceAbstraction } from "../services/abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service";
 import AutofillService from "../services/autofill.service";
 import { BrowserEnvironmentService } from "../services/browser-environment.service";
 import { BrowserFolderService } from "../services/browser-folder.service";

apps/browser/src/background/notification.background.ts

@@ -15,7 +15,7 @@ import { LoginView } from "@bitwarden/common/models/view/login.view";
 
 import { BrowserApi } from "../browser/browserApi";
 import { AutofillService } from "../services/abstractions/autofill.service";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 import AddChangePasswordQueueMessage from "./models/addChangePasswordQueueMessage";
 import AddLoginQueueMessage from "./models/addLoginQueueMessage";
@@ -33,7 +33,7 @@ export default class NotificationBackground {
     private authService: AuthService,
     private policyService: PolicyService,
     private folderService: FolderService,
-    private stateService: StateService
+    private stateService: BrowserStateService
   ) {}
 
   async init() {

apps/browser/src/clipboard/clipboard-state.ts

@@ -1,10 +1,10 @@
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 const clearClipboardStorageKey = "clearClipboardTime";
-export const getClearClipboardTime = async (stateService: StateService) => {
+export const getClearClipboardTime = async (stateService: BrowserStateService) => {
   return await stateService.getFromSessionMemory<number>(clearClipboardStorageKey);
 };
 
-export const setClearClipboardTime = async (stateService: StateService, time: number) => {
+export const setClearClipboardTime = async (stateService: BrowserStateService, time: number) => {
   await stateService.setInSessionMemory(clearClipboardStorageKey, time);
 };

apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts

@@ -3,7 +3,7 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 
 import { BrowserApi } from "../browser/browserApi";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 import { setClearClipboardTime } from "./clipboard-state";
 import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command";
@@ -19,13 +19,13 @@ const setClearClipboardTimeMock = setClearClipboardTime as jest.Mock;
 
 describe("GeneratePasswordToClipboardCommand", () => {
   let passwordGenerationService: MockProxy<PasswordGenerationService>;
-  let stateService: MockProxy<StateService>;
+  let stateService: MockProxy<BrowserStateService>;
 
   let sut: GeneratePasswordToClipboardCommand;
 
   beforeEach(() => {
     passwordGenerationService = mock<PasswordGenerationService>();
-    stateService = mock<StateService>();
+    stateService = mock<BrowserStateService>();
 
     passwordGenerationService.getOptions.mockResolvedValue([{ length: 8 }, {} as any]);
 

apps/browser/src/clipboard/generate-password-to-clipboard-command.ts

@@ -1,6 +1,6 @@
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 import { setClearClipboardTime } from "./clipboard-state";
 import { copyToClipboard } from "./copy-to-clipboard-command";
@@ -8,7 +8,7 @@ import { copyToClipboard } from "./copy-to-clipboard-command";
 export class GeneratePasswordToClipboardCommand {
   constructor(
     private passwordGenerationService: PasswordGenerationService,
-    private stateService: StateService
+    private stateService: BrowserStateService
   ) {}
 
   async generatePasswordToClipboard(tab: chrome.tabs.Tab) {

apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts

@@ -3,7 +3,7 @@ import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject, ReplaySubject } from "rxjs";
 
 import { BrowserApi } from "../../browser/browserApi";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 import { SessionSyncer } from "./session-syncer";
 import { SyncedItemMetadata } from "./sync-item-metadata";
@@ -12,7 +12,7 @@ describe("session syncer", () => {
   const propertyKey = "behaviorSubject";
   const sessionKey = "Test__" + propertyKey;
   const metaData = { propertyKey, sessionKey, initializer: (s: string) => s };
-  let stateService: MockProxy<StateService>;
+  let stateService: MockProxy<BrowserStateService>;
   let sut: SessionSyncer;
   let behaviorSubject: BehaviorSubject<string>;
 
@@ -24,7 +24,7 @@ describe("session syncer", () => {
       manifest_version: 3,
     });
 
-    stateService = mock<StateService>();
+    stateService = mock<BrowserStateService>();
     sut = new SessionSyncer(behaviorSubject, stateService, metaData);
   });
 

apps/browser/src/decorators/session-sync-observable/session-syncer.ts

@@ -3,7 +3,7 @@ import { BehaviorSubject, concatMap, ReplaySubject, Subject, Subscription } from
 import { Utils } from "@bitwarden/common/misc/utils";
 
 import { BrowserApi } from "../../browser/browserApi";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 import { SyncedItemMetadata } from "./sync-item-metadata";
 
@@ -16,7 +16,7 @@ export class SessionSyncer {
 
   constructor(
     private subject: Subject<any>,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private metaData: SyncedItemMetadata
   ) {
     if (!(subject instanceof Subject)) {

apps/browser/src/listeners/update-badge.ts

@@ -15,7 +15,7 @@ import { searchServiceFactory } from "../background/service_factories/search-ser
 import { stateServiceFactory } from "../background/service_factories/state-service.factory";
 import { BrowserApi } from "../browser/browserApi";
 import { Account } from "../models/account";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
 
 export type BadgeOptions = {
@@ -25,7 +25,7 @@ export type BadgeOptions = {
 
 export class UpdateBadge {
   private authService: AuthService;
-  private stateService: StateService;
+  private stateService: BrowserStateService;
   private cipherService: CipherService;
   private badgeAction: typeof chrome.action;
   private sidebarAction: OperaSidebarAction | FirefoxSidebarAction;

apps/browser/src/popup/app.component.ts

@@ -19,7 +19,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 
 import { BrowserApi } from "../browser/browserApi";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 import { routerTransition } from "./app-routing.animations";
 
@@ -43,7 +43,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private authService: AuthService,
     private i18nService: I18nService,
     private router: Router,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private messagingService: MessagingService,
     private changeDetectorRef: ChangeDetectorRef,
     private ngZone: NgZone,

apps/browser/src/popup/send/send-add-edit.component.ts

@@ -12,7 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { SendService } from "@bitwarden/common/abstractions/send.service";
 
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
 @Component({
@@ -33,7 +33,7 @@ export class SendAddEditComponent extends BaseAddEditComponent {
   constructor(
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
-    stateService: StateService,
+    stateService: BrowserStateService,
     messagingService: MessagingService,
     policyService: PolicyService,
     environmentService: EnvironmentService,

apps/browser/src/popup/send/send-groupings.component.ts

@@ -15,7 +15,7 @@ import { SendType } from "@bitwarden/common/enums/sendType";
 import { SendView } from "@bitwarden/common/models/view/send.view";
 
 import { BrowserSendComponentState } from "../../models/browserSendComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
 const ComponentId = "SendComponent";
@@ -42,7 +42,7 @@ export class SendGroupingsComponent extends BaseSendComponent {
     policyService: PolicyService,
     searchService: SearchService,
     private popupUtils: PopupUtilsService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private router: Router,
     private syncService: SyncService,
     private changeDetectorRef: ChangeDetectorRef,

apps/browser/src/popup/send/send-type.component.ts

@@ -16,7 +16,7 @@ import { SendType } from "@bitwarden/common/enums/sendType";
 import { SendView } from "@bitwarden/common/models/view/send.view";
 
 import { BrowserComponentState } from "../../models/browserComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
 const ComponentId = "SendTypeComponent";
@@ -41,7 +41,7 @@ export class SendTypeComponent extends BaseSendComponent {
     policyService: PolicyService,
     searchService: SearchService,
     private popupUtils: PopupUtilsService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private route: ActivatedRoute,
     private location: Location,
     private changeDetectorRef: ChangeDetectorRef,

apps/browser/src/popup/services/init.service.ts

@@ -5,7 +5,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 
-import { StateService as StateServiceAbstraction } from "../../services/abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service";
 
 import { PopupUtilsService } from "./popup-utils.service";
 

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

@@ -59,7 +59,7 @@ import MainBackground from "../../background/main.background";
 import { BrowserApi } from "../../browser/browserApi";
 import { Account } from "../../models/account";
 import { AutofillService } from "../../services/abstractions/autofill.service";
-import { StateService as StateServiceAbstraction } from "../../services/abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service";
 import { BrowserEnvironmentService } from "../../services/browser-environment.service";
 import { BrowserPolicyService } from "../../services/browser-policy.service";
 import { BrowserStateService } from "../../services/browser-state.service";

apps/browser/src/popup/vault/ciphers.component.ts

@@ -21,7 +21,7 @@ import { FolderView } from "@bitwarden/common/models/view/folder.view";
 
 import { BrowserApi } from "../../browser/browserApi";
 import { BrowserComponentState } from "../../models/browserComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { VaultFilterService } from "../../services/vaultFilter.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
@@ -60,7 +60,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
     private ngZone: NgZone,
     private broadcasterService: BroadcasterService,
     private changeDetectorRef: ChangeDetectorRef,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private popupUtils: PopupUtilsService,
     private i18nService: I18nService,
     private folderService: FolderService,

apps/browser/src/popup/vault/vault-filter.component.ts

@@ -18,7 +18,7 @@ import { FolderView } from "@bitwarden/common/models/view/folder.view";
 
 import { BrowserApi } from "../../browser/browserApi";
 import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { VaultFilterService } from "../../services/vaultFilter.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
@@ -83,7 +83,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     private platformUtilsService: PlatformUtilsService,
     private searchService: SearchService,
     private location: Location,
-    private browserStateService: StateService,
+    private browserStateService: BrowserStateService,
     private vaultFilterService: VaultFilterService
   ) {
     this.noFolderListSize = 100;

apps/browser/src/services/abstractions/browser-state.service.ts

@@ -8,7 +8,7 @@ import { BrowserComponentState } from "../../models/browserComponentState";
 import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState";
 import { BrowserSendComponentState } from "../../models/browserSendComponentState";
 
-export abstract class StateService extends BaseStateServiceAbstraction<Account> {
+export abstract class BrowserStateService extends BaseStateServiceAbstraction<Account> {
   abstract hasInSessionMemory(key: string): Promise<boolean>;
   abstract getFromSessionMemory<T>(key: string, deserializer?: (obj: Jsonify<T>) => T): Promise<T>;
   abstract setInSessionMemory(key: string, value: any): Promise<void>;

apps/browser/src/services/autofill.service.ts

@@ -14,7 +14,6 @@ import { BrowserApi } from "../browser/browserApi";
 import AutofillField from "../models/autofillField";
 import AutofillPageDetails from "../models/autofillPageDetails";
 import AutofillScript from "../models/autofillScript";
-import { StateService } from "../services/abstractions/state.service";
 
 import {
   AutoFillOptions,
@@ -22,6 +21,7 @@ import {
   PageDetail,
   FormData,
 } from "./abstractions/autofill.service";
+import { BrowserStateService } from "./abstractions/browser-state.service";
 import {
   AutoFillConstants,
   CreditCardAutoFillConstants,
@@ -39,7 +39,7 @@ export interface GenerateFillScriptOptions {
 export default class AutofillService implements AutofillServiceInterface {
   constructor(
     private cipherService: CipherService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private totpService: TotpService,
     private eventService: EventService,
     private logService: LogService

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

@@ -6,14 +6,14 @@ import { PolicyService } from "@bitwarden/common/services/policy/policy.service"
 
 import { browserSession, sessionSync } from "../decorators/session-sync-observable";
 
-import { StateService } from "./abstractions/state.service";
+import { BrowserStateService } from "./abstractions/browser-state.service";
 
 @browserSession
 export class BrowserPolicyService extends PolicyService {
   @sessionSync({ ctor: Policy, initializeAsArray: true })
   protected _policies: BehaviorSubject<Policy[]>;
 
-  constructor(stateService: StateService, organizationService: OrganizationService) {
+  constructor(stateService: BrowserStateService, organizationService: OrganizationService) {
     super(stateService, organizationService);
   }
 }

apps/browser/src/services/browser-state.service.ts

@@ -12,7 +12,7 @@ import { BrowserComponentState } from "../models/browserComponentState";
 import { BrowserGroupingsComponentState } from "../models/browserGroupingsComponentState";
 import { BrowserSendComponentState } from "../models/browserSendComponentState";
 
-import { StateService as StateServiceAbstraction } from "./abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "./abstractions/browser-state.service";
 
 @browserSession
 export class BrowserStateService