Revert "[PM-7810] Handle Multithread Decryption Through Offscreen API (…

…#8978)" (#9221)

This reverts commit f51042f.

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

@@ -109,6 +109,7 @@ import { DefaultConfigService } from "@bitwarden/common/platform/services/config
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
 import { ContainerService } from "@bitwarden/common/platform/services/container.service";
 import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation";
+import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation";
 import { Fido2AuthenticatorService } from "@bitwarden/common/platform/services/fido2/fido2-authenticator.service";
 import { Fido2ClientService } from "@bitwarden/common/platform/services/fido2/fido2-client.service";
 import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service";
@@ -220,7 +221,6 @@ import { BrowserCryptoService } from "../platform/services/browser-crypto.servic
 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 { BrowserMultithreadEncryptServiceImplementation } from "../platform/services/browser-multithread-encrypt.service.implementation";
 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";
@@ -479,14 +479,14 @@ export default class MainBackground {
       storageServiceProvider,
     );
 
-    this.encryptService = flagEnabled("multithreadDecryption")
-      ? new BrowserMultithreadEncryptServiceImplementation(
-          this.cryptoFunctionService,
-          this.logService,
-          true,
-          this.offscreenDocumentService,
-        )
-      : new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, true);
+    this.encryptService =
+      flagEnabled("multithreadDecryption") && BrowserApi.isManifestVersion(2)
+        ? new MultithreadEncryptServiceImplementation(
+            this.cryptoFunctionService,
+            this.logService,
+            true,
+          )
+        : new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, true);
 
     this.singleUserStateProvider = new DefaultSingleUserStateProvider(
       storageServiceProvider,

apps/browser/src/platform/offscreen-document/abstractions/offscreen-document.ts

@@ -2,7 +2,6 @@ export type OffscreenDocumentExtensionMessage = {
   [key: string]: any;
   command: string;
   text?: string;
-  decryptRequest?: string;
 };
 
 type OffscreenExtensionMessageEventParams = {
@@ -14,7 +13,6 @@ export type OffscreenDocumentExtensionMessageHandlers = {
   [key: string]: ({ message, sender }: OffscreenExtensionMessageEventParams) => any;
   offscreenCopyToClipboard: ({ message }: OffscreenExtensionMessageEventParams) => any;
   offscreenReadFromClipboard: () => any;
-  offscreenDecryptItems: ({ message }: OffscreenExtensionMessageEventParams) => Promise<string>;
 };
 
 export interface OffscreenDocument {

apps/browser/src/platform/offscreen-document/offscreen-document.spec.ts

@@ -1,25 +1,7 @@
-import { mock } from "jest-mock-extended";
-
-import { Decryptable } from "@bitwarden/common/platform/interfaces/decryptable.interface";
-import { InitializerMetadata } from "@bitwarden/common/platform/interfaces/initializer-metadata.interface";
-import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
-
 import { flushPromises, sendExtensionRuntimeMessage } from "../../autofill/spec/testing-utils";
 import { BrowserApi } from "../browser/browser-api";
 import BrowserClipboardService from "../services/browser-clipboard.service";
 
-jest.mock(
-  "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation",
-  () => ({
-    MultithreadEncryptServiceImplementation: class MultithreadEncryptServiceImplementation {
-      getDecryptedItemsFromWorker = async <T extends InitializerMetadata>(
-        items: Decryptable<T>[],
-        _key: SymmetricCryptoKey,
-      ): Promise<string> => JSON.stringify(items);
-    },
-  }),
-);
-
 describe("OffscreenDocument", () => {
   const browserApiMessageListenerSpy = jest.spyOn(BrowserApi, "messageListener");
   const browserClipboardServiceCopySpy = jest.spyOn(BrowserClipboardService, "copy");
@@ -78,37 +60,5 @@ describe("OffscreenDocument", () => {
         expect(browserClipboardServiceReadSpy).toHaveBeenCalledWith(window);
       });
     });
-
-    describe("handleOffscreenDecryptItems", () => {
-      it("returns an empty array as a string if the decrypt request is not present in the message", async () => {
-        let response: string | undefined;
-        sendExtensionRuntimeMessage(
-          { command: "offscreenDecryptItems" },
-          mock<chrome.runtime.MessageSender>(),
-          (res: string) => (response = res),
-        );
-        await flushPromises();
-
-        expect(response).toBe("[]");
-      });
-
-      it("decrypts the items and sends back the response as a string", async () => {
-        const items = [{ id: "test" }];
-        const key = { id: "test" };
-        const decryptRequest = JSON.stringify({ items, key });
-        let response: string | undefined;
-
-        sendExtensionRuntimeMessage(
-          { command: "offscreenDecryptItems", decryptRequest },
-          mock<chrome.runtime.MessageSender>(),
-          (res: string) => {
-            response = res;
-          },
-        );
-        await flushPromises();
-
-        expect(response).toBe(JSON.stringify(items));
-      });
-    });
   });
 });

apps/browser/src/platform/offscreen-document/offscreen-document.ts

@@ -1,35 +1,21 @@
 import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service";
-import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation";
-import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service";
 
 import { BrowserApi } from "../browser/browser-api";
 import BrowserClipboardService from "../services/browser-clipboard.service";
 
 import {
-  OffscreenDocument as OffscreenDocumentInterface,
   OffscreenDocumentExtensionMessage,
   OffscreenDocumentExtensionMessageHandlers,
+  OffscreenDocument as OffscreenDocumentInterface,
 } from "./abstractions/offscreen-document";
 
 class OffscreenDocument implements OffscreenDocumentInterface {
-  private readonly consoleLogService: ConsoleLogService;
-  private encryptService: MultithreadEncryptServiceImplementation;
+  private consoleLogService: ConsoleLogService = new ConsoleLogService(false);
   private readonly extensionMessageHandlers: OffscreenDocumentExtensionMessageHandlers = {
     offscreenCopyToClipboard: ({ message }) => this.handleOffscreenCopyToClipboard(message),
     offscreenReadFromClipboard: () => this.handleOffscreenReadFromClipboard(),
-    offscreenDecryptItems: ({ message }) => this.handleOffscreenDecryptItems(message),
   };
 
-  constructor() {
-    const cryptoFunctionService = new WebCryptoFunctionService(self);
-    this.consoleLogService = new ConsoleLogService(false);
-    this.encryptService = new MultithreadEncryptServiceImplementation(
-      cryptoFunctionService,
-      this.consoleLogService,
-      true,
-    );
-  }
-
   /**
    * Initializes the offscreen document extension.
    */
@@ -53,23 +39,6 @@ class OffscreenDocument implements OffscreenDocumentInterface {
     return await BrowserClipboardService.read(self);
   }
 
-  /**
-   * Decrypts the items in the message using the encrypt service.
-   *
-   * @param message - The extension message containing the items to decrypt
-   */
-  private async handleOffscreenDecryptItems(
-    message: OffscreenDocumentExtensionMessage,
-  ): Promise<string> {
-    const { decryptRequest } = message;
-    if (!decryptRequest) {
-      return "[]";
-    }
-
-    const request = JSON.parse(decryptRequest);
-    return await this.encryptService.getDecryptedItemsFromWorker(request.items, request.key);
-  }
-
   /**
    * Sets up the listener for extension messages.
    */