fix export key

Author: matthiasgeihs

packages/keyring-controller/src/KeyringController.test.ts

@@ -3300,7 +3300,7 @@ describe('KeyringController', () => {
         async ({ controller }) => {
           await controller.setLocked();
           await expect(controller.exportEncryptionKey()).rejects.toThrow(
-            KeyringControllerError.EncryptionKeyNotSet,
+            KeyringControllerError.ControllerLocked,
           );
         },
       );

packages/keyring-controller/src/KeyringController.ts

@@ -527,20 +527,6 @@ function assertIsExportableKeyEncryptor(
   }
 }
 
-/**
- * Assert that the encryption key is set.
- *
- * @param encryptionKey - The encryption key to check.
- * @throws If the encryption key is not set.
- */
-function assertIsEncryptionKeySet(
-  encryptionKey: string | undefined,
-): asserts encryptionKey is string {
-  if (!encryptionKey) {
-    throw new Error(KeyringControllerError.EncryptionKeyNotSet);
-  }
-}
-
 /**
  * Assert that the provided password is a valid non-empty string.
  *
@@ -1491,7 +1477,30 @@ export class KeyringController extends BaseController<
    * @returns The vault encryption key.
    */
   async exportEncryptionKey(): Promise<string> {
-    assertIsEncryptionKeySet(this.state.encryptionKey);
+    this.#assertIsUnlocked();
+    // There is a case where the controller is unlocked but the encryption key
+    // is not set, even when #cacheEncryptionKey is true. This happens when
+    // calling changePassword with the existing password. In this case, the
+    // encryption key is deleted, but the state is not recreated, because the
+    // session state does not change in this case, and #updateVault is not
+    // called in #persistOrRollback.
+    if (!this.state.encryptionKey) {
+      assertIsExportableKeyEncryptor(this.#encryptor);
+      assertIsValidPassword(this.#password);
+      const result = await this.#encryptor.decryptWithDetail(
+        this.#password,
+        // Ignoring undefined. Assuming vault is set when unlocked.
+        this.state.vault as string,
+      );
+      if (this.#cacheEncryptionKey) {
+        this.update((state) => {
+          state.encryptionKey = result.exportedKeyString;
+          state.encryptionSalt = result.salt;
+        });
+      }
+      return result.exportedKeyString;
+    }
+
     return this.state.encryptionKey;
   }
 

packages/keyring-controller/src/constants.ts

@@ -4,7 +4,6 @@ export enum KeyringControllerError {
   UnsafeDirectKeyringAccess = 'KeyringController - Returning keyring instances is unsafe',
   WrongPasswordType = 'KeyringController - Password must be of type string.',
   InvalidEmptyPassword = 'KeyringController - Password cannot be empty.',
-  EncryptionKeyNotSet = 'KeyringController - Encryption key not set.',
   NoFirstAccount = 'KeyringController - First Account not found.',
   DuplicatedAccount = 'KeyringController - The account you are trying to import is a duplicate',
   VaultError = 'KeyringController - Cannot unlock without a previous vault.',