@dynamic-labs/sdk-react-core 2.1.0-alpha.21 → 2.1.0-alpha.23

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,27 +15,25 @@ 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');
 require('../../../locale/locale.cjs');
-require('@dynamic-labs/store');
+var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
+var updateJWTAndCreateUserProfile = require('../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
 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');
@@ -47,6 +46,7 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/store');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
@@ -74,6 +74,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -83,39 +84,49 @@ 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 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) {
+            if (!user) {
                 yield cancelAuth();
-                throw new utils.DynamicError('No jwt returned from verify function');
+                throw new utils.DynamicError('No user returned from verify function');
             }
-            const userProfile = createUserProfile.createUserProfileFromSdkUser(user);
+            const userProfile = storeAuthTokenAndUser.storeAuthTokenAndUser({ jwt, minifiedJwt, 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);
+                yield handleOnboarding(showSuccessMessage, onSettled);
+                return;
+            }
+            if ((_c = user.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
+                // this is needed because useMfa relies on the jwt being available in LS
+                // this function only stores the jwt and creates the user, but does not set
+                // the user state
+                updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(jwt, minifiedJwt);
+                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(userProfile);
             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');
             }
@@ -140,9 +151,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();
         }
@@ -183,7 +192,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,
             });
@@ -200,7 +209,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');
@@ -213,13 +222,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,
@@ -228,13 +240,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,27 +11,25 @@ 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 '../../../locale/locale.js';
-import '@dynamic-labs/store';
+import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
+import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 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';
@@ -43,6 +42,7 @@ import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
 import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -70,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/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -79,39 +80,49 @@ 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 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) {
+            if (!user) {
                 yield cancelAuth();
-                throw new DynamicError('No jwt returned from verify function');
+                throw new DynamicError('No user returned from verify function');
             }
-            const userProfile = createUserProfileFromSdkUser(user);
+            const userProfile = storeAuthTokenAndUser({ jwt, minifiedJwt, 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);
+                yield handleOnboarding(showSuccessMessage, onSettled);
+                return;
+            }
+            if ((_c = user.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
+                // this is needed because useMfa relies on the jwt being available in LS
+                // this function only stores the jwt and creates the user, but does not set
+                // the user state
+                updateJWTAndCreateUserProfile(jwt, minifiedJwt);
+                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(userProfile);
             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');
             }
@@ -136,9 +147,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();
         }
@@ -179,7 +188,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,
             });
@@ -196,7 +205,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');
@@ -209,13 +218,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,
@@ -224,13 +236,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;
@@ -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];
 };

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

@@ -78,7 +78,7 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else if (e instanceof utils.InvalidPhoneNumberError) {
-                formikHelper.setErrors({ phoneNumber: 'Invalid phone number' });
+                formikHelper.setErrors({ phoneNumber: e.message });
             }
             else {
                 formikHelper.setErrors({

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

@@ -74,7 +74,7 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else if (e instanceof InvalidPhoneNumberError) {
-                formikHelper.setErrors({ phoneNumber: 'Invalid phone number' });
+                formikHelper.setErrors({ phoneNumber: e.message });
             }
             else {
                 formikHelper.setErrors({

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -7,7 +7,6 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var yup = require('yup');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
-var decodeJwt = require('../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -30,11 +29,11 @@ require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../locale/locale.cjs');
 var user = require('../../../../data/api/user/user.cjs');
+require('@dynamic-labs/store');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var VerificationContext = require('../../../../context/VerificationContext/VerificationContext.cjs');
-var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
@@ -44,7 +43,6 @@ require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('@dynamic-labs/store');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../../components/Alert/Alert.cjs');
@@ -72,6 +70,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -103,9 +102,7 @@ const userFieldsSchema = yup.object().shape({
     username: yup.string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { minAuthToken, onboardingOnlyJwt, environmentId, decodedOnboardingOnlyToken, } = useInternalDynamicContext.useInternalDynamicContext();
-    const jwtToken = onboardingOnlyJwt || minAuthToken;
-    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
+    const { environmentId, userWithMissingFields, setCallback } = useInternalDynamicContext.useInternalDynamicContext();
     const { setRetryData } = VerificationContext.useVerification();
     const { selectedPhoneCountry } = FieldsStateContext.useFieldsState();
     const updateUser = React.useCallback((userFields, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -115,7 +112,7 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         let { metadata } = userFields;
         // when a user has already logged in but a custom field was added to env, in order to not clear the old fields
         metadata = metadata
-            ? Object.assign(Object.assign({}, decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.metadata), metadata) : decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.metadata;
+            ? Object.assign(Object.assign({}, userWithMissingFields === null || userWithMissingFields === void 0 ? void 0 : userWithMissingFields.metadata), metadata) : userWithMissingFields === null || userWithMissingFields === void 0 ? void 0 : userWithMissingFields.metadata;
         // we dont add user.metadata from edit profile because it is already in the metadata request for updateUser
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
@@ -132,17 +129,15 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             });
         const updateUserProfileResponse = yield user.updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _a !== void 0 ? _a : environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
         // check if decoded JWT still somehow has missing fields, we can't proceed if it does
-        const decodedJwt = decodeJwt.decodeJwt(updateUserProfileResponse.jwt);
-        const missingFields = (_b = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _b !== void 0 ? _b : [];
-        const requiredVerificationDestination = useHandleVerificationRequired.isVerificationRequired(updateUserProfileResponse);
+        const missingFields = (_b = updateUserProfileResponse.user.missingFields) !== null && _b !== void 0 ? _b : [];
+        const requiredVerificationDestination = useHandleVerificationRequired.getVerificationDestination(updateUserProfileResponse.nextView);
         if (requiredVerificationDestination && handleVerificationRequired.current)
             return handleVerificationRequired.current({
                 destination: requiredVerificationDestination,
                 missingFields,
                 updateUserProfileResponse,
             });
-        // If verification is not needed then we can update the user profile immediately.
-        yield updateUserProfileByJWT(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt);
+        setCallback('userProfileUpdate');
         return {
             isEmailVerificationRequired: false,
             isSmsVerificationRequired: false,
@@ -150,13 +145,12 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             updateUserProfileResponse,
         };
     }), [
+        userWithMissingFields === null || userWithMissingFields === void 0 ? void 0 : userWithMissingFields.metadata,
         validationSchemaStripUnknown,
         selectedPhoneCountry,
-        jwtToken,
-        environmentId,
-        updateUserProfileByJWT,
         setRetryData,
-        decodedOnboardingOnlyToken,
+        environmentId,
+        setCallback,
     ]);
     // This is necessary to avoid a circular declaration issue
     const handleVerificationRequired = React.useRef(undefined);

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -3,7 +3,6 @@ import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useCallback, useRef } from 'react';
 import { object, string, boolean } from 'yup';
 import '../../../../context/DynamicContext/DynamicContext.js';
-import { decodeJwt } from '../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -26,21 +25,20 @@ import 'viem/chains';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../locale/locale.js';
 import { updateUserProfileFields } from '../../../../data/api/user/user.js';
+import '@dynamic-labs/store';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useVerification } from '../../../../context/VerificationContext/VerificationContext.js';
-import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
-import { useHandleVerificationRequired, isVerificationRequired } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
+import { useHandleVerificationRequired, getVerificationDestination } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
 import '@dynamic-labs/types';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/MockContext/MockContext.js';
 import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../../components/Alert/Alert.js';
@@ -68,6 +66,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -99,9 +98,7 @@ const userFieldsSchema = object().shape({
     username: string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { minAuthToken, onboardingOnlyJwt, environmentId, decodedOnboardingOnlyToken, } = useInternalDynamicContext();
-    const jwtToken = onboardingOnlyJwt || minAuthToken;
-    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
+    const { environmentId, userWithMissingFields, setCallback } = useInternalDynamicContext();
     const { setRetryData } = useVerification();
     const { selectedPhoneCountry } = useFieldsState();
     const updateUser = useCallback((userFields, options) => __awaiter(void 0, void 0, void 0, function* () {
@@ -111,7 +108,7 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         let { metadata } = userFields;
         // when a user has already logged in but a custom field was added to env, in order to not clear the old fields
         metadata = metadata
-            ? Object.assign(Object.assign({}, decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.metadata), metadata) : decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.metadata;
+            ? Object.assign(Object.assign({}, userWithMissingFields === null || userWithMissingFields === void 0 ? void 0 : userWithMissingFields.metadata), metadata) : userWithMissingFields === null || userWithMissingFields === void 0 ? void 0 : userWithMissingFields.metadata;
         // we dont add user.metadata from edit profile because it is already in the metadata request for updateUser
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
@@ -128,17 +125,15 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             });
         const updateUserProfileResponse = yield updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _a !== void 0 ? _a : environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
         // check if decoded JWT still somehow has missing fields, we can't proceed if it does
-        const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
-        const missingFields = (_b = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _b !== void 0 ? _b : [];
-        const requiredVerificationDestination = isVerificationRequired(updateUserProfileResponse);
+        const missingFields = (_b = updateUserProfileResponse.user.missingFields) !== null && _b !== void 0 ? _b : [];
+        const requiredVerificationDestination = getVerificationDestination(updateUserProfileResponse.nextView);
         if (requiredVerificationDestination && handleVerificationRequired.current)
             return handleVerificationRequired.current({
                 destination: requiredVerificationDestination,
                 missingFields,
                 updateUserProfileResponse,
             });
-        // If verification is not needed then we can update the user profile immediately.
-        yield updateUserProfileByJWT(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt);
+        setCallback('userProfileUpdate');
         return {
             isEmailVerificationRequired: false,
             isSmsVerificationRequired: false,
@@ -146,13 +141,12 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             updateUserProfileResponse,
         };
     }), [
+        userWithMissingFields === null || userWithMissingFields === void 0 ? void 0 : userWithMissingFields.metadata,
         validationSchemaStripUnknown,
         selectedPhoneCountry,
-        jwtToken,
-        environmentId,
-        updateUserProfileByJWT,
         setRetryData,
-        decodedOnboardingOnlyToken,
+        environmentId,
+        setCallback,
     ]);
     // This is necessary to avoid a circular declaration issue
     const handleVerificationRequired = useRef(undefined);