@dynamic-labs/sdk-react-core 2.1.0-alpha.19 → 2.1.0-alpha.20

package/src/lib/views/Passkey/PasskeyRecovery/CompleteRecovery/PasskeyCompleteRecovery.cjs

@@ -46,9 +46,12 @@ require('@dynamic-labs/types');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
-require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../CollectUserDataView/useFields.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 var Typography = require('../../../../components/Typography/Typography.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
@@ -66,6 +69,7 @@ require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 var ErrorContainer = require('../../../../components/ErrorContainer/ErrorContainer.cjs');
 require('formik');
+require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 var TypographyButton = require('../../../../components/TypographyButton/TypographyButton.cjs');
 require('../../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../components/Alert/Alert.cjs');
@@ -95,7 +99,7 @@ const PasskeyCompleteRecovery = () => {
         const { passkeyRecoveryResponse } = yield passkeyRecovery.completePasskeyRecovery({
             authToken,
             environmentId,
-            userEmail: user === null || user === void 0 ? void 0 : user.email,
+            user,
             wallet,
         });
         dynamicEvents.dynamicEvents.emit('passkeyRecoveryCompleted', primaryWallet);

package/src/lib/views/Passkey/PasskeyRecovery/CompleteRecovery/PasskeyCompleteRecovery.js

@@ -42,9 +42,12 @@ import '@dynamic-labs/types';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
-import '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../CollectUserDataView/useFields.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../../../components/Typography/Typography.js';
 import '../../../../context/FooterAnimationContext/index.js';
@@ -62,6 +65,7 @@ import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import { ErrorContainer } from '../../../../components/ErrorContainer/ErrorContainer.js';
 import 'formik';
+import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import { TypographyButton } from '../../../../components/TypographyButton/TypographyButton.js';
 import '../../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../../components/Alert/Alert.js';
@@ -91,7 +95,7 @@ const PasskeyCompleteRecovery = () => {
         const { passkeyRecoveryResponse } = yield completePasskeyRecovery({
             authToken,
             environmentId,
-            userEmail: user === null || user === void 0 ? void 0 : user.email,
+            user,
             wallet,
         });
         dynamicEvents.emit('passkeyRecoveryCompleted', primaryWallet);

package/src/lib/views/Passkey/PasskeyRecovery/InitRecovery/PasskeyInitRecovery.cjs

@@ -46,9 +46,12 @@ require('@dynamic-labs/types');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
-require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../CollectUserDataView/useFields.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 var Typography = require('../../../../components/Typography/Typography.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
@@ -68,6 +71,7 @@ var IconButton = require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 var ErrorContainer = require('../../../../components/ErrorContainer/ErrorContainer.cjs');
 require('formik');
+require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 var TypographyButton = require('../../../../components/TypographyButton/TypographyButton.cjs');
 require('../../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var ModalHeader = require('../../../../components/ModalHeader/ModalHeader.cjs');

package/src/lib/views/Passkey/PasskeyRecovery/InitRecovery/PasskeyInitRecovery.js

@@ -42,9 +42,12 @@ import '@dynamic-labs/types';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
-import '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../CollectUserDataView/useFields.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../../../components/Typography/Typography.js';
 import '../../../../context/FooterAnimationContext/index.js';
@@ -64,6 +67,7 @@ import { IconButton } from '../../../../components/IconButton/IconButton.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import { ErrorContainer } from '../../../../components/ErrorContainer/ErrorContainer.js';
 import 'formik';
+import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import { TypographyButton } from '../../../../components/TypographyButton/TypographyButton.js';
 import '../../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { ModalHeader } from '../../../../components/ModalHeader/ModalHeader.js';

package/src/lib/views/Passkey/RenamePasskeyView/RenamePasskeyView.cjs

@@ -44,9 +44,12 @@ require('@dynamic-labs/types');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../CollectUserDataView/useFields.cjs');
 require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 var Typography = require('../../../components/Typography/Typography.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
@@ -62,6 +65,7 @@ require('react-focus-lock');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 var IconButton = require('../../../components/IconButton/IconButton.cjs');
 require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 var TypographyButton = require('../../../components/TypographyButton/TypographyButton.cjs');
 require('../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 var ModalHeader = require('../../../components/ModalHeader/ModalHeader.cjs');

package/src/lib/views/Passkey/RenamePasskeyView/RenamePasskeyView.js

@@ -40,9 +40,12 @@ import '@dynamic-labs/types';
 import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../CollectUserDataView/useFields.js';
 import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import { Typography } from '../../../components/Typography/Typography.js';
 import '../../../context/FooterAnimationContext/index.js';
@@ -58,6 +61,7 @@ import 'react-focus-lock';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import { IconButton } from '../../../components/IconButton/IconButton.js';
 import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import { TypographyButton } from '../../../components/TypographyButton/TypographyButton.js';
 import '../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import { ModalHeader } from '../../../components/ModalHeader/ModalHeader.js';

package/src/lib/views/Passkey/utils/createEmbeddedWalletRequest/createEmbeddedWalletRequest.cjs

@@ -6,7 +6,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
-var decodeJwt = require('../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -19,6 +18,7 @@ require('../../../../utils/constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../config/ApiEndpoint.cjs');
+var createUserProfile = require('../../../../utils/functions/createUserProfile/createUserProfile.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
@@ -53,18 +53,15 @@ const createEmbeddedWalletRequest = (_a) => _tslib.__awaiter(void 0, [_a], void
     }
     const signersResponse = yield embeddedWallets.createTurnkeyEmbeddedWallet(Object.assign({ chains,
         environmentId }, authenticatorBody));
-    const { jwt } = signersResponse;
-    const decodedJwt = decodeJwt.decodeJwt(jwt);
-    if (decodedJwt === undefined)
-        throw new utils.DynamicError('Invalid token!');
+    const { jwt, user: updatedSdkUser } = signersResponse;
+    const updatedUser = createUserProfile.createUserProfileFromSdkUser(updatedSdkUser);
     const primaryChain = walletConnector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, [primaryChain]);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(updatedUser, [primaryChain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
-    walletConnector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+    walletConnector.setVerifiedCredentials(updatedUser.verifiedCredentials);
     return {
-        decodedJwt,
         embeddedWalletVerifiedCredential,
         jwt,
         signersResponse,

package/src/lib/views/Passkey/utils/createEmbeddedWalletRequest/createEmbeddedWalletRequest.d.ts

@@ -11,7 +11,6 @@ type CreateEmbeddedWalletRequestProps = {
     withAuthenticator: boolean;
 };
 export declare const createEmbeddedWalletRequest: ({ user, walletConnector, environmentId, authToken, chains, webAuthnAttestation, withAuthenticator, }: CreateEmbeddedWalletRequestProps) => Promise<{
-    decodedJwt: Omit<import("@dynamic-labs/sdk-api-core").DynamicJwt, "jwt">;
     embeddedWalletVerifiedCredential: import("@dynamic-labs/sdk-api-core").JwtVerifiedCredential;
     jwt: string;
     signersResponse: import("@dynamic-labs/sdk-api-core").VerifyResponse;

package/src/lib/views/Passkey/utils/createEmbeddedWalletRequest/createEmbeddedWalletRequest.js

@@ -2,7 +2,6 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { DynamicError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
-import { decodeJwt } from '../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -15,6 +14,7 @@ import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import '../../../../shared/consts/index.js';
 import '../../../../config/ApiEndpoint.js';
+import { createUserProfileFromSdkUser } from '../../../../utils/functions/createUserProfile/createUserProfile.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
@@ -49,18 +49,15 @@ const createEmbeddedWalletRequest = (_a) => __awaiter(void 0, [_a], void 0, func
     }
     const signersResponse = yield createTurnkeyEmbeddedWallet(Object.assign({ chains,
         environmentId }, authenticatorBody));
-    const { jwt } = signersResponse;
-    const decodedJwt = decodeJwt(jwt);
-    if (decodedJwt === undefined)
-        throw new DynamicError('Invalid token!');
+    const { jwt, user: updatedSdkUser } = signersResponse;
+    const updatedUser = createUserProfileFromSdkUser(updatedSdkUser);
     const primaryChain = walletConnector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, [primaryChain]);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(updatedUser, [primaryChain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
-    walletConnector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+    walletConnector.setVerifiedCredentials(updatedUser.verifiedCredentials);
     return {
-        decodedJwt,
         embeddedWalletVerifiedCredential,
         jwt,
         signersResponse,

package/src/lib/views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs

@@ -20,7 +20,9 @@ require('../../../../utils/constants/values.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../config/ApiEndpoint.cjs');
+var createUserProfile = require('../../../../utils/functions/createUserProfile/createUserProfile.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../utils/functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
+var errors = require('../../../../utils/constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var removeElementById = require('../../../../utils/functions/removeElementById/removeElementById.cjs');
@@ -31,10 +33,10 @@ require('../../../../locale/locale.cjs');
 var user = require('../../../../data/api/user/user.cjs');
 var constants = require('../../PasskeyRecovery/constants.cjs');
 
-const initEmbeddedWalletSession = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authenticatorType, authToken, iframeContainer, iframeElementId, environmentId, userEmail, wallet, sessionExpiration, }) {
+const initEmbeddedWalletSession = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authenticatorType, iframeContainer, iframeElementId, environmentId, user, wallet, sessionExpiration, }) {
     var _b;
-    if (!authToken) {
-        throw new utils.DynamicError('Auth token is not defined');
+    if (!user) {
+        throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
     }
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
@@ -45,9 +47,8 @@ const initEmbeddedWalletSession = (_a) => _tslib.__awaiter(void 0, [_a], void 0,
     if (authenticatorType === 'passkey' &&
         turnkeyRecoveryHandler.isSessionActive()) {
         return addNewPasskeyAuthenticator({
-            authToken,
             environmentId,
-            userEmail,
+            user,
             wallet,
         });
     }
@@ -112,110 +113,88 @@ const resentRecoveryEmail = (_h) => _tslib.__awaiter(void 0, [_h], void 0, funct
         walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
     });
 });
-const completePasskeyRecovery = (_k) => _tslib.__awaiter(void 0, [_k], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
-    var _l, _m, _o;
-    if (!authToken) {
-        throw new utils.DynamicError('User must be logged in');
-    }
-    let decodedJwt = decodeJwt.decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new utils.DynamicError('User must be logged in with a valid token');
-    }
-    if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
-        !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
-        !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
-    }
-    const connector = wallet.connector;
-    connector.setEmail(userEmail);
-    const organizationId = (_o = (_m = (_l = decodedJwt.verifiedCredentials) === null || _l === void 0 ? void 0 : _l.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _m === void 0 ? void 0 : _m.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
-    if (!organizationId) {
-        throw new utils.DynamicError('Invalid token!');
-    }
-    const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
-    const { attestation, challenge } = yield connector.getWebAuthnAttestation();
-    // calls turnkey recovery api
-    yield turnkeyRecoveryHandler.completeRecovery({
-        attestation,
-        challenge,
-        organizationId,
-    });
-    // calls readcost recovery api
-    const passkeyRecoveryResponse = yield embeddedWallets.completePasskeyRecovery({
-        attestation: attestation,
-        challenge,
+const completePasskeyRecovery = (_k) => _tslib.__awaiter(void 0, [_k], void 0, function* ({ authToken, user, environmentId, wallet, }) {
+    const { passkeyRecoveryResponse, connector } = yield recoverTurnkeyWallet({
+        addPasskeyAuthenticator: false,
         environmentId,
-        walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
+        user,
+        wallet,
     });
-    const { jwt } = passkeyRecoveryResponse;
-    decodedJwt = decodeJwt.decodeJwt(jwt);
-    if (decodedJwt === undefined) {
-        throw new utils.DynamicError('Invalid token!');
-    }
-    const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, [chain]);
-    if (!embeddedWalletVerifiedCredential) {
-        throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
-    }
-    connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
     // clear iframeStamper and its reference
     connector.getAuthenticatorHandler().clear();
     // deletes iframe container after usage
     removeElementById.removeElementById(constants.iframeElementId);
     return {
-        decodedJwt,
         passkeyRecoveryResponse,
     };
 });
-const addNewPasskeyAuthenticator = (_p) => _tslib.__awaiter(void 0, [_p], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
-    var _q, _r, _s;
-    if (!authToken) {
-        throw new utils.DynamicError('User must be logged in');
-    }
-    let decodedJwt = decodeJwt.decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new utils.DynamicError('User must be logged in with a valid token');
-    }
-    if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
-        !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
-        !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
+const addNewPasskeyAuthenticator = (_l) => _tslib.__awaiter(void 0, [_l], void 0, function* ({ user, environmentId, wallet, }) {
+    const { passkeyRecoveryResponse, updatedUserProfile } = yield recoverTurnkeyWallet({
+        addPasskeyAuthenticator: true,
+        environmentId,
+        user,
+        wallet,
+    });
+    return {
+        passkeyRecoveryResponse,
+        user: updatedUserProfile,
+    };
+});
+const recoverTurnkeyWallet = (_m) => _tslib.__awaiter(void 0, [_m], void 0, function* ({ wallet, user, environmentId, addPasskeyAuthenticator, }) {
+    var _o, _p, _q;
+    if (!user) {
+        throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+    }
+    if (!wallet ||
+        !wallet.connector ||
+        !wallet.id ||
+        !walletConnectorCore.isPasskeyWalletConnector(wallet.connector)) {
         throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const connector = wallet.connector;
-    connector.setEmail(userEmail);
-    const organizationId = (_s = (_r = (_q = decodedJwt.verifiedCredentials) === null || _q === void 0 ? void 0 : _q.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _r === void 0 ? void 0 : _r.walletProperties) === null || _s === void 0 ? void 0 : _s.turnkeySubOrganizationId;
-    if (!organizationId) {
-        throw new utils.DynamicError('Invalid token!');
+    connector.setEmail(user.email);
+    const turnkeySubOrganizationId = (_q = (_p = (_o = user.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
+    if (!turnkeySubOrganizationId) {
+        throw new utils.DynamicError('The authentication token is invalid - turnkeySubOrganizationId is missing');
     }
     const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
     const { attestation, challenge } = yield connector.getWebAuthnAttestation();
-    // calls turnkey create authenticator api
-    yield turnkeyRecoveryHandler.addPasskeyAuthenticator({
-        attestation,
-        challenge,
-        organizationId,
-    });
-    // calls readcost api to add new authenticator
+    if (addPasskeyAuthenticator) {
+        yield turnkeyRecoveryHandler.addPasskeyAuthenticator({
+            attestation,
+            challenge,
+            turnkeySubOrganizationId,
+        });
+    }
+    else {
+        yield turnkeyRecoveryHandler.completeRecovery({
+            attestation,
+            challenge,
+            turnkeySubOrganizationId,
+        });
+    }
+    // calls readcost recovery api
     const passkeyRecoveryResponse = yield embeddedWallets.completePasskeyRecovery({
         attestation: attestation,
         challenge,
         environmentId,
-        walletId: wallet === null || wallet === void 0 ? void 0 : wallet.id,
+        walletId: wallet.id,
     });
-    const { jwt } = passkeyRecoveryResponse;
-    decodedJwt = decodeJwt.decodeJwt(jwt);
-    if (decodedJwt === undefined) {
-        throw new utils.DynamicError('Invalid token!');
+    const { user: updatedUser } = passkeyRecoveryResponse;
+    if (!updatedUser) {
+        throw new utils.DynamicError('No user returned from passkey recovery');
     }
+    const updatedUserProfile = createUserProfile.createUserProfileFromSdkUser(updatedUser);
     const chain = connector.connectedChain;
-    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, [chain]);
+    const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(updatedUserProfile, [chain]);
     if (!embeddedWalletVerifiedCredential) {
         throw new utils.DynamicError('EmbeddedWalletVerifiedCredential not found');
     }
-    connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+    connector.setVerifiedCredentials(updatedUserProfile.verifiedCredentials);
     return {
-        decodedJwt,
+        connector,
         passkeyRecoveryResponse,
+        updatedUserProfile,
     };
 });
 const canRestoreEmbeddedWalletSession = (sessionExpirationTime) => {
@@ -236,14 +215,10 @@ const canRestoreEmbeddedWalletSession = (sessionExpirationTime) => {
     }
     return true;
 };
-const restoreEmbeddedWalletSession = (_t) => _tslib.__awaiter(void 0, [_t], void 0, function* ({ authToken, iframeContainer, iframeElementId, wallet, sessionExpiration, }) {
-    var _u, _v, _w, _x;
-    if (!authToken) {
-        throw new utils.DynamicError('Auth token is not defined');
-    }
-    const decodedJwt = decodeJwt.decodeJwt(authToken);
-    if (!decodedJwt) {
-        throw new utils.DynamicError('User must be logged in with a valid token');
+const restoreEmbeddedWalletSession = (_r) => _tslib.__awaiter(void 0, [_r], void 0, function* ({ user, iframeContainer, iframeElementId, wallet, sessionExpiration, }) {
+    var _s, _t, _u, _v;
+    if (!user) {
+        throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
     }
     if (!(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
@@ -251,7 +226,7 @@ const restoreEmbeddedWalletSession = (_t) => _tslib.__awaiter(void 0, [_t], void
         throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const sessionSettings = localStorage.LocalStorage.getFromLS(localStorage$1.EMBEDDED_WALLET_SESSION_SETTINGS);
-    const turnkeyRecoveryHandler = (_u = wallet.connector) === null || _u === void 0 ? void 0 : _u.getAuthenticatorHandler();
+    const turnkeyRecoveryHandler = (_s = wallet.connector) === null || _s === void 0 ? void 0 : _s.getAuthenticatorHandler();
     if (!sessionSettings || Boolean(turnkeyRecoveryHandler.recoveryUserId)) {
         return false;
     }
@@ -260,12 +235,12 @@ const restoreEmbeddedWalletSession = (_t) => _tslib.__awaiter(void 0, [_t], void
         throw new utils.DynamicError('Could not open embedded wallet connection communication');
     }
     turnkeyRecoveryHandler.recoveryUserId = sessionSettings.userId;
-    const organizationId = (_x = (_w = (_v = decodedJwt.verifiedCredentials) === null || _v === void 0 ? void 0 : _v.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _w === void 0 ? void 0 : _w.walletProperties) === null || _x === void 0 ? void 0 : _x.turnkeySubOrganizationId;
+    const organizationId = (_v = (_u = (_t = user.verifiedCredentials) === null || _t === void 0 ? void 0 : _t.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _u === void 0 ? void 0 : _u.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeySubOrganizationId;
     yield turnkeyRecoveryHandler.verifyRecoveryCode(sessionSettings.emailCode, organizationId);
     return true;
 });
-const addEmailRecovery = (_y) => _tslib.__awaiter(void 0, [_y], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
-    var _z, _0;
+const addEmailRecovery = (_w) => _tslib.__awaiter(void 0, [_w], void 0, function* ({ authToken, userEmail, environmentId, wallet, }) {
+    var _x, _y;
     if (!authToken) {
         throw new utils.DynamicError('User must be logged in');
     }
@@ -279,9 +254,9 @@ const addEmailRecovery = (_y) => _tslib.__awaiter(void 0, [_y], void 0, function
         !walletConnectorCore.isEmailWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
         throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
-    const { turnkeySubOrganizationId, turnkeyUserId } = (_0 = (_z = decodedJwt.verifiedCredentials) === null || _z === void 0 ? void 0 : _z.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _0 === void 0 ? void 0 : _0.walletProperties;
+    const { turnkeySubOrganizationId, turnkeyUserId } = (_y = (_x = decodedJwt.verifiedCredentials) === null || _x === void 0 ? void 0 : _x.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _y === void 0 ? void 0 : _y.walletProperties;
     if (!turnkeySubOrganizationId || !turnkeyUserId) {
-        throw new utils.DynamicError('Invalid token!');
+        throw new utils.DynamicError('The authentication token is invalid - turnkeySubOrganizationId or turnkeyUserID is missing');
     }
     const turnkeyRecoveryHandler = wallet.connector.getAuthenticatorHandler();
     const { signedRequest } = (yield turnkeyRecoveryHandler.addEmailRecovery({

package/src/lib/views/Passkey/utils/passkeyRecovery/passkeyRecovery.d.ts

@@ -1,17 +1,17 @@
 import { AuthenticatorType } from '@dynamic-labs/wallet-connector-core';
-import { Duration, DynamicJwt, InitEmailAuthResponse, InitPasskeyRecoveryResponse, VerifyResponse } from '@dynamic-labs/sdk-api-core';
+import { Duration, InitEmailAuthResponse, InitPasskeyRecoveryResponse, VerifyResponse } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '../../../../shared';
-export declare const initEmbeddedWalletSession: ({ authenticatorType, authToken, iframeContainer, iframeElementId, environmentId, userEmail, wallet, sessionExpiration, }: {
+import { UserProfile } from '../../../../..';
+export declare const initEmbeddedWalletSession: ({ authenticatorType, iframeContainer, iframeElementId, environmentId, user, wallet, sessionExpiration, }: {
     authenticatorType: AuthenticatorType;
-    authToken: string | undefined;
     iframeContainer: HTMLElement;
     iframeElementId: string;
     environmentId: string;
-    userEmail: string;
+    user: UserProfile | undefined;
     wallet: Wallet | null;
     sessionExpiration?: number;
 }) => Promise<{
-    decodedJwt: Omit<DynamicJwt, 'jwt'>;
+    user: UserProfile;
     passkeyRecoveryResponse: VerifyResponse;
 } | undefined>;
 export declare const passkeyRecoveryBundleValidation: ({ authToken, bundleInput, wallet, }: {
@@ -25,27 +25,25 @@ export declare const resentRecoveryEmail: ({ authenticatorType, authToken, envir
     environmentId: string;
     wallet: Wallet | null;
 }) => Promise<InitPasskeyRecoveryResponse | InitEmailAuthResponse>;
-export declare const completePasskeyRecovery: ({ authToken, userEmail, environmentId, wallet, }: {
+export declare const completePasskeyRecovery: ({ authToken, user, environmentId, wallet, }: {
     authToken: string | undefined;
-    userEmail: string | undefined;
     environmentId: string;
     wallet: Wallet | null;
+    user: UserProfile | undefined;
 }) => Promise<{
-    decodedJwt: Omit<DynamicJwt, "jwt">;
     passkeyRecoveryResponse: VerifyResponse;
 }>;
-export declare const addNewPasskeyAuthenticator: ({ authToken, userEmail, environmentId, wallet, }: {
-    authToken: string | undefined;
-    userEmail: string | undefined;
+export declare const addNewPasskeyAuthenticator: ({ user, environmentId, wallet, }: {
+    user: UserProfile | undefined;
     environmentId: string;
     wallet: Wallet | null;
 }) => Promise<{
-    decodedJwt: Omit<DynamicJwt, "jwt">;
+    user: UserProfile;
     passkeyRecoveryResponse: VerifyResponse;
 }>;
 export declare const canRestoreEmbeddedWalletSession: (sessionExpirationTime: Duration | undefined) => boolean;
-export declare const restoreEmbeddedWalletSession: ({ authToken, iframeContainer, iframeElementId, wallet, sessionExpiration, }: {
-    authToken: string | undefined;
+export declare const restoreEmbeddedWalletSession: ({ user, iframeContainer, iframeElementId, wallet, sessionExpiration, }: {
+    user: UserProfile | undefined;
     iframeContainer: HTMLElement;
     iframeElementId: string;
     wallet: Wallet | null;