@metamask-previews/seedless-onboarding-controller 7.1.0-preview-85f1a30c → 7.1.0-preview-8a281087

package/CHANGELOG.md

@@ -7,12 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Added new public method, `getAccessToken`. ([#7800](https://github.com/MetaMask/core/pull/7800))
-  - Clients can use this method to get `accessToken` from the controller, instead of directly accessing from the state.
-  - This method also adds refresh token mechanism when `accessToken` is expired, hence preventing expired token usage in the clients.
-
 ### Changed
 
 - Update StateMetadata's `includeInStateLogs` property. ([#7750](https://github.com/MetaMask/core/pull/7750))

package/dist/SeedlessOnboardingController.cjs

@@ -10,12 +10,11 @@ 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_getAccessTokenAndRevokeToken, _SeedlessOnboardingController_withControllerLock, _SeedlessOnboardingController_withVaultLock, _SeedlessOnboardingController_parseVaultData, _SeedlessOnboardingController_assertIsUnlocked, _SeedlessOnboardingController_assertIsAuthenticatedUser, _SeedlessOnboardingController_assertPasswordInSync, _SeedlessOnboardingController_resetPasswordOutdatedCache, _SeedlessOnboardingController_addRefreshTokenToRevokeList, _SeedlessOnboardingController_isAuthTokenError, _SeedlessOnboardingController_isMaxKeyChainLengthError, _SeedlessOnboardingController_executeWithTokenRefresh, _SeedlessOnboardingController_updateVaultAfterAuthTokenRefresh, _SeedlessOnboardingController_checkTokensExpired;
+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_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");
 const base_controller_1 = require("@metamask/base-controller");
-const messenger_1 = require("@metamask/messenger");
 const toprf_secure_backup_1 = require("@metamask/toprf-secure-backup");
 const utils_1 = require("@metamask/utils");
 const aes_1 = require("@noble/ciphers/aes");
@@ -243,7 +242,6 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
         __classPrivateFieldSet(this, _SeedlessOnboardingController_refreshJWTToken, refreshJWTToken, "f");
         __classPrivateFieldSet(this, _SeedlessOnboardingController_revokeRefreshToken, revokeRefreshToken, "f");
         __classPrivateFieldSet(this, _SeedlessOnboardingController_renewRefreshToken, renewRefreshToken, "f");
-        this.messenger.registerActionHandler('SeedlessOnboardingController:getAccessToken', this.getAccessToken.bind(this));
     }
     async fetchMetadataAccessCreds() {
         const { metadataAccessToken } = this.state;
@@ -770,8 +768,6 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
                 refreshToken,
                 skipLock: true,
             });
-            // update the vault with new access token
-            await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_updateVaultAfterAuthTokenRefresh).call(this, accessToken);
         }
         catch (error) {
             log('Error refreshing node auth tokens', error);
@@ -862,21 +858,6 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
             }
         });
     }
-    /**
-     * Get the access token from the state.
-     *
-     * If the tokens are expired, the method will refresh them and return the new access token.
-     *
-     * @returns The access token.
-     */
-    async getAccessToken() {
-        return __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_withControllerLock).call(this, async () => {
-            __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
-            return __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_executeWithTokenRefresh).call(this, async () => {
-                return this.state.accessToken;
-            }, 'getAccessToken');
-        });
-    }
     /**
      * Check if the current node auth token is expired.
      *
@@ -1556,7 +1537,18 @@ async function _SeedlessOnboardingController_assertPasswordInSync(options) {
  */
 async function _SeedlessOnboardingController_executeWithTokenRefresh(operation, operationName) {
     try {
-        if (__classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_checkTokensExpired).call(this)) {
+        // proactively check for expired tokens and refresh them if needed
+        const isNodeAuthTokenExpired = this.checkNodeAuthTokenExpired();
+        const isMetadataAccessTokenExpired = this.checkMetadataAccessTokenExpired();
+        // access token is only accessible when the vault is unlocked
+        // so skip the check if the vault is locked
+        let isAccessTokenExpired = false;
+        if (__classPrivateFieldGet(this, _SeedlessOnboardingController_isUnlocked, "f")) {
+            isAccessTokenExpired = this.checkAccessTokenExpired();
+        }
+        if (isNodeAuthTokenExpired ||
+            isMetadataAccessTokenExpired ||
+            isAccessTokenExpired) {
             log(`JWT token expired during ${operationName}, attempting to refresh tokens`, 'node auth token exp check');
             await this.refreshAuthTokens();
         }
@@ -1582,50 +1574,6 @@ async function _SeedlessOnboardingController_executeWithTokenRefresh(operation,
             throw error;
         }
     }
-}, _SeedlessOnboardingController_updateVaultAfterAuthTokenRefresh = async function _SeedlessOnboardingController_updateVaultAfterAuthTokenRefresh(accessToken) {
-    if (!__classPrivateFieldGet(this, _SeedlessOnboardingController_isUnlocked, "f")) {
-        // we just temporarily store the access token in the state
-        // when user attempts to unlock the vault, we will use this access token to update the vault
-        this.update((state) => {
-            state.accessToken = accessToken;
-        });
-        return;
-    }
-    const { vaultEncryptionKey, vaultEncryptionSalt } = this.state;
-    if (!vaultEncryptionKey ||
-        !vaultEncryptionSalt ||
-        !__classPrivateFieldGet(this, _SeedlessOnboardingController_cachedDecryptedVaultData, "f")) {
-        throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.MissingCredentials);
-    }
-    // update the cached decrypted vault data with the new access token
-    __classPrivateFieldGet(this, _SeedlessOnboardingController_cachedDecryptedVaultData, "f").accessToken = accessToken;
-    const serializedVaultData = (0, utils_3.serializeVaultData)(__classPrivateFieldGet(this, _SeedlessOnboardingController_cachedDecryptedVaultData, "f"));
-    const encryptionKey = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").importKey(vaultEncryptionKey);
-    const updatedEncVault = await __classPrivateFieldGet(this, _SeedlessOnboardingController_vaultEncryptor, "f").encryptWithKey(encryptionKey, serializedVaultData);
-    // NOTE: Referenced from keyring-controller!
-    // We need to include the salt used to derive
-    // the encryption key, to be able to derive it
-    // from password again.
-    updatedEncVault.salt = vaultEncryptionSalt;
-    this.update((state) => {
-        state.vault = JSON.stringify(updatedEncVault);
-        state.vaultEncryptionSalt = vaultEncryptionSalt;
-        state.accessToken = accessToken;
-        state.vaultEncryptionKey = vaultEncryptionKey;
-    });
-}, _SeedlessOnboardingController_checkTokensExpired = function _SeedlessOnboardingController_checkTokensExpired() {
-    // proactively check for expired tokens and refresh them if needed
-    const isNodeAuthTokenExpired = this.checkNodeAuthTokenExpired();
-    const isMetadataAccessTokenExpired = this.checkMetadataAccessTokenExpired();
-    // access token is only accessible when the vault is unlocked
-    // so skip the check if the vault is locked
-    let isAccessTokenExpired = false;
-    if (__classPrivateFieldGet(this, _SeedlessOnboardingController_isUnlocked, "f")) {
-        isAccessTokenExpired = this.checkAccessTokenExpired();
-    }
-    return (isNodeAuthTokenExpired ||
-        isMetadataAccessTokenExpired ||
-        isAccessTokenExpired);
 };
 /**
  * Assert that the provided password is a valid non-empty string.