@metamask-previews/seedless-onboarding-controller 2.4.0-preview-a0e6b482 → 2.4.0-preview-defa214d

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/CHANGELOG.md +0 -13
  2. package/dist/SeedlessOnboardingController.cjs +62 -100
  3. package/dist/SeedlessOnboardingController.cjs.map +1 -1
  4. package/dist/SeedlessOnboardingController.d.cts +14 -7
  5. package/dist/SeedlessOnboardingController.d.cts.map +1 -1
  6. package/dist/SeedlessOnboardingController.d.mts +14 -7
  7. package/dist/SeedlessOnboardingController.d.mts.map +1 -1
  8. package/dist/SeedlessOnboardingController.mjs +63 -101
  9. package/dist/SeedlessOnboardingController.mjs.map +1 -1
  10. package/dist/assertions.cjs +1 -16
  11. package/dist/assertions.cjs.map +1 -1
  12. package/dist/assertions.d.cts +0 -7
  13. package/dist/assertions.d.cts.map +1 -1
  14. package/dist/assertions.d.mts +0 -7
  15. package/dist/assertions.d.mts.map +1 -1
  16. package/dist/assertions.mjs +0 -14
  17. package/dist/assertions.mjs.map +1 -1
  18. package/dist/constants.cjs +1 -3
  19. package/dist/constants.cjs.map +1 -1
  20. package/dist/constants.d.cts +2 -4
  21. package/dist/constants.d.cts.map +1 -1
  22. package/dist/constants.d.mts +2 -4
  23. package/dist/constants.d.mts.map +1 -1
  24. package/dist/constants.mjs +1 -3
  25. package/dist/constants.mjs.map +1 -1
  26. package/dist/index.cjs +1 -3
  27. package/dist/index.cjs.map +1 -1
  28. package/dist/index.d.cts +0 -1
  29. package/dist/index.d.cts.map +1 -1
  30. package/dist/index.d.mts +0 -1
  31. package/dist/index.d.mts.map +1 -1
  32. package/dist/index.mjs +0 -1
  33. package/dist/index.mjs.map +1 -1
  34. package/dist/types.cjs.map +1 -1
  35. package/dist/types.d.cts +0 -6
  36. package/dist/types.d.cts.map +1 -1
  37. package/dist/types.d.mts +0 -6
  38. package/dist/types.d.mts.map +1 -1
  39. package/dist/types.mjs.map +1 -1
  40. package/package.json +2 -2
package/CHANGELOG.md CHANGED
@@ -7,19 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7
7
 
8
8
  ## [Unreleased]
9
9
 
10
- ### Added
11
-
12
- - Added an optional parameter, `passwordOutdatedCacheTTL` to the constructor params and exported `SecretMetadata` class from the controller.([#6169](https://github.com/MetaMask/core/pull/6169))
13
-
14
- ### Changed
15
-
16
- - Renamed public method `submitGlobalPassword` to `submitGlobalPasswordAndSync`. ([#6180](https://github.com/MetaMask/core/pull/6180))
17
-
18
- ### Removed
19
-
20
- - Removed `syncLatestGlobalPassword` from the Controller. ([#6180](https://github.com/MetaMask/core/pull/6180))
21
- - Moved the vault syncing to the `submitGlobalPassword` method
22
-
23
10
  ## [2.4.0]
24
11
 
25
12
  ### Fixed
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
10
10
  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");
11
11
  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
12
12
  };
13
- var _SeedlessOnboardingController_instances, _SeedlessOnboardingController_vaultEncryptor, _SeedlessOnboardingController_controllerOperationMutex, _SeedlessOnboardingController_vaultOperationMutex, _SeedlessOnboardingController_refreshJWTToken, _SeedlessOnboardingController_revokeRefreshToken, _SeedlessOnboardingController_isUnlocked, _SeedlessOnboardingController_passwordOutdatedCacheTTL, _SeedlessOnboardingController_submitGlobalPasswordAndSync, _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_revokeRefreshTokenAndUpdateState, _SeedlessOnboardingController_isTokenExpiredError, _SeedlessOnboardingController_isMaxKeyChainLengthError, _SeedlessOnboardingController_executeWithTokenRefresh;
13
+ var _SeedlessOnboardingController_instances, _SeedlessOnboardingController_vaultEncryptor, _SeedlessOnboardingController_controllerOperationMutex, _SeedlessOnboardingController_vaultOperationMutex, _SeedlessOnboardingController_refreshJWTToken, _SeedlessOnboardingController_revokeRefreshToken, _SeedlessOnboardingController_isUnlocked, _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_revokeRefreshTokenAndUpdateState, _SeedlessOnboardingController_isTokenExpiredError, _SeedlessOnboardingController_isMaxKeyChainLengthError, _SeedlessOnboardingController_executeWithTokenRefresh;
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.SeedlessOnboardingController = exports.getDefaultSeedlessOnboardingControllerState = void 0;
16
16
  const auth_network_utils_1 = require("@metamask/auth-network-utils");
@@ -136,9 +136,8 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
136
136
  * @param options.network - The network to be used for the Seedless Onboarding flow.
137
137
  * @param options.refreshJWTToken - A function to get a new jwt token using refresh token.
138
138
  * @param options.revokeRefreshToken - A function to revoke the refresh token.
139
- * @param options.passwordOutdatedCacheTTL - The TTL of the password outdated cache in milliseconds.,
140
139
  */
141
- constructor({ messenger, state, encryptor, toprfKeyDeriver, network = constants_1.Web3AuthNetwork.Mainnet, refreshJWTToken, revokeRefreshToken, passwordOutdatedCacheTTL = constants_1.PASSWORD_OUTDATED_CACHE_TTL_MS, }) {
140
+ constructor({ messenger, state, encryptor, toprfKeyDeriver, network = constants_1.Web3AuthNetwork.Mainnet, refreshJWTToken, revokeRefreshToken, }) {
142
141
  super({
143
142
  name: constants_1.controllerName,
144
143
  metadata: seedlessOnboardingMetadata,
@@ -160,12 +159,6 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
160
159
  * The controller lock is synchronized with the keyring lock.
161
160
  */
162
161
  _SeedlessOnboardingController_isUnlocked.set(this, false);
163
- /**
164
- * The TTL of the password outdated cache in milliseconds.
165
- */
166
- _SeedlessOnboardingController_passwordOutdatedCacheTTL.set(this, void 0);
167
- (0, assertions_1.assertIsPasswordOutdatedCacheValid)(passwordOutdatedCacheTTL);
168
- __classPrivateFieldSet(this, _SeedlessOnboardingController_passwordOutdatedCacheTTL, passwordOutdatedCacheTTL, "f");
169
162
  __classPrivateFieldSet(this, _SeedlessOnboardingController_vaultEncryptor, encryptor, "f");
170
163
  this.toprfClient = new toprf_secure_backup_1.ToprfSecureBackup({
171
164
  network,
@@ -398,7 +391,7 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
398
391
  await this.verifyVaultPassword(oldPassword, {
399
392
  skipLock: true, // skip lock since we already have the lock
400
393
  });
401
- const { latestKeyIndex } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertPasswordInSync).call(this, {
394
+ await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertPasswordInSync).call(this, {
402
395
  skipCache: true,
403
396
  skipLock: true, // skip lock since we already have the lock
404
397
  });
@@ -412,7 +405,6 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
412
405
  const { encKey: newEncKey, pwEncKey: newPwEncKey, authKeyPair: newAuthKeyPair, } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_changeEncryptionKey).call(this, {
413
406
  oldPassword,
414
407
  newPassword,
415
- latestKeyIndex,
416
408
  });
417
409
  // update and encrypt the vault with new password
418
410
  await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_createNewVaultWithAuthData).call(this, {
@@ -521,6 +513,33 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
521
513
  });
522
514
  __classPrivateFieldSet(this, _SeedlessOnboardingController_isUnlocked, false, "f");
523
515
  }
516
+ /**
517
+ * Sync the latest global password to the controller.
518
+ * reset vault with latest globalPassword,
519
+ * persist the latest global password authPubKey
520
+ *
521
+ * @param params - The parameters for syncing the latest global password.
522
+ * @param params.globalPassword - The latest global password.
523
+ * @returns A promise that resolves to the success of the operation.
524
+ */
525
+ async syncLatestGlobalPassword({ globalPassword, }) {
526
+ return await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_withControllerLock).call(this, async () => {
527
+ __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsUnlocked).call(this);
528
+ const doSyncPassword = async () => {
529
+ // update vault with latest globalPassword
530
+ const { encKey, pwEncKey, authKeyPair } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverEncKey).call(this, globalPassword);
531
+ // update and encrypt the vault with new password
532
+ await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_createNewVaultWithAuthData).call(this, {
533
+ password: globalPassword,
534
+ rawToprfEncryptionKey: encKey,
535
+ rawToprfPwEncryptionKey: pwEncKey,
536
+ rawToprfAuthKeyPair: authKeyPair,
537
+ });
538
+ __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_resetPasswordOutdatedCache).call(this);
539
+ };
540
+ return await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_executeWithTokenRefresh).call(this, doSyncPassword, 'syncLatestGlobalPassword');
541
+ });
542
+ }
524
543
  /**
525
544
  * @description Unlock the controller with the latest global password.
526
545
  *
@@ -529,24 +548,22 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
529
548
  * @param params.globalPassword - The latest global password.
530
549
  * @returns A promise that resolves to the success of the operation.
531
550
  */
532
- async submitGlobalPasswordAndSync({ globalPassword, maxKeyChainLength = 5, }) {
551
+ async submitGlobalPassword({ globalPassword, maxKeyChainLength = 5, }) {
533
552
  return await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_withControllerLock).call(this, async () => {
534
553
  return await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_executeWithTokenRefresh).call(this, async () => {
535
554
  const currentDeviceAuthPubKey = __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverAuthPubKey).call(this);
536
- await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_submitGlobalPasswordAndSync).call(this, {
555
+ await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_submitGlobalPassword).call(this, {
537
556
  targetAuthPubKey: currentDeviceAuthPubKey,
538
557
  globalPassword,
539
558
  maxKeyChainLength,
540
559
  });
541
- }, 'submitGlobalPasswordAndSync');
560
+ }, 'submitGlobalPassword');
542
561
  });
543
562
  }
544
563
  /**
545
564
  * @description Check if the current password is outdated compare to the global password.
546
565
  *
547
566
  * @param options - Optional options object.
548
- * @param options.globalAuthPubKey - The global auth public key to compare with the current auth public key.
549
- * If not provided, the global auth public key will be fetched from the backend.
550
567
  * @param options.skipCache - If true, bypass the cache and force a fresh check.
551
568
  * @param options.skipLock - Whether to skip the lock acquisition. (to prevent deadlock in case the caller already acquired the lock)
552
569
  * @returns A promise that resolves to true if the password is outdated, false otherwise.
@@ -561,28 +578,19 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
561
578
  const now = Date.now();
562
579
  const isCacheValid = passwordOutdatedCache &&
563
580
  now - passwordOutdatedCache.timestamp <
564
- __classPrivateFieldGet(this, _SeedlessOnboardingController_passwordOutdatedCacheTTL, "f");
581
+ constants_1.PASSWORD_OUTDATED_CACHE_TTL_MS;
565
582
  if (isCacheValid) {
566
583
  return passwordOutdatedCache.isExpiredPwd;
567
584
  }
568
585
  }
569
586
  const { nodeAuthTokens, authConnectionId, groupedAuthConnectionId, userId, } = this.state;
570
587
  const currentDeviceAuthPubKey = __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverAuthPubKey).call(this);
571
- let globalAuthPubKey = options?.globalAuthPubKey;
572
- if (!globalAuthPubKey) {
573
- const { authPubKey } = await this.toprfClient
574
- .fetchAuthPubKey({
575
- nodeAuthTokens,
576
- authConnectionId,
577
- groupedAuthConnectionId,
578
- userId,
579
- })
580
- .catch((error) => {
581
- log('Error fetching auth pub key', error);
582
- throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.FailedToFetchAuthPubKey);
583
- });
584
- globalAuthPubKey = authPubKey;
585
- }
588
+ const { authPubKey: globalAuthPubKey } = await this.toprfClient.fetchAuthPubKey({
589
+ nodeAuthTokens,
590
+ authConnectionId,
591
+ groupedAuthConnectionId,
592
+ userId,
593
+ });
586
594
  // use noble lib to deserialize and compare curve point
587
595
  const isExpiredPwd = !secp256k1_1.secp256k1.ProjectivePoint.fromHex(currentDeviceAuthPubKey).equals(secp256k1_1.secp256k1.ProjectivePoint.fromHex(globalAuthPubKey));
588
596
  // Cache the result in state
@@ -712,7 +720,7 @@ class SeedlessOnboardingController extends base_controller_1.BaseController {
712
720
  }
713
721
  }
714
722
  exports.SeedlessOnboardingController = SeedlessOnboardingController;
715
- _SeedlessOnboardingController_vaultEncryptor = new WeakMap(), _SeedlessOnboardingController_controllerOperationMutex = new WeakMap(), _SeedlessOnboardingController_vaultOperationMutex = new WeakMap(), _SeedlessOnboardingController_refreshJWTToken = new WeakMap(), _SeedlessOnboardingController_revokeRefreshToken = new WeakMap(), _SeedlessOnboardingController_isUnlocked = new WeakMap(), _SeedlessOnboardingController_passwordOutdatedCacheTTL = new WeakMap(), _SeedlessOnboardingController_instances = new WeakSet(), _SeedlessOnboardingController_submitGlobalPasswordAndSync =
723
+ _SeedlessOnboardingController_vaultEncryptor = new WeakMap(), _SeedlessOnboardingController_controllerOperationMutex = new WeakMap(), _SeedlessOnboardingController_vaultOperationMutex = new WeakMap(), _SeedlessOnboardingController_refreshJWTToken = new WeakMap(), _SeedlessOnboardingController_revokeRefreshToken = new WeakMap(), _SeedlessOnboardingController_isUnlocked = new WeakMap(), _SeedlessOnboardingController_instances = new WeakSet(), _SeedlessOnboardingController_submitGlobalPassword =
716
724
  /**
717
725
  * @description Submit the global password to the controller, verify the
718
726
  * password validity and unlock the controller.
@@ -725,39 +733,32 @@ _SeedlessOnboardingController_vaultEncryptor = new WeakMap(), _SeedlessOnboardin
725
733
  * @returns A promise that resolves to the keyring encryption key
726
734
  * corresponding to the current authPubKey in state.
727
735
  */
728
- async function _SeedlessOnboardingController_submitGlobalPasswordAndSync({ targetAuthPubKey, globalPassword, maxKeyChainLength, }) {
729
- const { pwEncKey: latestPwEncKey, authKeyPair: latestAuthKeyPair, encKey: latestEncKey, } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverEncKey).call(this, globalPassword);
736
+ async function _SeedlessOnboardingController_submitGlobalPassword({ targetAuthPubKey, globalPassword, maxKeyChainLength, }) {
737
+ const { pwEncKey: curPwEncKey, authKeyPair: curAuthKeyPair } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverEncKey).call(this, globalPassword);
730
738
  try {
731
- // Recover current device's vault encryption key with the latest global password
732
- const { pwEncKey: currentDevicePwEncKey } = await this.toprfClient.recoverPwEncKey({
739
+ // Recover vault encryption key.
740
+ const res = await this.toprfClient.recoverPwEncKey({
733
741
  targetAuthPubKey,
734
- curPwEncKey: latestPwEncKey,
735
- curAuthKeyPair: latestAuthKeyPair,
742
+ curPwEncKey,
743
+ curAuthKeyPair,
736
744
  maxPwChainLength: maxKeyChainLength,
737
745
  });
738
- // recover the vault encryption key and keyring encryption key with the current device's pwEncKey
739
- const [vaultKey, keyringEncryptionKey] = await Promise.all([
740
- __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_loadSeedlessEncryptionKey).call(this, currentDevicePwEncKey),
741
- __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_loadKeyringEncryptionKey).call(this, currentDevicePwEncKey),
742
- ]);
743
- // Unlock the controller and vault
744
- const { revokeToken } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_unlockVaultAndGetVaultData).call(this, undefined, vaultKey);
746
+ const { pwEncKey } = res;
747
+ const vaultKey = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_loadSeedlessEncryptionKey).call(this, pwEncKey);
748
+ // Unlock the controller
749
+ const { revokeToken, toprfEncryptionKey, toprfPwEncryptionKey, toprfAuthKeyPair, } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_unlockVaultAndGetVaultData).call(this, undefined, vaultKey);
745
750
  __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_setUnlocked).call(this);
746
751
  if (revokeToken) {
747
752
  // revoke and recyle refresh token after unlock to keep refresh token fresh, avoid malicious use of leaked refresh token
748
753
  await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_revokeRefreshTokenAndUpdateState).call(this, revokeToken);
754
+ // re-creating vault to persist the new revoke token
755
+ await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_createNewVaultWithAuthData).call(this, {
756
+ password: globalPassword,
757
+ rawToprfEncryptionKey: toprfEncryptionKey,
758
+ rawToprfPwEncryptionKey: toprfPwEncryptionKey,
759
+ rawToprfAuthKeyPair: toprfAuthKeyPair,
760
+ });
749
761
  }
750
- // re-creating vault to persist the new revoke token
751
- await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_createNewVaultWithAuthData).call(this, {
752
- password: globalPassword,
753
- rawToprfEncryptionKey: latestEncKey,
754
- rawToprfPwEncryptionKey: latestPwEncKey,
755
- rawToprfAuthKeyPair: latestAuthKeyPair,
756
- });
757
- // restore the current keyring encryption key with the new global password
758
- await this.storeKeyringEncryptionKey(keyringEncryptionKey);
759
- // reset the password outdated cache after successful global password submission and state sync
760
- __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_resetPasswordOutdatedCache).call(this);
761
762
  }
762
763
  catch (error) {
763
764
  if (__classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_isTokenExpiredError).call(this, error)) {
@@ -931,31 +932,12 @@ async function _SeedlessOnboardingController_recoverEncKey(password) {
931
932
  * @param params - The function parameters.
932
933
  * @param params.oldPassword - The old password to verify.
933
934
  * @param params.newPassword - The new password to update.
934
- * @param params.latestKeyIndex - The key index of the latest key.
935
935
  * @returns A promise that resolves to new encryption key and authentication key pair.
936
936
  */
937
- async function _SeedlessOnboardingController_changeEncryptionKey({ oldPassword, newPassword, latestKeyIndex, }) {
937
+ async function _SeedlessOnboardingController_changeEncryptionKey({ oldPassword, newPassword, }) {
938
938
  __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_assertIsAuthenticatedUser).call(this, this.state);
939
939
  const { authConnectionId, groupedAuthConnectionId, userId } = this.state;
940
- let encKey;
941
- let pwEncKey;
942
- let authKeyPair;
943
- let globalKeyIndex = latestKeyIndex;
944
- if (!globalKeyIndex) {
945
- ({
946
- encKey,
947
- pwEncKey,
948
- authKeyPair,
949
- keyShareIndex: globalKeyIndex,
950
- } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverEncKey).call(this, oldPassword));
951
- }
952
- else {
953
- ({
954
- toprfEncryptionKey: encKey,
955
- toprfPwEncryptionKey: pwEncKey,
956
- toprfAuthKeyPair: authKeyPair,
957
- } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_unlockVaultAndGetVaultData).call(this, oldPassword));
958
- }
940
+ const { encKey, pwEncKey, authKeyPair, keyShareIndex: newKeyShareIndex, } = await __classPrivateFieldGet(this, _SeedlessOnboardingController_instances, "m", _SeedlessOnboardingController_recoverEncKey).call(this, oldPassword);
959
941
  const result = await this.toprfClient.changeEncKey({
960
942
  nodeAuthTokens: this.state.nodeAuthTokens,
961
943
  authConnectionId,
@@ -964,7 +946,7 @@ async function _SeedlessOnboardingController_changeEncryptionKey({ oldPassword,
964
946
  oldEncKey: encKey,
965
947
  oldPwEncKey: pwEncKey,
966
948
  oldAuthKeyPair: authKeyPair,
967
- newKeyShareIndex: globalKeyIndex,
949
+ newKeyShareIndex,
968
950
  newPassword,
969
951
  });
970
952
  return result;
@@ -1306,33 +1288,13 @@ async function _SeedlessOnboardingController_withVaultLock(callback) {
1306
1288
  * @param options - The options for asserting the password is in sync.
1307
1289
  * @param options.skipCache - Whether to skip the cache check.
1308
1290
  * @param options.skipLock - Whether to skip the lock acquisition. (to prevent deadlock in case the caller already acquired the lock)
1309
- * @returns The global auth public key and the latest key index.
1310
1291
  * @throws If the password is outdated.
1311
1292
  */
1312
1293
  async function _SeedlessOnboardingController_assertPasswordInSync(options) {
1313
- const { nodeAuthTokens, authConnectionId, groupedAuthConnectionId, userId, } = this.state;
1314
- if (!nodeAuthTokens || !authConnectionId || !userId) {
1315
- throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.MissingAuthUserInfo);
1316
- }
1317
- const { authPubKey, keyIndex: latestKeyIndex } = await this.toprfClient
1318
- .fetchAuthPubKey({
1319
- nodeAuthTokens,
1320
- authConnectionId,
1321
- groupedAuthConnectionId,
1322
- userId,
1323
- })
1324
- .catch((error) => {
1325
- log('Error fetching auth pub key', error);
1326
- throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.FailedToFetchAuthPubKey);
1327
- });
1328
- const isPasswordOutdated = await this.checkIsPasswordOutdated({
1329
- ...options,
1330
- globalAuthPubKey: authPubKey,
1331
- });
1294
+ const isPasswordOutdated = await this.checkIsPasswordOutdated(options);
1332
1295
  if (isPasswordOutdated) {
1333
1296
  throw new Error(constants_1.SeedlessOnboardingControllerErrorMessage.OutdatedPassword);
1334
1297
  }
1335
- return { authPubKey, latestKeyIndex };
1336
1298
  }, _SeedlessOnboardingController_resetPasswordOutdatedCache = function _SeedlessOnboardingController_resetPasswordOutdatedCache() {
1337
1299
  this.update((state) => {
1338
1300
  delete state.passwordOutdatedCache;