From 8fa1ef54bc7adced80522254cdf04be73d565b88 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:06:43 -0400
Subject: [PATCH] Revert "PM-5263  - TokenService needs to actually use secure
 storage (#8356)" (#8370)

This reverts commit ca8628880bf674fc24a6263c7f557cfceb1a7e2b.
---
 apps/desktop/src/main.ts                      |  6 +---
 .../illegal-secure-storage-service.ts         | 28 -------------------
 .../src/services/jslib-services.module.ts     |  7 ++++-
 3 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 apps/desktop/src/platform/services/illegal-secure-storage-service.ts

diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index c9af632126f..0b92fab894e 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -42,7 +42,6 @@ import { ELECTRON_SUPPORTS_SECURE_STORAGE } from "./platform/services/electron-p
 import { ElectronStateService } from "./platform/services/electron-state.service";
 import { ElectronStorageService } from "./platform/services/electron-storage.service";
 import { I18nMainService } from "./platform/services/i18n.main.service";
-import { IllegalSecureStorageService } from "./platform/services/illegal-secure-storage-service";
 import { ElectronMainMessagingService } from "./services/electron-main-messaging.service";
 
 export class Main {
@@ -148,14 +147,11 @@ export class Main {
 
     this.environmentService = new EnvironmentService(stateProvider, accountService);
 
-    // Note: secure storage service is not available and should not be called in the main background process.
-    const illegalSecureStorageService = new IllegalSecureStorageService();
-
     this.tokenService = new TokenService(
       singleUserStateProvider,
       globalStateProvider,
       ELECTRON_SUPPORTS_SECURE_STORAGE,
-      illegalSecureStorageService,
+      this.storageService,
     );
 
     this.migrationRunner = new MigrationRunner(
diff --git a/apps/desktop/src/platform/services/illegal-secure-storage-service.ts b/apps/desktop/src/platform/services/illegal-secure-storage-service.ts
deleted file mode 100644
index 12f86226bef..00000000000
--- a/apps/desktop/src/platform/services/illegal-secure-storage-service.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service";
-import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options";
-
-export class IllegalSecureStorageService implements AbstractStorageService {
-  constructor() {}
-
-  get valuesRequireDeserialization(): boolean {
-    throw new Error("Method not implemented.");
-  }
-  has(key: string, options?: StorageOptions): Promise<boolean> {
-    throw new Error("Method not implemented.");
-  }
-  save<T>(key: string, obj: T, options?: StorageOptions): Promise<void> {
-    throw new Error("Method not implemented.");
-  }
-  async get<T>(key: string): Promise<T> {
-    throw new Error("Method not implemented.");
-  }
-  async set<T>(key: string, obj: T): Promise<void> {
-    throw new Error("Method not implemented.");
-  }
-  async remove(key: string): Promise<void> {
-    throw new Error("Method not implemented.");
-  }
-  async clear(): Promise<void> {
-    throw new Error("Method not implemented.");
-  }
-}
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 2ff90b79a45..b153c8219b3 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -485,7 +485,12 @@ const typesafeProviders: Array<SafeProvider> = [
   safeProvider({
     provide: TokenServiceAbstraction,
     useClass: TokenService,
-    deps: [SingleUserStateProvider, GlobalStateProvider, SUPPORTS_SECURE_STORAGE, SECURE_STORAGE],
+    deps: [
+      SingleUserStateProvider,
+      GlobalStateProvider,
+      SUPPORTS_SECURE_STORAGE,
+      AbstractStorageService,
+    ],
   }),
   safeProvider({
     provide: KeyGenerationServiceAbstraction,