refactor(encryptor): align Encryptor to match browser-passworder interface

Author: ccharly

app/core/Encryptor/Encryptor.test.ts

@@ -4,6 +4,8 @@ import {
   ENCRYPTION_LIBRARY,
   KEY_DERIVATION_OPTIONS,
   KeyDerivationIteration,
+  KEY_DERIVATION_LEGACY_OPTIONS,
+  KDF_ALGORITHM,
 } from './constants';
 
 const Aes = NativeModules.Aes;
@@ -23,8 +25,8 @@ describe('Encryptor', () => {
       expect(
         () =>
           new Encryptor({
-            derivationParams: {
-              algorithm: 'PBKDF2',
+            keyDerivationOptions: {
+              algorithm: KDF_ALGORITHM,
               params: {
                 iterations: 100,
               },
@@ -89,37 +91,47 @@ describe('Encryptor', () => {
     it.each([
       {
         lib: ENCRYPTION_LIBRARY.original,
-        expectedKey: 'mockedAesKey',
-        expectedPBKDF2Args: ['testPassword', 'mockedSalt', 600000, 256],
+        expectedKeyValue: 'mockedAesKey',
+        expectedPBKDF2Args: [
+          'testPassword',
+          'mockedSalt',
+          KEY_DERIVATION_OPTIONS.params.iterations,
+          256,
+        ],
         description:
           'with original library and default iterations number for key generation',
         keyMetadata: KEY_DERIVATION_OPTIONS,
       },
       {
         lib: ENCRYPTION_LIBRARY.original,
-        expectedKey: 'mockedAesKey',
-        expectedPBKDF2Args: ['testPassword', 'mockedSalt', 5000, 256],
+        expectedKeyValue: 'mockedAesKey',
+        expectedPBKDF2Args: [
+          'testPassword',
+          'mockedSalt',
+          KEY_DERIVATION_LEGACY_OPTIONS.params.iterations,
+          256,
+        ],
         description:
           'with original library and old iterations number for key generation',
       },
       {
         lib: 'random-lib', // Assuming not using "original" should lead to AesForked
-        expectedKey: 'mockedAesForkedKey',
+        expectedKeyValue: 'mockedAesForkedKey',
         expectedPBKDF2Args: ['testPassword', 'mockedSalt'],
         description:
           'with library different to "original" and default iterations number for key generation',
         keyMetadata: KEY_DERIVATION_OPTIONS,
       },
       {
         lib: 'random-lib', // Assuming not using "original" should lead to AesForked
-        expectedKey: 'mockedAesForkedKey',
+        expectedKeyValue: 'mockedAesForkedKey',
         expectedPBKDF2Args: ['testPassword', 'mockedSalt'],
         description:
           'with library different to "original" and old iterations number for key generation',
       },
     ])(
       'decrypts a string correctly $description',
-      async ({ lib, expectedKey, expectedPBKDF2Args, keyMetadata }) => {
+      async ({ lib, expectedKeyValue, expectedPBKDF2Args, keyMetadata }) => {
         const password = 'testPassword';
         const mockVault = {
           cipher: 'mockedCipher',
@@ -128,6 +140,12 @@ describe('Encryptor', () => {
           lib,
         };
 
+        const expectedKey: EncryptionKey = {
+          key: expectedKeyValue,
+          keyMetadata: keyMetadata ?? KEY_DERIVATION_LEGACY_OPTIONS,
+          lib,
+        };
+
         const decryptedObject = await encryptor.decrypt(
           password,
           JSON.stringify(