From 717afaf0693c83484ee35dfbe983d4ff2b6dda2c Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Wed, 16 Nov 2022 19:06:44 -0500
Subject: [PATCH] Move BrowserFolderService

---
 apps/browser/src/background/main.background.ts                | 4 ++--
 .../background/service_factories/folder-service.factory.ts    | 4 ++--
 .../{folders/folder.service.ts => browser-folder.service.ts}  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename apps/browser/src/services/{folders/folder.service.ts => browser-folder.service.ts} (79%)

diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 3917ce02eb1..c330fca054b 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -91,13 +91,13 @@ import { AutofillService as AutofillServiceAbstraction } from "../services/abstr
 import { StateService as StateServiceAbstraction } from "../services/abstractions/state.service";
 import AutofillService from "../services/autofill.service";
 import { BrowserEnvironmentService } from "../services/browser-environment.service";
+import { BrowserFolderService } from "../services/browser-folder.service";
 import { BrowserPolicyService } from "../services/browser-policy.service";
 import { BrowserCryptoService } from "../services/browserCrypto.service";
 import BrowserLocalStorageService from "../services/browserLocalStorage.service";
 import BrowserMessagingService from "../services/browserMessaging.service";
 import BrowserMessagingPrivateModeBackgroundService from "../services/browserMessagingPrivateModeBackground.service";
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
-import { FolderService } from "../services/folders/folder.service";
 import I18nService from "../services/i18n.service";
 import { KeyGenerationService } from "../services/keyGeneration.service";
 import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service";
@@ -295,7 +295,7 @@ export default class MainBackground {
       this.stateService,
       this.encryptService
     );
-    this.folderService = new FolderService(
+    this.folderService = new BrowserFolderService(
       this.cryptoService,
       this.i18nService,
       this.cipherService,
diff --git a/apps/browser/src/background/service_factories/folder-service.factory.ts b/apps/browser/src/background/service_factories/folder-service.factory.ts
index a7c90d234b1..bb35970325f 100644
--- a/apps/browser/src/background/service_factories/folder-service.factory.ts
+++ b/apps/browser/src/background/service_factories/folder-service.factory.ts
@@ -1,6 +1,6 @@
 import { FolderService as AbstractFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 
-import { FolderService } from "../../services/folders/folder.service";
+import { BrowserFolderService } from "../../services/browser-folder.service";
 
 import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
 import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
@@ -28,7 +28,7 @@ export function folderServiceFactory(
     "folderService",
     opts,
     async () =>
-      new FolderService(
+      new BrowserFolderService(
         await cryptoServiceFactory(cache, opts),
         await i18nServiceFactory(cache, opts),
         await cipherServiceFactory(cache, opts),
diff --git a/apps/browser/src/services/folders/folder.service.ts b/apps/browser/src/services/browser-folder.service.ts
similarity index 79%
rename from apps/browser/src/services/folders/folder.service.ts
rename to apps/browser/src/services/browser-folder.service.ts
index e4fc19644da..3f1802b8076 100644
--- a/apps/browser/src/services/folders/folder.service.ts
+++ b/apps/browser/src/services/browser-folder.service.ts
@@ -4,10 +4,10 @@ import { Folder } from "@bitwarden/common/models/domain/folder";
 import { FolderView } from "@bitwarden/common/models/view/folder.view";
 import { FolderService as BaseFolderService } from "@bitwarden/common/services/folder/folder.service";
 
-import { browserSession, sessionSync } from "../../decorators/session-sync-observable";
+import { browserSession, sessionSync } from "../decorators/session-sync-observable";
 
 @browserSession
-export class FolderService extends BaseFolderService {
+export class BrowserFolderService extends BaseFolderService {
   @sessionSync({ initializer: Folder.fromJSON, initializeAsArray: true })
   protected _folders: BehaviorSubject<Folder[]>;
   @sessionSync({ initializer: FolderView.fromJSON, initializeAsArray: true })