@metamask-previews/keyring-controller 22.0.2-preview-e149187d → 22.0.2-preview-abf6aaef

package/dist/KeyringController.cjs

@@ -154,17 +154,6 @@ function assertIsExportableKeyEncryptor(encryptor) {
         throw new Error(constants_1.KeyringControllerError.UnsupportedEncryptionKeyExport);
     }
 }
-/**
- * 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) {
-    if (!encryptionKey) {
-        throw new Error(constants_1.KeyringControllerError.EncryptionKeyNotSet);
-    }
-}
 /**
  * Assert that the provided password is a valid non-empty string.
  *
@@ -904,7 +893,27 @@ class KeyringController extends base_controller_1.BaseController {
      * @returns The vault encryption key.
      */
     async exportEncryptionKey() {
-        assertIsEncryptionKeySet(this.state.encryptionKey);
+        __classPrivateFieldGet(this, _KeyringController_instances, "m", _KeyringController_assertIsUnlocked).call(this);
+        // 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(__classPrivateFieldGet(this, _KeyringController_encryptor, "f"));
+            assertIsValidPassword(__classPrivateFieldGet(this, _KeyringController_password, "f"));
+            const result = await __classPrivateFieldGet(this, _KeyringController_encryptor, "f").decryptWithDetail(__classPrivateFieldGet(this, _KeyringController_password, "f"), 
+            // Ignoring undefined. Assuming vault is set when unlocked.
+            this.state.vault);
+            if (__classPrivateFieldGet(this, _KeyringController_cacheEncryptionKey, "f")) {
+                this.update((state) => {
+                    state.encryptionKey = result.exportedKeyString;
+                    state.encryptionSalt = result.salt;
+                });
+            }
+            return result.exportedKeyString;
+        }
         return this.state.encryptionKey;
     }
     /**