@metamask-previews/seedless-onboarding-controller 6.0.0-preview-eee46d4b → 6.0.0-preview-cc7e30d0

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Revert `revokeToken` value as optional in `authenticate` method. ([#7012](https://github.com/MetaMask/core/pull/7012))
+
+### Fixed
+
+- Fixed `InvalidRevokeToken` issue in `refreshAuthTokens` method. ([#7012](https://github.com/MetaMask/core/pull/7012))
+
 ## [6.0.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_renewRefreshToken, _SeedlessOnboardingController_passwordOutdatedCacheTTL, _SeedlessOnboardingController_isUnlocked, _SeedlessOnboardingController_cachedDecryptedVaultData, _SeedlessOnboardingController_submitGlobalPassword, _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_parseVaultData, _SeedlessOnboardingController_assertIsUnlocked, _SeedlessOnboardingController_assertIsAuthenticatedUser, _SeedlessOnboardingController_assertIsSRPBackedUpUser, _SeedlessOnboardingController_assertPasswordInSync, _SeedlessOnboardingController_resetPasswordOutdatedCache, _SeedlessOnboardingController_addRefreshTokenToRevokeList, _SeedlessOnboardingController_isAuthTokenError, _SeedlessOnboardingController_isMaxKeyChainLengthError, _SeedlessOnboardingController_executeWithTokenRefresh;
+var _SeedlessOnboardingController_instances, _SeedlessOnboardingController_vaultEncryptor, _SeedlessOnboardingController_controllerOperationMutex, _SeedlessOnboardingController_vaultOperationMutex, _SeedlessOnboardingController_refreshJWTToken, _SeedlessOnboardingController_revokeRefreshToken, _SeedlessOnboardingController_renewRefreshToken, _SeedlessOnboardingController_passwordOutdatedCacheTTL, _SeedlessOnboardingController_isUnlocked, _SeedlessOnboardingController_cachedDecryptedVaultData, _SeedlessOnboardingController_submitGlobalPassword, _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_getAccessTokenAndRevokeToken, _SeedlessOnboardingController_withControllerLock, _SeedlessOnboardingController_withVaultLock, _SeedlessOnboardingController_parseVaultData, _SeedlessOnboardingController_assertIsUnlocked, _SeedlessOnboardingController_assertIsAuthenticatedUser, _SeedlessOnboardingController_assertIsSRPBackedUpUser, _SeedlessOnboardingController_assertPasswordInSync, _SeedlessOnboardingController_resetPasswordOutdatedCache, _SeedlessOnboardingController_addRefreshTokenToRevokeList, _SeedlessOnboardingController_isAuthTokenError, _SeedlessOnboardingController_isMaxKeyChainLengthError, _SeedlessOnboardingController_executeWithTokenRefresh;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SeedlessOnboardingController = exports.getInitialSeedlessOnboardingControllerStateWithDefaults = void 0;
 const auth_network_utils_1 = require("@metamask/auth-network-utils");
@@ -298,8 +298,10 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
                     state.socialLoginEmail = socialLoginEmail;
                     state.metadataAccessToken = metadataAccessToken;
                     state.refreshToken = refreshToken;
-                    // Temporarily store revoke token & access token in state for later vault creation
-                    state.revokeToken = revokeToken;
+                    if (revokeToken) {
+                        // Temporarily store revoke token & access token in state for later vault creation
+                        state.revokeToken = revokeToken;
+                    }
                     state.accessToken = accessToken;
                     // we will check if the controller state is properly set with the authenticated user info
                     // before setting the isSeedlessOnboardingUserAuthenticated to true
@@ -641,7 +643,7 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
                     return passwordOutdatedCache.isExpiredPwd;
                 }
             }
-            (0, assertions_1.assertIsAuthUserInfoValid)(this.state);
+            __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
             const { nodeAuthTokens, authConnectionId, groupedAuthConnectionId, userId, } = this.state;
             const currentDeviceAuthPubKey = __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverAuthPubKey).call(this);
             let globalAuthPubKey = options?.globalAuthPubKey;
@@ -679,8 +681,9 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
     async checkIsSeedlessOnboardingUserAuthenticated() {
         let isAuthenticated = false;
         try {
-            (0, assertions_1.assertIsSeedlessOnboardingUserAuthenticated)(this.state);
-            isAuthenticated = true;
+            __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
+            isAuthenticated =
+                Boolean(this.state.accessToken) && Boolean(this.state.refreshToken);
         }
         catch {
             isAuthenticated = false;
@@ -729,7 +732,7 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
      */
     async refreshAuthTokens() {
         __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
-        const { refreshToken, revokeToken } = this.state;
+        const { refreshToken } = this.state;
         const res = await __classPrivateFieldGet(this, _SeedlessOnboardingController_refreshJWTToken, "f").call(this, {
             connection: this.state.authConnection,
             refreshToken,
@@ -749,7 +752,6 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
                 groupedAuthConnectionId: this.state.groupedAuthConnectionId,
                 userId: this.state.userId,
                 refreshToken,
-                revokeToken,
                 skipLock: true,
             });
         }
@@ -774,9 +776,6 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
                 password,
                 encryptionKey: vaultEncryptionKey,
             });
-            if (!revokeToken) {
-                throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.InvalidRevokeToken);
-            }
             const { newRevokeToken, newRefreshToken } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_renewRefreshToken, "f").call(this, {
                 connection: this.state.authConnection,
                 revokeToken,
@@ -887,6 +886,9 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
         try {
             __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
             const { accessToken } = this.state;
+            if (!accessToken) {
+                return true; // Consider missing token as expired
+            }
             const decodedToken = (0, utils_3.decodeJWTToken)(accessToken);
             return decodedToken.exp < Math.floor(Date.now() / 1000);
         }
@@ -1024,7 +1026,7 @@ async function _SeedlessOnboardingController_loadSeedlessEncryptionKey(encKey) {
  * @throws RecoveryError - If failed to recover the encryption key.
  */
 async function _SeedlessOnboardingController_recoverEncKey(password) {
-    (0, assertions_1.assertIsAuthUserInfoValid)(this.state);
+    __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
     const { nodeAuthTokens, authConnectionId, groupedAuthConnectionId, userId, } = this.state;
     try {
         const recoverEncKeyResult = await this.toprfClient.recoverEncKey({
@@ -1314,25 +1316,31 @@ async function _SeedlessOnboardingController_withPersistedSecretMetadataBackupsS
  * @param params.rawToprfAuthKeyPair - The authentication key pair for Toprf operations.
  */
 async function _SeedlessOnboardingController_createNewVaultWithAuthData({ password, rawToprfEncryptionKey, rawToprfPwEncryptionKey, rawToprfAuthKeyPair, }) {
-    __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
-    const { revokeToken, accessToken } = this.state;
-    const vaultData = {
-        toprfAuthKeyPair: rawToprfAuthKeyPair,
-        toprfEncryptionKey: rawToprfEncryptionKey,
-        toprfPwEncryptionKey: rawToprfPwEncryptionKey,
-        revokeToken,
-        accessToken,
-    };
-    await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_updateVault).call(this, {
-        password,
-        vaultData,
-        pwEncKey: rawToprfPwEncryptionKey,
-    });
-    // update the authPubKey in the state
-    __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_persistAuthPubKey).call(this, {
-        authPubKey: rawToprfAuthKeyPair.pk,
-    });
-    __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_setUnlocked).call(this);
+    try {
+        __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
+        const { accessToken, revokeToken } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_getAccessTokenAndRevokeToken).call(this, password);
+        const vaultData = {
+            toprfAuthKeyPair: rawToprfAuthKeyPair,
+            toprfEncryptionKey: rawToprfEncryptionKey,
+            toprfPwEncryptionKey: rawToprfPwEncryptionKey,
+            revokeToken,
+            accessToken,
+        };
+        await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_updateVault).call(this, {
+            password,
+            vaultData,
+            pwEncKey: rawToprfPwEncryptionKey,
+        });
+        // update the authPubKey in the state
+        __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_persistAuthPubKey).call(this, {
+            authPubKey: rawToprfAuthKeyPair.pk,
+        });
+        __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_setUnlocked).call(this);
+    }
+    catch (error) {
+        log('Error creating new vault with auth data', error, JSON.stringify(this.state));
+        throw error;
+    }
 }, _SeedlessOnboardingController_updateVault = 
 /**
  * Encrypt and update the vault with the given authentication data.
@@ -1363,6 +1371,31 @@ async function _SeedlessOnboardingController_updateVault({ password, vaultData,
             state.encryptedSeedlessEncryptionKey = (0, utils_1.bytesToBase64)(encryptedKey);
         });
     });
+}, _SeedlessOnboardingController_getAccessTokenAndRevokeToken = 
+/**
+ * Get the access token and revoke token from the state or the vault.
+ *
+ * @param password - The password to decrypt the vault.
+ * @returns The access token and revoke token.
+ */
+async function _SeedlessOnboardingController_getAccessTokenAndRevokeToken(password) {
+    let { accessToken, revokeToken } = this.state;
+    if (accessToken && revokeToken) {
+        return { accessToken, revokeToken };
+    }
+    if (this.state.vault) {
+        // if the access token or revoke token is not available in the state, decrypt the vault and get the access token and revoke token from the vault
+        const { vaultData } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_decryptAndParseVaultData).call(this, { password });
+        accessToken = accessToken || vaultData.accessToken;
+        revokeToken = revokeToken || vaultData.revokeToken;
+    }
+    if (!accessToken) {
+        throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.InvalidAccessToken);
+    }
+    if (!revokeToken) {
+        throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.InvalidRevokeToken);
+    }
+    return { accessToken, revokeToken };
 }, _SeedlessOnboardingController_withControllerLock = 
 /**
  * Lock the controller mutex before executing the given function,