refactor seedless-onboarding-controller-init encryptor argument

Author: mikesposito

app/scripts/controller-init/seedless-onboarding/seedless-onboarding-controller-init.test.ts

@@ -71,6 +71,8 @@ describe('SeedlessOnboardingControllerInit', () => {
         decryptWithKey: expect.any(Function),
         encrypt: expect.any(Function),
         encryptWithDetail: expect.any(Function),
+        encryptWithKey: expect.any(Function),
+        isVaultUpdated: expect.any(Function),
         importKey: expect.any(Function),
         exportKey: expect.any(Function),
         generateSalt: expect.any(Function),

app/scripts/controller-init/seedless-onboarding/seedless-onboarding-controller-init.ts

@@ -3,7 +3,7 @@ import {
   SeedlessOnboardingControllerMessenger,
   Web3AuthNetwork,
 } from '@metamask/seedless-onboarding-controller';
-import { EncryptionKey, EncryptionResult } from '@metamask/browser-passworder';
+import { EncryptionKey } from '@metamask/browser-passworder';
 import { ControllerInitFunction } from '../types';
 import { encryptorFactory } from '../../lib/encryptor-factory';
 import { isDevOrTestBuild } from '../../services/oauth/config';
@@ -41,26 +41,7 @@ export const SeedlessOnboardingControllerInit: ControllerInitFunction<
     renewRefreshToken: (...args) =>
       initMessenger.call('OAuthService:renewRefreshToken', ...args),
 
-    encryptor: {
-      decrypt: encryptor.decrypt,
-      decryptWithDetail: encryptor.decryptWithDetail,
-      decryptWithKey: (key: EncryptionKey, encryptedData: EncryptionResult) => {
-        let payload: EncryptionResult;
-        if (typeof encryptedData === 'string') {
-          payload = JSON.parse(encryptedData);
-        } else {
-          payload = encryptedData;
-        }
-
-        return encryptor.decryptWithKey(key as EncryptionKey, payload);
-      },
-      encrypt: encryptor.encrypt,
-      encryptWithDetail: encryptor.encryptWithDetail,
-      importKey: encryptor.importKey,
-      exportKey: encryptor.exportKey,
-      keyFromPassword: encryptor.keyFromPassword,
-      generateSalt: encryptor.generateSalt,
-    },
+    encryptor,
   });
 
   return {

app/scripts/lib/encryptor-factory.ts

@@ -13,7 +13,6 @@ import {
   EncryptionKey,
   KeyDerivationOptions,
 } from '@metamask/browser-passworder';
-import { Encryptor } from '@metamask/keyring-controller';
 
 /**
  * A factory function for the encrypt method of the browser-passworder library,
@@ -108,7 +107,7 @@ const isVaultUpdatedFactory = (iterations: number) => (vault: string) =>
  * @param iterations - The number of iterations to use for the PBKDF2 algorithm.
  * @returns An encryptor set with the given number of iterations.
  */
-export const encryptorFactory = (iterations: number): Encryptor => ({
+export const encryptorFactory = (iterations: number) => ({
   encrypt: encryptFactory(iterations),
   encryptWithKey,
   encryptWithDetail: encryptWithDetailFactory(iterations),