@metamask-previews/seedless-onboarding-controller 2.5.0-preview-5bf6b6e → 2.5.0-preview-1def870e

package/CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Moved `@noble/ciphers` from dev dependencies to main dependencies and bumped from `^0.5.2` to `^1.3.0` ([#6101](https://github.com/MetaMask/core/pull/6101))
 - Moved `@noble/curves` from dev dependencies to main dependencies and bumped from `^1.2.0` to `^1.9.2` ([#6101](https://github.com/MetaMask/core/pull/6101))
 
+### Fixed
+
+- Fixed the vault creation with incorrect revokeToken value after fetching new revoke token asynchronously. ([#6272](https://github.com/MetaMask/core/pull/6272))
+
 ## [2.5.0]
 
 ### Added

package/dist/SeedlessOnboardingController.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SeedlessOnboardingController_instances, _SeedlessOnboardingController_vaultEncryptor, _SeedlessOnboardingController_controllerOperationMutex, _SeedlessOnboardingController_vaultOperationMutex, _SeedlessOnboardingController_refreshJWTToken, _SeedlessOnboardingController_revokeRefreshToken, _SeedlessOnboardingController_isUnlocked, _SeedlessOnboardingController_passwordOutdatedCacheTTL, _SeedlessOnboardingController_submitGlobalPassword, _SeedlessOnboardingController_getAccessToken, _SeedlessOnboardingController_setUnlocked, _SeedlessOnboardingController_persistOprfKey, _SeedlessOnboardingController_persistAuthPubKey, _SeedlessOnboardingController_storeKeyringEncryptionKey, _SeedlessOnboardingController_loadKeyringEncryptionKey, _SeedlessOnboardingController_loadSeedlessEncryptionKey, _SeedlessOnboardingController_recoverAuthPubKey, _SeedlessOnboardingController_recoverEncKey, _SeedlessOnboardingController_fetchAllSecretDataFromMetadataStore, _SeedlessOnboardingController_changeEncryptionKey, _SeedlessOnboardingController_encryptAndStoreSecretData, _SeedlessOnboardingController_unlockVaultAndGetVaultData, _SeedlessOnboardingController_withPersistedSecretMetadataBackupsState, _SeedlessOnboardingController_filterDupesAndUpdateSocialBackupsMetadata, _SeedlessOnboardingController_createNewVaultWithAuthData, _SeedlessOnboardingController_updateVault, _SeedlessOnboardingController_withControllerLock, _SeedlessOnboardingController_withVaultLock, _SeedlessOnboardingController_serializeKeyData, _SeedlessOnboardingController_parseVaultData, _SeedlessOnboardingController_assertIsUnlocked, _SeedlessOnboardingController_assertIsAuthenticatedUser, _SeedlessOnboardingController_assertIsSRPBackedUpUser, _SeedlessOnboardingController_assertPasswordInSync, _SeedlessOnboardingController_resetPasswordOutdatedCache, _SeedlessOnboardingController_isTokenExpiredError, _SeedlessOnboardingController_isMaxKeyChainLengthError, _SeedlessOnboardingController_executeWithTokenRefresh;
+var _SeedlessOnboardingController_instances, _SeedlessOnboardingController_vaultEncryptor, _SeedlessOnboardingController_controllerOperationMutex, _SeedlessOnboardingController_vaultOperationMutex, _SeedlessOnboardingController_refreshJWTToken, _SeedlessOnboardingController_revokeRefreshToken, _SeedlessOnboardingController_isUnlocked, _SeedlessOnboardingController_passwordOutdatedCacheTTL, _SeedlessOnboardingController_submitGlobalPassword, _SeedlessOnboardingController_getAccessToken, _SeedlessOnboardingController_setUnlocked, _SeedlessOnboardingController_persistOprfKey, _SeedlessOnboardingController_persistAuthPubKey, _SeedlessOnboardingController_storeKeyringEncryptionKey, _SeedlessOnboardingController_loadKeyringEncryptionKey, _SeedlessOnboardingController_loadSeedlessEncryptionKey, _SeedlessOnboardingController_recoverAuthPubKey, _SeedlessOnboardingController_recoverEncKey, _SeedlessOnboardingController_fetchAllSecretDataFromMetadataStore, _SeedlessOnboardingController_changeEncryptionKey, _SeedlessOnboardingController_encryptAndStoreSecretData, _SeedlessOnboardingController_unlockVaultAndGetVaultData, _SeedlessOnboardingController_decryptAndParseVaultData, _SeedlessOnboardingController_withPersistedSecretMetadataBackupsState, _SeedlessOnboardingController_filterDupesAndUpdateSocialBackupsMetadata, _SeedlessOnboardingController_createNewVaultWithAuthData, _SeedlessOnboardingController_updateVault, _SeedlessOnboardingController_withControllerLock, _SeedlessOnboardingController_withVaultLock, _SeedlessOnboardingController_serializeKeyData, _SeedlessOnboardingController_parseVaultData, _SeedlessOnboardingController_assertIsUnlocked, _SeedlessOnboardingController_assertIsAuthenticatedUser, _SeedlessOnboardingController_assertIsSRPBackedUpUser, _SeedlessOnboardingController_assertPasswordInSync, _SeedlessOnboardingController_resetPasswordOutdatedCache, _SeedlessOnboardingController_isTokenExpiredError, _SeedlessOnboardingController_isMaxKeyChainLengthError, _SeedlessOnboardingController_executeWithTokenRefresh;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SeedlessOnboardingController = exports.getDefaultSeedlessOnboardingControllerState = void 0;
 const auth_network_utils_1 = require("@metamask/auth-network-utils");
@@ -695,18 +695,20 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
                 connection: this.state.authConnection,
                 revokeToken,
             });
-            this.update((state) => {
-                // set new revoke token in state temporarily for persisting in vault
-                state.revokeToken = newRevokeToken;
-                // set new refresh token to persist in state
-                state.refreshToken = newRefreshToken;
-            });
-            await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_createNewVaultWithAuthData).call(this, {
-                password,
-                rawToprfEncryptionKey,
-                rawToprfPwEncryptionKey,
-                rawToprfAuthKeyPair,
-            });
+            if (newRevokeToken && newRefreshToken) {
+                this.update((state) => {
+                    // set new revoke token in state temporarily for persisting in vault
+                    state.revokeToken = newRevokeToken;
+                    // set new refresh token to persist in state
+                    state.refreshToken = newRefreshToken;
+                });
+                await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_createNewVaultWithAuthData).call(this, {
+                    password,
+                    rawToprfEncryptionKey,
+                    rawToprfPwEncryptionKey,
+                    rawToprfAuthKeyPair,
+                });
+            }
         });
     }
     /**
@@ -821,8 +823,8 @@ async function _SeedlessOnboardingController_getAccessToken(password) {
     if (!vault) {
         throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.InvalidAccessToken);
     }
-    const { accessToken: accessTokenFromVault } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_unlockVaultAndGetVaultData).call(this, password);
-    return accessTokenFromVault;
+    const { parsedVaultData } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_decryptAndParseVaultData).call(this, password);
+    return parsedVaultData.accessToken;
 }, _SeedlessOnboardingController_setUnlocked = function _SeedlessOnboardingController_setUnlocked() {
     __classPrivateFieldSet(this, _SeedlessOnboardingController_isUnlocked, true, "f");
 }, _SeedlessOnboardingController_persistOprfKey = 
@@ -1071,42 +1073,11 @@ async function _SeedlessOnboardingController_encryptAndStoreSecretData(params) {
  */
 async function _SeedlessOnboardingController_unlockVaultAndGetVaultData(password, encryptionKey) {
     return __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_withVaultLock).call(this, async () => {
-        let { vaultEncryptionKey } = this.state;
-        const { vault: encryptedVault, vaultEncryptionSalt } = this.state;
-        if (!encryptedVault) {
-            throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.VaultError);
-        }
-        if (encryptionKey) {
-            vaultEncryptionKey = encryptionKey;
-        }
-        let decryptedVaultData;
-        const updatedState = {};
-        if (password) {
-            assertIsValidPassword(password);
-            // Note that vault decryption using the password is a very costly operation as it involves deriving the encryption key
-            // from the password using an intentionally slow key derivation function.
-            // We should make sure that we only call it very intentionally.
-            const result = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").decryptWithDetail(password, encryptedVault);
-            decryptedVaultData = result.vault;
-            updatedState.vaultEncryptionKey = result.exportedKeyString;
-            updatedState.vaultEncryptionSalt = result.salt;
-        }
-        else {
-            assertIsVaultEncryptionKeyDefined(vaultEncryptionKey);
-            const parsedEncryptedVault = JSON.parse(encryptedVault);
-            if (vaultEncryptionSalt &&
-                vaultEncryptionSalt !== parsedEncryptedVault.salt) {
-                throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.ExpiredCredentials);
-            }
-            const key = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").importKey(vaultEncryptionKey);
-            decryptedVaultData = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").decryptWithKey(key, parsedEncryptedVault);
-            updatedState.vaultEncryptionKey = vaultEncryptionKey;
-            updatedState.vaultEncryptionSalt = vaultEncryptionSalt;
-        }
-        const { toprfEncryptionKey, toprfPwEncryptionKey, toprfAuthKeyPair, revokeToken, accessToken, } = __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_parseVaultData).call(this, decryptedVaultData);
+        const { parsedVaultData, vaultEncryptionKey, vaultEncryptionSalt } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_decryptAndParseVaultData).call(this, password, encryptionKey);
+        const { toprfEncryptionKey, toprfPwEncryptionKey, toprfAuthKeyPair, revokeToken, accessToken, } = parsedVaultData;
         this.update((state) => {
-            state.vaultEncryptionKey = updatedState.vaultEncryptionKey;
-            state.vaultEncryptionSalt = updatedState.vaultEncryptionSalt;
+            state.vaultEncryptionKey = vaultEncryptionKey;
+            state.vaultEncryptionSalt = vaultEncryptionSalt;
             state.revokeToken = revokeToken;
             state.accessToken = accessToken;
         });
@@ -1118,6 +1089,50 @@ async function _SeedlessOnboardingController_unlockVaultAndGetVaultData(password
             accessToken,
         };
     });
+}, _SeedlessOnboardingController_decryptAndParseVaultData = 
+/**
+ * Decrypts the vault data and parses it into a usable format.
+ *
+ * @param password - The optional password to decrypt the vault.
+ * @param encryptionKey - The optional encryption key to decrypt the vault.
+ * @returns A promise that resolves to an object containing:
+ */
+async function _SeedlessOnboardingController_decryptAndParseVaultData(password, encryptionKey) {
+    let { vaultEncryptionKey, vaultEncryptionSalt } = this.state;
+    const { vault: encryptedVault } = this.state;
+    if (!encryptedVault) {
+        throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.VaultError);
+    }
+    if (encryptionKey) {
+        vaultEncryptionKey = encryptionKey;
+    }
+    let decryptedVaultData;
+    if (password) {
+        assertIsValidPassword(password);
+        // Note that vault decryption using the password is a very costly operation as it involves deriving the encryption key
+        // from the password using an intentionally slow key derivation function.
+        // We should make sure that we only call it very intentionally.
+        const result = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").decryptWithDetail(password, encryptedVault);
+        decryptedVaultData = result.vault;
+        vaultEncryptionKey = result.exportedKeyString;
+        vaultEncryptionSalt = result.salt;
+    }
+    else {
+        assertIsVaultEncryptionKeyDefined(vaultEncryptionKey);
+        const parsedEncryptedVault = JSON.parse(encryptedVault);
+        if (vaultEncryptionSalt &&
+            vaultEncryptionSalt !== parsedEncryptedVault.salt) {
+            throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.ExpiredCredentials);
+        }
+        const key = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").importKey(vaultEncryptionKey);
+        decryptedVaultData = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").decryptWithKey(key, parsedEncryptedVault);
+    }
+    const parsedVaultData = __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_parseVaultData).call(this, decryptedVaultData);
+    return {
+        parsedVaultData,
+        vaultEncryptionKey,
+        vaultEncryptionSalt,
+    };
 }, _SeedlessOnboardingController_withPersistedSecretMetadataBackupsState = 
 /**
  * Executes a callback function that creates or restores secret data and persists their hashes in the controller state.
@@ -1184,18 +1199,20 @@ async function _SeedlessOnboardingController_withPersistedSecretMetadataBackupsS
  * @param params.password - The password to encrypt the vault.
  * @param params.rawToprfEncryptionKey - The encryption key to encrypt the vault.
  * @param params.rawToprfPwEncryptionKey - The encryption key to encrypt the password.
- * @param params.rawToprfAuthKeyPair - The authentication key pair to encrypt the vault.
+ * @param params.rawToprfAuthKeyPair - The authentication key pair for Toprf operations.
+ * @param params.revokeToken - The optional revoke token.
+ * @param params.shouldSetUnlocked - Whether to set the controller as unlocked. @default true
  */
 async function _SeedlessOnboardingController_createNewVaultWithAuthData({ password, rawToprfEncryptionKey, rawToprfPwEncryptionKey, rawToprfAuthKeyPair, }) {
     __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
+    const revokeToken = this.state.revokeToken;
     const accessToken = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_getAccessToken).call(this, password);
-    __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_setUnlocked).call(this);
     const { toprfEncryptionKey, toprfPwEncryptionKey, toprfAuthKeyPair } = __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_serializeKeyData).call(this, rawToprfEncryptionKey, rawToprfPwEncryptionKey, rawToprfAuthKeyPair);
     const serializedVaultData = JSON.stringify({
         toprfEncryptionKey,
         toprfPwEncryptionKey,
         toprfAuthKeyPair,
-        revokeToken: this.state.revokeToken,
+        revokeToken,
         accessToken,
     });
     await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_updateVault).call(this, {
@@ -1207,6 +1224,7 @@ async function _SeedlessOnboardingController_createNewVaultWithAuthData({ passwo
     __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_persistAuthPubKey).call(this, {
         authPubKey: rawToprfAuthKeyPair.pk,
     });
+    __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_setUnlocked).call(this);
 }, _SeedlessOnboardingController_updateVault = 
 /**
  * Encrypt and update the vault with the given authentication data.