@dynamic-labs/sdk-react-core 2.1.0-alpha.3 → 2.1.0-alpha.31

package/src/lib/data/api/embeddedWallets/embeddedWallets.js

@@ -14,8 +14,9 @@ import '../../../utils/constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
+import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 
-const createTurnkeyEmbeddedWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ attestation, challenge, environmentId, userJwt, chains = [ChainEnum.Evm], passkeyAlias, }) {
+const createTurnkeyEmbeddedWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ attestation, challenge, environmentId, chains = [ChainEnum.Evm], passkeyAlias, }) {
     const embeddedWallets = [
         {
             chains,
@@ -30,16 +31,24 @@ const createTurnkeyEmbeddedWallet = (_a) => __awaiter(void 0, [_a], void 0, func
                 challenge,
             }, isAuthenticatorAttached: true });
     }
-    return sdkApi(userJwt).createEmbeddedWallets({
-        createEmbeddedWalletsRequest: {
-            embeddedWallets,
-        },
-        environmentId,
-    });
+    try {
+        const response = yield sdkApi().createEmbeddedWallets({
+            createEmbeddedWalletsRequest: {
+                embeddedWallets,
+            },
+            environmentId,
+        });
+        const user = storeAuthTokenAndUser(response);
+        return user;
+    }
+    catch (e) {
+        logger.error('Error creating embedded wallet: ', e);
+        return undefined;
+    }
 });
-const initEmbeddedWalletSession = (_b) => __awaiter(void 0, [_b], void 0, function* ({ authenticatorType, walletId, publicKey, environmentId, userJwt, }) {
+const initEmbeddedWalletSession = (_b) => __awaiter(void 0, [_b], void 0, function* ({ authenticatorType, walletId, publicKey, environmentId, }) {
     if (authenticatorType === 'passkey') {
-        return sdkApi(userJwt).initPasskeyRecovery({
+        return sdkApi().initPasskeyRecovery({
             environmentId,
             initPasskeyRecoveryRequest: {
                 turnkeyRecoveryTargetPublicKey: publicKey,
@@ -47,7 +56,7 @@ const initEmbeddedWalletSession = (_b) => __awaiter(void 0, [_b], void 0, functi
             },
         });
     }
-    return sdkApi(userJwt).initEmailAuth({
+    return sdkApi().initEmailAuth({
         environmentId,
         initEmailAuthRequest: {
             turnkeyEmailAuthTargetPublicKey: publicKey,
@@ -55,19 +64,26 @@ const initEmbeddedWalletSession = (_b) => __awaiter(void 0, [_b], void 0, functi
         },
     });
 });
-const completePasskeyRecovery = (_c) => __awaiter(void 0, [_c], void 0, function* ({ walletId, attestation, challenge, environmentId, userJwt, }) {
-    return sdkApi(userJwt).completePasskeyRecovery({
-        completePasskeyRecoveryRequest: {
-            attestation,
-            challenge,
-            walletId,
-        },
-        environmentId,
-    });
+const completePasskeyRecovery = (_c) => __awaiter(void 0, [_c], void 0, function* ({ walletId, attestation, challenge, environmentId, }) {
+    try {
+        const response = yield sdkApi().completePasskeyRecovery({
+            completePasskeyRecoveryRequest: {
+                attestation,
+                challenge,
+                walletId,
+            },
+            environmentId,
+        });
+        return storeAuthTokenAndUser(response);
+    }
+    catch (e) {
+        logger.error('Error completing passkey recovery: ', e);
+        return undefined;
+    }
 });
-const updatePasskeyRecoveryEmail = (_d) => __awaiter(void 0, [_d], void 0, function* ({ userJwt, environmentId, updateRecoveryEmailRequest, }) {
+const updatePasskeyRecoveryEmail = (_d) => __awaiter(void 0, [_d], void 0, function* ({ environmentId, updateRecoveryEmailRequest, }) {
     try {
-        yield sdkApi(userJwt).updateEmbeddedWalletRecoveryEmail({
+        yield sdkApi().updateEmbeddedWalletRecoveryEmail({
             environmentId,
             updateRecoveryEmailRequest,
         });
@@ -77,9 +93,9 @@ const updatePasskeyRecoveryEmail = (_d) => __awaiter(void 0, [_d], void 0, funct
         throw new DynamicError('Error updating recovery email');
     }
 });
-const getUserPasskeys = (_e) => __awaiter(void 0, [_e], void 0, function* ({ userJwt, environmentId, }) {
+const getUserPasskeys = (_e) => __awaiter(void 0, [_e], void 0, function* ({ environmentId, }) {
     try {
-        const data = yield sdkApi(userJwt).getUserPasskeys({
+        const data = yield sdkApi().getUserPasskeys({
             environmentId,
         });
         return data;
@@ -92,9 +108,9 @@ const getUserPasskeys = (_e) => __awaiter(void 0, [_e], void 0, function* ({ use
         };
     }
 });
-const updateUserPasskey = (_f) => __awaiter(void 0, [_f], void 0, function* ({ userJwt, environmentId, id, alias, }) {
+const updateUserPasskey = (_f) => __awaiter(void 0, [_f], void 0, function* ({ environmentId, id, alias, }) {
     try {
-        const data = yield sdkApi(userJwt).updatePasskey({
+        const data = yield sdkApi().updatePasskey({
             environmentId,
             updateUserPasskeyRequest: { alias, id },
         });
@@ -105,9 +121,9 @@ const updateUserPasskey = (_f) => __awaiter(void 0, [_f], void 0, function* ({ u
         return undefined;
     }
 });
-const exportEmbeddedWallet = (_g) => __awaiter(void 0, [_g], void 0, function* ({ userJwt, environmentId, walletId, activityId, }) {
+const exportEmbeddedWallet = (_g) => __awaiter(void 0, [_g], void 0, function* ({ environmentId, walletId, activityId, }) {
     try {
-        const data = yield sdkApi(userJwt).embeddedWalletExport({
+        const data = yield sdkApi().embeddedWalletExport({
             activityId,
             environmentId,
             walletId,
@@ -119,9 +135,9 @@ const exportEmbeddedWallet = (_g) => __awaiter(void 0, [_g], void 0, function* (
         return { exportBundle: '' };
     }
 });
-const getWalletAuthToken = (_h, userJwt_1) => __awaiter(void 0, [_h, userJwt_1], void 0, function* ({ environmentId, type, }, userJwt) {
+const getWalletAuthToken = (_h) => __awaiter(void 0, [_h], void 0, function* ({ environmentId, type, }) {
     try {
-        const authToken = yield sdkApi(userJwt).getAuthToken({
+        const authToken = yield sdkApi().getAuthToken({
             environmentId,
             type,
         });
@@ -131,9 +147,9 @@ const getWalletAuthToken = (_h, userJwt_1) => __awaiter(void 0, [_h, userJwt_1],
         return undefined;
     }
 });
-const getEmbeddedWalletBackup = (_j, userJwt_2) => __awaiter(void 0, [_j, userJwt_2], void 0, function* ({ environmentId, }, userJwt) {
+const getEmbeddedWalletBackup = (_j) => __awaiter(void 0, [_j], void 0, function* ({ environmentId, }) {
     try {
-        const response = yield sdkApi(userJwt).getEmbeddedWalletBackups({
+        const response = yield sdkApi().getEmbeddedWalletBackups({
             environmentId,
         });
         return response.secret;
@@ -142,9 +158,9 @@ const getEmbeddedWalletBackup = (_j, userJwt_2) => __awaiter(void 0, [_j, userJw
         return undefined;
     }
 });
-const getEmbeddedWalletPasscode = (_k, userJwt_3) => __awaiter(void 0, [_k, userJwt_3], void 0, function* ({ environmentId, }, userJwt) {
+const getEmbeddedWalletPasscode = (_k) => __awaiter(void 0, [_k], void 0, function* ({ environmentId, }) {
     try {
-        const response = yield sdkApi(userJwt).getEmbeddedWalletPasscode({
+        const response = yield sdkApi().getEmbeddedWalletPasscode({
             environmentId,
         });
         return response.secret;
@@ -153,15 +169,16 @@ const getEmbeddedWalletPasscode = (_k, userJwt_3) => __awaiter(void 0, [_k, user
         return undefined;
     }
 });
-const claimEmbeddedWallet = (_l, userJwt_4) => __awaiter(void 0, [_l, userJwt_4], void 0, function* ({ environmentId, walletId, }, userJwt) {
+const claimEmbeddedWallet = (_l) => __awaiter(void 0, [_l], void 0, function* ({ environmentId, walletId, }) {
     var _m, _o;
     try {
-        const response = yield sdkApi(userJwt).claimEmbeddedWallet({
+        const response = yield sdkApi().claimEmbeddedWallet({
             embeddedWalletPasscodeClaimRequest: {
                 walletId,
             },
             environmentId,
         });
+        storeAuthTokenAndUser(response);
         return response;
     }
     catch (e) {

package/src/lib/data/api/embeddedWallets/types.d.ts

@@ -1,7 +1,6 @@
 import { ChainEnum, PasskeyRegistrationCredential, UpdateRecoveryEmailRequest } from '@dynamic-labs/sdk-api-core';
 import { AuthenticatorType } from '@dynamic-labs/wallet-connector-core';
 export type CreateTurnkeyEmbeddedWalletProps = {
-    userJwt: string;
     environmentId: string;
     attestation?: PasskeyRegistrationCredential;
     challenge?: string;
@@ -10,29 +9,24 @@ export type CreateTurnkeyEmbeddedWalletProps = {
 };
 export type InitPasskeyRecoveryProps = {
     authenticatorType: AuthenticatorType;
-    userJwt: string;
     environmentId: string;
     walletId: string;
     publicKey: string;
 };
 export type CompletePasskeyRecoveryProps = {
-    userJwt: string;
     environmentId: string;
     walletId: string;
     attestation: PasskeyRegistrationCredential;
     challenge: string;
 };
 export type UpdatePasskeyRecoveryEmailProps = {
-    userJwt: string;
     environmentId: string;
     updateRecoveryEmailRequest: UpdateRecoveryEmailRequest;
 };
 export type GetUserPasskeysProps = {
-    userJwt: string;
     environmentId: string;
 };
 export type UpdateUserPasskeysProps = {
-    userJwt: string;
     environmentId: string;
     id: string;
     alias: string;

package/src/lib/data/api/mfa/mfa.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var utils = require('@dynamic-labs/utils');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -15,13 +16,12 @@ require('@dynamic-labs/wallet-book');
 require('../../../utils/constants/colors.cjs');
 require('../../../utils/constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var api = require('../api.cjs');
 
-const getUserMfaDevices = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, userJwt, }) {
+const getUserMfaDevices = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, }) {
     try {
-        const { devices } = yield api.sdkApi(userJwt).getUserMfaDevices({
+        const { devices } = yield api.sdkApi().getUserMfaDevices({
             environmentId,
         });
         return devices;
@@ -32,10 +32,10 @@ const getUserMfaDevices = (_a) => _tslib.__awaiter(void 0, [_a], void 0, functio
         return [];
     }
 });
-const addMfaDevice = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ environmentId, userJwt, type, }) {
+const addMfaDevice = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ environmentId, type, }) {
     try {
         if (type === sdkApiCore.MFADeviceType.Totp) {
-            const response = yield api.sdkApi(userJwt).registerTotpMfaDevice({
+            const response = yield api.sdkApi().registerTotpMfaDevice({
                 environmentId,
             });
             return response;
@@ -48,9 +48,9 @@ const addMfaDevice = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({
         throw new Error(message);
     }
 });
-const updateUserMfaDevice = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ environmentId, userJwt, mfaDeviceId, }) {
+const updateUserMfaDevice = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ environmentId, mfaDeviceId, }) {
     try {
-        yield api.sdkApi(userJwt).updateUserMfaDevice({
+        yield api.sdkApi().updateUserMfaDevice({
             environmentId,
             mfaDeviceId,
         });
@@ -60,9 +60,9 @@ const updateUserMfaDevice = (_c) => _tslib.__awaiter(void 0, [_c], void 0, funct
         logger.logger.error(data.error);
     }
 });
-const deleteMfaDevice = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ environmentId, userJwt, mfaDeviceId, }) {
+const deleteMfaDevice = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ environmentId, mfaDeviceId, }) {
     try {
-        yield api.sdkApi(userJwt).deleteMfaDevice({
+        yield api.sdkApi().deleteMfaDevice({
             environmentId,
             mfaDeviceId,
         });
@@ -74,14 +74,14 @@ const deleteMfaDevice = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function*
 });
 // used when verifying a device added after the user is already logged in
 // no jwt update needed
-const verifyMfaDevice = (_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ environmentId, userJwt, type, code, }) {
+const verifyMfaDevice = (_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ environmentId, type, code, }) {
     try {
         if (type === sdkApiCore.MFADeviceType.Totp) {
             const request = {
                 code,
                 type,
             };
-            const device = yield api.sdkApi(userJwt).registerTotpMfaDeviceVerify({
+            const device = yield api.sdkApi().registerTotpMfaDeviceVerify({
                 environmentId,
                 mFARegisterTotpDevicePostRequest: request,
             });
@@ -97,13 +97,14 @@ const verifyMfaDevice = (_e) => _tslib.__awaiter(void 0, [_e], void 0, function*
 });
 // used when verifying a device when user is logging in
 // jwt update needed
-const authMfaDevice = (_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ environmentId, userJwt, type, code, }) {
+const authMfaDevice = (_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ environmentId, type, code, createMfaToken, }) {
     try {
         if (type === sdkApiCore.MFADeviceType.Totp) {
             const request = {
                 code,
+                createMfaToken,
             };
-            const response = yield api.sdkApi(userJwt).authMfaTotpDevice({
+            const response = yield api.sdkApi().authMfaTotpDevice({
                 environmentId,
                 mFAAuthTotpDevicePostRequest: request,
             });
@@ -111,15 +112,20 @@ const authMfaDevice = (_f) => _tslib.__awaiter(void 0, [_f], void 0, function* (
         }
         throw new Error('Unsupported MFA device type');
     }
-    catch (e) {
-        const message = e instanceof Error ? e.message : (yield e.json()).error;
-        logger.logger.error(message);
-        return undefined;
+    catch (error) {
+        logger.logger.error(error);
+        if (error instanceof Response) {
+            const responseError = yield error.json();
+            if (responseError.code === 'mfa_invalid_code') {
+                throw new utils.MfaInvalidOtpError();
+            }
+        }
+        throw error;
     }
 });
-const getRecoveryCodes = (_g) => _tslib.__awaiter(void 0, [_g], void 0, function* ({ environmentId, userJwt, }) {
+const getRecoveryCodes = (_g) => _tslib.__awaiter(void 0, [_g], void 0, function* ({ environmentId, }) {
     try {
-        const { recoveryCodes } = yield api.sdkApi(userJwt).getRecoveryCodes({
+        const { recoveryCodes } = yield api.sdkApi().getRecoveryCodes({
             environmentId,
         });
         return recoveryCodes;
@@ -130,9 +136,9 @@ const getRecoveryCodes = (_g) => _tslib.__awaiter(void 0, [_g], void 0, function
         return [];
     }
 });
-const createNewRecoveryCodes = (_h) => _tslib.__awaiter(void 0, [_h], void 0, function* ({ environmentId, userJwt, }) {
+const createNewRecoveryCodes = (_h) => _tslib.__awaiter(void 0, [_h], void 0, function* ({ environmentId, }) {
     try {
-        const { recoveryCodes } = yield api.sdkApi(userJwt).createNewRecoveryCodes({
+        const { recoveryCodes } = yield api.sdkApi().createNewRecoveryCodes({
             environmentId,
         });
         return recoveryCodes;
@@ -145,12 +151,12 @@ const createNewRecoveryCodes = (_h) => _tslib.__awaiter(void 0, [_h], void 0, fu
 });
 // used when verifying a device when user is logging in with recovery code
 // jwt update needed
-const authMfaRecovery = (_j) => _tslib.__awaiter(void 0, [_j], void 0, function* ({ environmentId, userJwt, code, }) {
+const authMfaRecovery = (_j) => _tslib.__awaiter(void 0, [_j], void 0, function* ({ environmentId, code, }) {
     try {
         const request = {
             code,
         };
-        const response = yield api.sdkApi(userJwt).authMfaRecovery({
+        const response = yield api.sdkApi().authMfaRecovery({
             environmentId,
             mFAAuthRecoveryDevicePostRequest: request,
         });

package/src/lib/data/api/mfa/mfa.d.ts

@@ -1,45 +1,37 @@
-import { MFAAuthResponse, MFADevice, MFADeviceType } from '@dynamic-labs/sdk-api-core';
-export declare const getUserMfaDevices: ({ environmentId, userJwt, }: {
+import { CreateMfaToken, MFADevice, MFADeviceType, VerifyResponse } from '@dynamic-labs/sdk-api-core';
+export declare const getUserMfaDevices: ({ environmentId, }: {
     environmentId: string;
-    userJwt: string;
 }) => Promise<MFADevice[]>;
-export declare const addMfaDevice: ({ environmentId, userJwt, type, }: {
+export declare const addMfaDevice: ({ environmentId, type, }: {
     environmentId: string;
-    userJwt: string;
     type: MFADeviceType;
 }) => Promise<import("@dynamic-labs/sdk-api-core").MFARegisterTotpDeviceGetResponse>;
-export declare const updateUserMfaDevice: ({ environmentId, userJwt, mfaDeviceId, }: {
+export declare const updateUserMfaDevice: ({ environmentId, mfaDeviceId, }: {
     environmentId: string;
-    userJwt: string;
     mfaDeviceId: string;
 }) => Promise<void>;
-export declare const deleteMfaDevice: ({ environmentId, userJwt, mfaDeviceId, }: {
+export declare const deleteMfaDevice: ({ environmentId, mfaDeviceId, }: {
     environmentId: string;
-    userJwt: string;
     mfaDeviceId: string;
 }) => Promise<void>;
-export declare const verifyMfaDevice: ({ environmentId, userJwt, type, code, }: {
+export declare const verifyMfaDevice: ({ environmentId, type, code, }: {
     environmentId: string;
-    userJwt: string;
     type: MFADeviceType;
     code: string;
 }) => Promise<MFADevice | undefined>;
-export declare const authMfaDevice: ({ environmentId, userJwt, type, code, }: {
+export declare const authMfaDevice: ({ environmentId, type, code, createMfaToken, }: {
     environmentId: string;
-    userJwt: string;
     type: MFADeviceType;
     code: string;
-}) => Promise<MFAAuthResponse | undefined>;
-export declare const getRecoveryCodes: ({ environmentId, userJwt, }: {
+    createMfaToken?: CreateMfaToken;
+}) => Promise<VerifyResponse>;
+export declare const getRecoveryCodes: ({ environmentId, }: {
     environmentId: string;
-    userJwt: string;
 }) => Promise<string[]>;
-export declare const createNewRecoveryCodes: ({ environmentId, userJwt, }: {
+export declare const createNewRecoveryCodes: ({ environmentId, }: {
     environmentId: string;
-    userJwt: string;
 }) => Promise<string[]>;
-export declare const authMfaRecovery: ({ environmentId, userJwt, code, }: {
+export declare const authMfaRecovery: ({ environmentId, code, }: {
     environmentId: string;
-    userJwt: string;
     code: string;
-}) => Promise<MFAAuthResponse | undefined>;
+}) => Promise<VerifyResponse | undefined>;

package/src/lib/data/api/mfa/mfa.js

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { MFADeviceType } from '@dynamic-labs/sdk-api-core';
+import { MfaInvalidOtpError } from '@dynamic-labs/utils';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -11,13 +12,12 @@ import '@dynamic-labs/wallet-book';
 import '../../../utils/constants/colors.js';
 import '../../../utils/constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
-import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { sdkApi } from '../api.js';
 
-const getUserMfaDevices = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, userJwt, }) {
+const getUserMfaDevices = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, }) {
     try {
-        const { devices } = yield sdkApi(userJwt).getUserMfaDevices({
+        const { devices } = yield sdkApi().getUserMfaDevices({
             environmentId,
         });
         return devices;
@@ -28,10 +28,10 @@ const getUserMfaDevices = (_a) => __awaiter(void 0, [_a], void 0, function* ({ e
         return [];
     }
 });
-const addMfaDevice = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environmentId, userJwt, type, }) {
+const addMfaDevice = (_b) => __awaiter(void 0, [_b], void 0, function* ({ environmentId, type, }) {
     try {
         if (type === MFADeviceType.Totp) {
-            const response = yield sdkApi(userJwt).registerTotpMfaDevice({
+            const response = yield sdkApi().registerTotpMfaDevice({
                 environmentId,
             });
             return response;
@@ -44,9 +44,9 @@ const addMfaDevice = (_b) => __awaiter(void 0, [_b], void 0, function* ({ enviro
         throw new Error(message);
     }
 });
-const updateUserMfaDevice = (_c) => __awaiter(void 0, [_c], void 0, function* ({ environmentId, userJwt, mfaDeviceId, }) {
+const updateUserMfaDevice = (_c) => __awaiter(void 0, [_c], void 0, function* ({ environmentId, mfaDeviceId, }) {
     try {
-        yield sdkApi(userJwt).updateUserMfaDevice({
+        yield sdkApi().updateUserMfaDevice({
             environmentId,
             mfaDeviceId,
         });
@@ -56,9 +56,9 @@ const updateUserMfaDevice = (_c) => __awaiter(void 0, [_c], void 0, function* ({
         logger.error(data.error);
     }
 });
-const deleteMfaDevice = (_d) => __awaiter(void 0, [_d], void 0, function* ({ environmentId, userJwt, mfaDeviceId, }) {
+const deleteMfaDevice = (_d) => __awaiter(void 0, [_d], void 0, function* ({ environmentId, mfaDeviceId, }) {
     try {
-        yield sdkApi(userJwt).deleteMfaDevice({
+        yield sdkApi().deleteMfaDevice({
             environmentId,
             mfaDeviceId,
         });
@@ -70,14 +70,14 @@ const deleteMfaDevice = (_d) => __awaiter(void 0, [_d], void 0, function* ({ env
 });
 // used when verifying a device added after the user is already logged in
 // no jwt update needed
-const verifyMfaDevice = (_e) => __awaiter(void 0, [_e], void 0, function* ({ environmentId, userJwt, type, code, }) {
+const verifyMfaDevice = (_e) => __awaiter(void 0, [_e], void 0, function* ({ environmentId, type, code, }) {
     try {
         if (type === MFADeviceType.Totp) {
             const request = {
                 code,
                 type,
             };
-            const device = yield sdkApi(userJwt).registerTotpMfaDeviceVerify({
+            const device = yield sdkApi().registerTotpMfaDeviceVerify({
                 environmentId,
                 mFARegisterTotpDevicePostRequest: request,
             });
@@ -93,13 +93,14 @@ const verifyMfaDevice = (_e) => __awaiter(void 0, [_e], void 0, function* ({ env
 });
 // used when verifying a device when user is logging in
 // jwt update needed
-const authMfaDevice = (_f) => __awaiter(void 0, [_f], void 0, function* ({ environmentId, userJwt, type, code, }) {
+const authMfaDevice = (_f) => __awaiter(void 0, [_f], void 0, function* ({ environmentId, type, code, createMfaToken, }) {
     try {
         if (type === MFADeviceType.Totp) {
             const request = {
                 code,
+                createMfaToken,
             };
-            const response = yield sdkApi(userJwt).authMfaTotpDevice({
+            const response = yield sdkApi().authMfaTotpDevice({
                 environmentId,
                 mFAAuthTotpDevicePostRequest: request,
             });
@@ -107,15 +108,20 @@ const authMfaDevice = (_f) => __awaiter(void 0, [_f], void 0, function* ({ envir
         }
         throw new Error('Unsupported MFA device type');
     }
-    catch (e) {
-        const message = e instanceof Error ? e.message : (yield e.json()).error;
-        logger.error(message);
-        return undefined;
+    catch (error) {
+        logger.error(error);
+        if (error instanceof Response) {
+            const responseError = yield error.json();
+            if (responseError.code === 'mfa_invalid_code') {
+                throw new MfaInvalidOtpError();
+            }
+        }
+        throw error;
     }
 });
-const getRecoveryCodes = (_g) => __awaiter(void 0, [_g], void 0, function* ({ environmentId, userJwt, }) {
+const getRecoveryCodes = (_g) => __awaiter(void 0, [_g], void 0, function* ({ environmentId, }) {
     try {
-        const { recoveryCodes } = yield sdkApi(userJwt).getRecoveryCodes({
+        const { recoveryCodes } = yield sdkApi().getRecoveryCodes({
             environmentId,
         });
         return recoveryCodes;
@@ -126,9 +132,9 @@ const getRecoveryCodes = (_g) => __awaiter(void 0, [_g], void 0, function* ({ en
         return [];
     }
 });
-const createNewRecoveryCodes = (_h) => __awaiter(void 0, [_h], void 0, function* ({ environmentId, userJwt, }) {
+const createNewRecoveryCodes = (_h) => __awaiter(void 0, [_h], void 0, function* ({ environmentId, }) {
     try {
-        const { recoveryCodes } = yield sdkApi(userJwt).createNewRecoveryCodes({
+        const { recoveryCodes } = yield sdkApi().createNewRecoveryCodes({
             environmentId,
         });
         return recoveryCodes;
@@ -141,12 +147,12 @@ const createNewRecoveryCodes = (_h) => __awaiter(void 0, [_h], void 0, function*
 });
 // used when verifying a device when user is logging in with recovery code
 // jwt update needed
-const authMfaRecovery = (_j) => __awaiter(void 0, [_j], void 0, function* ({ environmentId, userJwt, code, }) {
+const authMfaRecovery = (_j) => __awaiter(void 0, [_j], void 0, function* ({ environmentId, code, }) {
     try {
         const request = {
             code,
         };
-        const response = yield sdkApi(userJwt).authMfaRecovery({
+        const response = yield sdkApi().authMfaRecovery({
             environmentId,
             mFAAuthRecoveryDevicePostRequest: request,
         });

package/src/lib/data/api/oauth/oauth.cjs

@@ -18,20 +18,22 @@ require('../../../utils/constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var api = require('../api.cjs');
+var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
 
-const verifyOAuth = (environmentId_1, providerType_1, _a, userJwt_1) => _tslib.__awaiter(void 0, [environmentId_1, providerType_1, _a, userJwt_1], void 0, function* (environmentId, providerType, { code, codeVerifier, state }, userJwt) {
+const verifyOAuth = (environmentId_1, providerType_1, _a) => _tslib.__awaiter(void 0, [environmentId_1, providerType_1, _a], void 0, function* (environmentId, providerType, { code, codeVerifier, state }) {
     const oauthRequest = {
         code,
         codeVerifier,
         state,
     };
     try {
-        const response = yield api.sdkApi(userJwt).oauthVerify({
+        const response = yield api.sdkApi().oauthVerify({
             environmentId,
             oauthRequest,
             providerType,
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);
@@ -42,16 +44,17 @@ const verifyOAuth = (environmentId_1, providerType_1, _a, userJwt_1) => _tslib._
         return undefined;
     }
 });
-const unlinkOAuth = (_b, userJwt_2) => _tslib.__awaiter(void 0, [_b, userJwt_2], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }, userJwt) {
+const unlinkOAuth = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ environmentId, primaryWalletId, verifiedCrentialId, }) {
     try {
-        const response = yield api.sdkApi(userJwt).verifyUnlink({
+        const response = yield api.sdkApi().verifyUnlink({
             environmentId,
             verifyUnlinkRequest: {
                 primaryWalletId,
                 verifiedCrentialId,
             },
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         return undefined;
@@ -71,7 +74,8 @@ const signInOAuth = (environmentId_2, providerType_2, _c) => _tslib.__awaiter(vo
             oauthRequest,
             providerType,
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);
@@ -113,7 +117,8 @@ const farcasterSignIn = (environmentId, farcasterSignInRequest) => _tslib.__awai
             environmentId,
             farcasterSignInRequest,
         });
-        return response;
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
     }
     catch (e) {
         logger.logger.error(e);

package/src/lib/data/api/oauth/oauth.d.ts

@@ -1,11 +1,12 @@
-import { FarcasterSignInRequest, OauthRequest, OauthResultRequest, OauthResultResponse, ProviderEnum, VerifyResponse } from '@dynamic-labs/sdk-api-core';
-export declare const getOauthLoginUrl: (environmentId: string, providerType: ProviderEnum, userJwt: string) => Promise<string | undefined>;
-export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest, userJwt: string) => Promise<VerifyResponse | undefined>;
+import { FarcasterSignInRequest, OauthRequest, OauthResultRequest, OauthResultResponse, ProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { UserProfile } from '../../../..';
+export declare const getOauthLoginUrl: (environmentId: string, providerType: ProviderEnum) => Promise<string | undefined>;
+export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest) => Promise<UserProfile | undefined>;
 export declare const unlinkOAuth: ({ environmentId, primaryWalletId, verifiedCrentialId, }: {
     environmentId: string;
     primaryWalletId: string | undefined;
     verifiedCrentialId: string;
-}, userJwt: string) => Promise<VerifyResponse | undefined>;
-export declare const signInOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state, captchaToken }: OauthRequest) => Promise<VerifyResponse | undefined>;
+}) => Promise<UserProfile | undefined>;
+export declare const signInOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state, captchaToken }: OauthRequest) => Promise<UserProfile | undefined>;
 export declare const getOAuthResult: (environmentId: string, providerType: ProviderEnum, { state }: OauthResultRequest) => Promise<OauthResultResponse | undefined>;
-export declare const farcasterSignIn: (environmentId: string, farcasterSignInRequest: FarcasterSignInRequest) => Promise<VerifyResponse | undefined>;
+export declare const farcasterSignIn: (environmentId: string, farcasterSignInRequest: FarcasterSignInRequest) => Promise<UserProfile | undefined>;