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

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

@@ -20,34 +20,35 @@ require('../../../../utils/constants/values.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../config/ApiEndpoint.cjs');
-var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
-require('../../../../locale/locale.cjs');
-var user = require('../../../../data/api/user/user.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');
 require('viem');
 require('viem/chains');
+var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
+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) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const turnkeyRecoveryHandler = (_b = wallet.connector) === null || _b === void 0 ? void 0 : _b.getAuthenticatorHandler();
     if (authenticatorType === 'passkey' &&
         turnkeyRecoveryHandler.isSessionActive()) {
         return addNewPasskeyAuthenticator({
-            authToken,
             environmentId,
-            userEmail,
+            user,
             wallet,
         });
     }
@@ -59,7 +60,6 @@ const initEmbeddedWalletSession = (_a) => _tslib.__awaiter(void 0, [_a], void 0,
         authenticatorType,
         environmentId,
         publicKey,
-        userJwt: authToken,
         walletId: wallet.id,
     });
     turnkeyRecoveryHandler.recoveryUserId =
@@ -76,7 +76,7 @@ const passkeyRecoveryBundleValidation = (_c) => _tslib.__awaiter(void 0, [_c], v
     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('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const decodedJwt = decodeJwt.decodeJwt(authToken);
     if (!decodedJwt) {
@@ -100,7 +100,7 @@ const resentRecoveryEmail = (_h) => _tslib.__awaiter(void 0, [_h], void 0, funct
     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('PasskeyWalletConnector not found');
+        throw new utils.DynamicError('Connector is missing. Please make sure you added EthereumWalletConnectors and/or SolanaWalletConnectors to DynamicProvider settings');
     }
     const publicKey = (_j = wallet.connector) === null || _j === void 0 ? void 0 : _j.getAuthenticatorHandler().publicKey;
     if (!publicKey) {
@@ -110,116 +110,91 @@ const resentRecoveryEmail = (_h) => _tslib.__awaiter(void 0, [_h], void 0, funct
         authenticatorType,
         environmentId,
         publicKey,
-        userJwt: authToken,
         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('PasskeyWalletConnector not found');
-    }
-    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,
-        userJwt: authToken,
-        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');
+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 === 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('PasskeyWalletConnector not found');
+    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,
-        userJwt: authToken,
-        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) => {
@@ -240,22 +215,18 @@ 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) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        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;
     }
@@ -264,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');
     }
@@ -281,11 +252,11 @@ const addEmailRecovery = (_y) => _tslib.__awaiter(void 0, [_y], void 0, function
         !(wallet === null || wallet === void 0 ? void 0 : wallet.id) ||
         !walletConnectorCore.isPasskeyWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) ||
         !walletConnectorCore.isEmailWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-        throw new utils.DynamicError('PasskeyWalletConnector not found');
+        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({
@@ -296,10 +267,9 @@ const addEmailRecovery = (_y) => _tslib.__awaiter(void 0, [_y], void 0, function
     yield embeddedWallets.updatePasskeyRecoveryEmail({
         environmentId,
         updateRecoveryEmailRequest: { turnkeySignedRequest: signedRequest },
-        userJwt: authToken,
     });
     wallet.connector.setEmail(userEmail);
-    return user.refreshUserJwt({ environmentId }, authToken);
+    return user.refreshUserJwt({ environmentId });
 });
 
 exports.addEmailRecovery = 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;