@dynamic-labs/sdk-react-core 2.1.0-alpha.22 → 2.1.0-alpha.24

package/src/lib/utils/hooks/useTransferWallet/useTransferWallet.js

@@ -17,16 +17,16 @@ import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
+import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 import '../../../locale/locale.js';
-import '@dynamic-labs/store';
 import { transferWallet } from '../../../data/api/wallets/wallets.js';
-import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -35,13 +35,15 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
 import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
-import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -61,7 +63,6 @@ import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
@@ -69,6 +70,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
@@ -78,7 +80,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useTransferWallet = () => {
-    const { displaySiweStatement, environmentId, authToken, setUser, primaryWallet, setPrimaryWalletId, } = useInternalDynamicContext();
+    const { displaySiweStatement, environmentId, user, primaryWallet, setPrimaryWalletId, } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
     const updatePrimaryWalletId = useCallback((walletConnector, user) => {
         const newWalletKey = walletConnector.key;
@@ -100,8 +102,8 @@ const useTransferWallet = () => {
         }
     }, [primaryWallet, setPrimaryWalletId]);
     return useCallback((props) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!authToken)
-            throw new DynamicError('User must be authenticated');
+        if (!user)
+            throw new DynamicError(USER_NOT_LOGGED_IN);
         const { overrideSiweStatement, walletConnector } = props;
         const args = 'nonce' in props
             ? Object.assign(Object.assign({}, props), { displaySiweStatement,
@@ -112,20 +114,21 @@ const useTransferWallet = () => {
             nonce: '', siweStatement: props.overrideSiweStatement, walletProvider: getWalletProvider(walletConnector) });
         const verifyArgs = yield getVerifyArgs(args);
         const response = yield transferWallet(environmentId, verifyArgs);
-        const userProfile = updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
+        if (!response) {
+            throw new DynamicError('Error transferring wallet.');
+        }
+        const userProfile = storeAuthTokenAndUser(response);
         updatePrimaryWalletId(walletConnector, userProfile);
-        setUser(userProfile);
         const walletId = userProfile.lastVerifiedCredentialId;
         if (walletId) {
             addedWalletsIds.current.push(walletId);
         }
     }), [
         addedWalletsIds,
-        authToken,
         displaySiweStatement,
         environmentId,
-        setUser,
         updatePrimaryWalletId,
+        user,
     ]);
 };
 

package/src/lib/utils/hooks/useUserAuth/useUserAuth.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
+var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('react');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -14,39 +15,38 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
-var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
+var mfa = require('../../../data/api/mfa/mfa.cjs');
+var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
 require('../../../locale/locale.cjs');
-require('@dynamic-labs/store');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var VerificationContext = require('../../../context/VerificationContext/VerificationContext.cjs');
-var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 require('react-dom');
 var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
 var LoadingContext = require('../../../context/LoadingContext/LoadingContext.cjs');
 var useHandleVerifiedUser = require('../useHandleVerifiedUser/useHandleVerifiedUser.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
-require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/store');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
@@ -66,7 +66,6 @@ require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
@@ -74,6 +73,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
@@ -84,39 +84,54 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 
 const sleepToShowSuccessMessage = () => utils.sleep(1500);
 const useUserAuth = ({ authMethod, }) => {
-    const { handleLogOut, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, onboardingOnlyJwt, setMultiWalletWidgetState, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleLogOut, setShowAuthFlow, setCallback, setMultiWalletWidgetState, environmentId, } = useInternalDynamicContext.useInternalDynamicContext();
     const { view, setView, goToInitialView } = ViewContext.useViewContext();
     const { setLoading } = LoadingContext.useLoadingContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
-    const { handleVerifiedUserWithJWT, handleVerifiedUserWithUser } = useHandleVerifiedUser.useHandleVerifiedUser();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
+    const handleVerifiedUser = useHandleVerifiedUser.useHandleVerifiedUser();
     const { displayedDestination: formattedPhone } = VerificationContext.useVerification();
     const { shouldAutoCreateEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
+    const isVerifyResponse = (response) => response.user;
     const initAuth = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
-        var _b;
+        var _b, _c;
         logger.logger.debug('initAuth', { authMethod, isSignIn });
         try {
-            const { jwt, minifiedJwt, user } = (yield verifyFunction()) || {};
-            if (!jwt || !minifiedJwt || !user) {
+            // TODO: change this logic to const verifiedUser = await verifyFunction();
+            // once all verify functions are updated to return UserProfile instead of VerifyResponse
+            const verifyResponse = yield verifyFunction();
+            if (!verifyResponse) {
                 yield cancelAuth();
-                throw new utils.DynamicError('No jwt returned from verify function');
+                throw new utils.DynamicError('No user returned from verify function');
+            }
+            let verifiedUser;
+            if (isVerifyResponse(verifyResponse)) {
+                verifiedUser = storeAuthTokenAndUser.storeAuthTokenAndUser(verifyResponse);
+            }
+            else {
+                verifiedUser = verifyResponse;
             }
-            const userProfile = createUserProfile.createUserProfileFromSdkUser(user);
-            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(userProfile);
-            if (isSignIn && ((_b = userProfile.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
-                yield handleOnboarding(jwt, showSuccessMessage, onSettled);
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(verifiedUser);
+            if (isSignIn && ((_b = verifiedUser.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
+                yield handleOnboarding(showSuccessMessage, onSettled);
+                return;
+            }
+            if ((_c = verifiedUser.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
+                const devices = yield mfa.getUserMfaDevices({ environmentId });
+                if (devices.length === 0) {
+                    setView('mfa-choose-device');
+                }
+                else {
+                    setView('mfa-verification');
+                }
                 return;
             }
             setMultiWalletWidgetState('idle');
-            setOnboardingOnlyJwt(undefined);
-            localStorage.LocalStorage.removeFromLS(localStorage$1.AUTH_ONBOARDING_TOKEN);
-            yield handleVerifiedUserWithUser(userProfile);
+            yield handleVerifiedUser(verifiedUser);
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();
             }
-            yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isSignIn) {
                 setCallback('authSuccess');
             }
@@ -141,9 +156,7 @@ const useUserAuth = ({ authMethod, }) => {
             onSettled === null || onSettled === void 0 ? void 0 : onSettled();
         }
     });
-    const handleOnboarding = (jwt, showSuccessMessage, onSettled) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setOnboardingOnlyJwt(jwt);
-        localStorage.LocalStorage.setToLS(localStorage$1.AUTH_ONBOARDING_TOKEN, jwt, true);
+    const handleOnboarding = (showSuccessMessage, onSettled) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (showSuccessMessage) {
             yield sleepToShowSuccessMessage();
         }
@@ -184,7 +197,7 @@ const useUserAuth = ({ authMethod, }) => {
         // Handle the case where the user has already an account with the email
         if (error instanceof utils.UserHasAccountWithEmailError) {
             setView('merge-user-accounts-with-same-email', {
-                returnToView: options.isEmailRecoveryFlow
+                returnToView: 'isEmailRecoveryFlow' in options && options.isEmailRecoveryFlow
                     ? 'passkey-recovery-add-email'
                     : undefined,
             });
@@ -201,7 +214,7 @@ const useUserAuth = ({ authMethod, }) => {
             setError(error.message);
         }
     };
-    const handleVerifyMissingFields = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
+    const handleVerifyMissingFields = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
         if (isEmailVerificationRequired &&
             missingFields.find((field) => field.name === 'email')) {
             setView('verify-email');
@@ -214,13 +227,16 @@ const useUserAuth = ({ authMethod, }) => {
         }
         setView(view.type);
     });
-    const completeAuth = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
+    const completeAuth = (_e) => _tslib.__awaiter(void 0, [_e], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
         logger.logger.debug('completeAuth', { authMethod });
         try {
             const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();
             onValidUpdatedJwt === null || onValidUpdatedJwt === void 0 ? void 0 : onValidUpdatedJwt();
-            setOnboardingOnlyJwt(updateUserProfileResponse.jwt);
-            localStorage.LocalStorage.setToLS(localStorage$1.AUTH_ONBOARDING_TOKEN, updateUserProfileResponse.minifiedJwt, true);
+            const updatedUser = storeAuthTokenAndUser.storeAuthTokenAndUser({
+                jwt: updateUserProfileResponse.jwt,
+                minifiedJwt: updateUserProfileResponse.minifiedJwt,
+                user: updateUserProfileResponse.user,
+            });
             if (missingFields.length > 0) {
                 yield handleVerifyMissingFields({
                     isEmailVerificationRequired,
@@ -229,13 +245,8 @@ const useUserAuth = ({ authMethod, }) => {
                 });
                 return;
             }
-            // no more onboarding needed, clean up onboarding jwt
-            if (onboardingOnlyJwt) {
-                yield handleVerifiedUserWithJWT(updateUserProfileResponse.jwt);
-                setOnboardingOnlyJwt(undefined);
-                localStorage.LocalStorage.removeFromLS(localStorage$1.AUTH_ONBOARDING_TOKEN);
-                setCallback('authSuccess');
-            }
+            yield handleVerifiedUser(updatedUser);
+            setCallback('authSuccess');
             if (completeSignInFlow) {
                 const shouldReturn = yield completeSignInFlow(updateUserProfileResponse);
                 if (shouldReturn) {

package/src/lib/utils/hooks/useUserAuth/useUserAuth.d.ts

@@ -1,5 +1,5 @@
-import { CompleteUserAuthProps, UseUserAuthProps, InitUserAuthProps, AuthOptions } from './useUserAuth.types';
-export declare const useUserAuth: <T extends keyof AuthOptions>({ authMethod, }: UseUserAuthProps<T>) => {
+import { CompleteUserAuthProps, InitUserAuthProps, UseUserAuthProps } from './useUserAuth.types';
+export declare const useUserAuth: <T extends keyof import("@dynamic-labs/types").AuthOptions>({ authMethod, }: UseUserAuthProps<T>) => {
     cancelAuth: () => Promise<void>;
     completeAuth: ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options, }: CompleteUserAuthProps<T>) => Promise<void>;
     initAuth: ({ isSignIn, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage, skipDefaultErrorHandling, }: InitUserAuthProps<T>) => Promise<void>;

package/src/lib/utils/hooks/useUserAuth/useUserAuth.js

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { DynamicError, EmailAlreadyExistsError, CustomFieldNotUniqueError, UsernameAlreadyExistsError, TooManyEmailVerificationsError, InvalidPhoneNumberError, NoAccessError, AccountExistsError, UserHasAccountWithEmailError, sleep } from '@dynamic-labs/utils';
+import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import 'react';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
@@ -10,39 +11,38 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import { AUTH_ONBOARDING_TOKEN } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
-import { createUserProfileFromSdkUser } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
+import { getUserMfaDevices } from '../../../data/api/mfa/mfa.js';
+import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 import '../../../locale/locale.js';
-import '@dynamic-labs/store';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useVerification } from '../../../context/VerificationContext/VerificationContext.js';
-import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 import 'react-dom';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
 import { useLoadingContext } from '../../../context/LoadingContext/LoadingContext.js';
 import { useHandleVerifiedUser } from '../useHandleVerifiedUser/useHandleVerifiedUser.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
-import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -62,7 +62,6 @@ import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
@@ -70,6 +69,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
@@ -80,39 +80,54 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 
 const sleepToShowSuccessMessage = () => sleep(1500);
 const useUserAuth = ({ authMethod, }) => {
-    const { handleLogOut, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, onboardingOnlyJwt, setMultiWalletWidgetState, } = useInternalDynamicContext();
+    const { handleLogOut, setShowAuthFlow, setCallback, setMultiWalletWidgetState, environmentId, } = useInternalDynamicContext();
     const { view, setView, goToInitialView } = useViewContext();
     const { setLoading } = useLoadingContext();
     const { setErrorMessage, setError } = useErrorContext();
     const { setExistentAccountData } = useAccountExistsContext();
-    const { handleVerifiedUserWithJWT, handleVerifiedUserWithUser } = useHandleVerifiedUser();
-    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
+    const handleVerifiedUser = useHandleVerifiedUser();
     const { displayedDestination: formattedPhone } = useVerification();
     const { shouldAutoCreateEmbeddedWallet } = useEmbeddedWallet();
+    const isVerifyResponse = (response) => response.user;
     const initAuth = (_a) => __awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
-        var _b;
+        var _b, _c;
         logger.debug('initAuth', { authMethod, isSignIn });
         try {
-            const { jwt, minifiedJwt, user } = (yield verifyFunction()) || {};
-            if (!jwt || !minifiedJwt || !user) {
+            // TODO: change this logic to const verifiedUser = await verifyFunction();
+            // once all verify functions are updated to return UserProfile instead of VerifyResponse
+            const verifyResponse = yield verifyFunction();
+            if (!verifyResponse) {
                 yield cancelAuth();
-                throw new DynamicError('No jwt returned from verify function');
+                throw new DynamicError('No user returned from verify function');
+            }
+            let verifiedUser;
+            if (isVerifyResponse(verifyResponse)) {
+                verifiedUser = storeAuthTokenAndUser(verifyResponse);
+            }
+            else {
+                verifiedUser = verifyResponse;
             }
-            const userProfile = createUserProfileFromSdkUser(user);
-            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(userProfile);
-            if (isSignIn && ((_b = userProfile.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
-                yield handleOnboarding(jwt, showSuccessMessage, onSettled);
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(verifiedUser);
+            if (isSignIn && ((_b = verifiedUser.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
+                yield handleOnboarding(showSuccessMessage, onSettled);
+                return;
+            }
+            if ((_c = verifiedUser.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
+                const devices = yield getUserMfaDevices({ environmentId });
+                if (devices.length === 0) {
+                    setView('mfa-choose-device');
+                }
+                else {
+                    setView('mfa-verification');
+                }
                 return;
             }
             setMultiWalletWidgetState('idle');
-            setOnboardingOnlyJwt(undefined);
-            LocalStorage.removeFromLS(AUTH_ONBOARDING_TOKEN);
-            yield handleVerifiedUserWithUser(userProfile);
+            yield handleVerifiedUser(verifiedUser);
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();
             }
-            yield createUserProfileByJWT(jwt, minifiedJwt);
             if (isSignIn) {
                 setCallback('authSuccess');
             }
@@ -137,9 +152,7 @@ const useUserAuth = ({ authMethod, }) => {
             onSettled === null || onSettled === void 0 ? void 0 : onSettled();
         }
     });
-    const handleOnboarding = (jwt, showSuccessMessage, onSettled) => __awaiter(void 0, void 0, void 0, function* () {
-        setOnboardingOnlyJwt(jwt);
-        LocalStorage.setToLS(AUTH_ONBOARDING_TOKEN, jwt, true);
+    const handleOnboarding = (showSuccessMessage, onSettled) => __awaiter(void 0, void 0, void 0, function* () {
         if (showSuccessMessage) {
             yield sleepToShowSuccessMessage();
         }
@@ -180,7 +193,7 @@ const useUserAuth = ({ authMethod, }) => {
         // Handle the case where the user has already an account with the email
         if (error instanceof UserHasAccountWithEmailError) {
             setView('merge-user-accounts-with-same-email', {
-                returnToView: options.isEmailRecoveryFlow
+                returnToView: 'isEmailRecoveryFlow' in options && options.isEmailRecoveryFlow
                     ? 'passkey-recovery-add-email'
                     : undefined,
             });
@@ -197,7 +210,7 @@ const useUserAuth = ({ authMethod, }) => {
             setError(error.message);
         }
     };
-    const handleVerifyMissingFields = (_c) => __awaiter(void 0, [_c], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
+    const handleVerifyMissingFields = (_d) => __awaiter(void 0, [_d], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
         if (isEmailVerificationRequired &&
             missingFields.find((field) => field.name === 'email')) {
             setView('verify-email');
@@ -210,13 +223,16 @@ const useUserAuth = ({ authMethod, }) => {
         }
         setView(view.type);
     });
-    const completeAuth = (_d) => __awaiter(void 0, [_d], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
+    const completeAuth = (_e) => __awaiter(void 0, [_e], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
         logger.debug('completeAuth', { authMethod });
         try {
             const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();
             onValidUpdatedJwt === null || onValidUpdatedJwt === void 0 ? void 0 : onValidUpdatedJwt();
-            setOnboardingOnlyJwt(updateUserProfileResponse.jwt);
-            LocalStorage.setToLS(AUTH_ONBOARDING_TOKEN, updateUserProfileResponse.minifiedJwt, true);
+            const updatedUser = storeAuthTokenAndUser({
+                jwt: updateUserProfileResponse.jwt,
+                minifiedJwt: updateUserProfileResponse.minifiedJwt,
+                user: updateUserProfileResponse.user,
+            });
             if (missingFields.length > 0) {
                 yield handleVerifyMissingFields({
                     isEmailVerificationRequired,
@@ -225,13 +241,8 @@ const useUserAuth = ({ authMethod, }) => {
                 });
                 return;
             }
-            // no more onboarding needed, clean up onboarding jwt
-            if (onboardingOnlyJwt) {
-                yield handleVerifiedUserWithJWT(updateUserProfileResponse.jwt);
-                setOnboardingOnlyJwt(undefined);
-                LocalStorage.removeFromLS(AUTH_ONBOARDING_TOKEN);
-                setCallback('authSuccess');
-            }
+            yield handleVerifiedUser(updatedUser);
+            setCallback('authSuccess');
             if (completeSignInFlow) {
                 const shouldReturn = yield completeSignInFlow(updateUserProfileResponse);
                 if (shouldReturn) {

package/src/lib/utils/hooks/useUserAuth/useUserAuth.types.d.ts

@@ -1,26 +1,9 @@
-import { ProviderEnum, UpdateSelfResponse, VerifyResponse } from '@dynamic-labs/sdk-api-core';
-import { UserProfile, WalletConnector } from '../../../..';
+import { UpdateSelfResponse, VerifyResponse } from '@dynamic-labs/sdk-api-core';
+import { AuthMethod, AuthOptions } from '@dynamic-labs/types';
+import { UserProfile } from '../../../..';
 import { UpdateUserReturnPayload } from '../useUserUpdateRequest';
-export type AuthOptions = {
-    email: EmailOptions;
-    sms: SmsOptions;
-    social: SocialOptions;
-    wallet: WalletOptions;
-};
-export type AuthMethod = keyof AuthOptions;
-export type EmailOptions = {
-    email?: string;
-    isEmailRecoveryFlow?: boolean;
-};
-export type SmsOptions = {
-    phone?: string;
-};
-export type SocialOptions = {
-    provider?: ProviderEnum;
-};
-export type WalletOptions = {
-    walletAddress?: string;
-    walletConnector?: WalletConnector;
+export type UseUserAuthOptions = {
+    [K in AuthMethod]: Partial<AuthOptions[K]>;
 };
 export type OnErrorCallback = (error: unknown) => void;
 export type OnSettledCallback = () => void;
@@ -36,7 +19,7 @@ export type InitUserAuthProps<T extends AuthMethod> = {
     /**
      * Api call that will be made to verify the user.
      */
-    verifyFunction: () => Promise<VerifyResponse | undefined>;
+    verifyFunction: () => Promise<UserProfile | VerifyResponse | undefined>;
     /**
      * Optional callback that will be called with the new jwt right after the user is verified.
      */
@@ -62,7 +45,7 @@ export type InitUserAuthProps<T extends AuthMethod> = {
      * Props specific to the auth method.
      * (e.g. isRecoveryFlow for email auth, provider for social auth, etc.)
      */
-    options?: AuthOptions[T];
+    options?: UseUserAuthOptions[T];
 };
 export type CompleteUserAuthProps<T extends AuthMethod> = {
     /**
@@ -82,5 +65,5 @@ export type CompleteUserAuthProps<T extends AuthMethod> = {
      * Props specific to the auth method.
      * (e.g. isRecoveryFlow for email auth, provider for social auth, etc.)
      */
-    options?: AuthOptions[T];
+    options?: UseUserAuthOptions[T];
 };