@dynamic-labs/sdk-react-core 2.0.0-alpha.23 → 2.0.0-alpha.25

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

@@ -9,11 +9,11 @@ var types = require('@dynamic-labs/types');
 var utils = require('@dynamic-labs/utils');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
-var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
@@ -25,7 +25,7 @@ var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var digestSHA256 = require('../../functions/digestSHA256/digestSHA256.cjs');
 var encodeBase64URL = require('../../functions/encodeBase64URL/encodeBase64URL.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
+var getMinAuthToken = require('../../functions/getMinAuthToken/getMinAuthToken.cjs');
 require('react-international-phone');
 var getOauthLoginUrl = require('../../functions/getOauthLoginUrl/getOauthLoginUrl.cjs');
 var getProviderByType = require('../../functions/getProviderByType/getProviderByType.cjs');
@@ -42,6 +42,7 @@ require('react-dom');
 var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
+var useHandleBeforeAuthHandler = require('../useHandleBeforeAuthHandler/useHandleBeforeAuthHandler.cjs');
 var farcaster = require('./farcaster.cjs');
 require('yup');
 require('react-i18next');
@@ -105,7 +106,8 @@ const providersWithoutWindowOpenerRefence = ['twitter'];
 // Hook to handle common social auth logic (for social linking and social sign in)
 const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     var _a;
-    const { environmentId, onboardingOnlyJwt, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, setIsVerificationInProgress, projectSettings, consumeNonce, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, onboardingOnlyJwt, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, projectSettings, consumeNonce, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleBeforeAuthWithJWT } = useHandleBeforeAuthHandler.useHandleBeforeAuthHandler();
     const { setView } = ViewContext.useViewContext();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setErrorMessage, setError: setContextError } = ErrorContext.useErrorContext();
@@ -117,7 +119,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     const providersWaitingOauthMessage = React.useRef({});
     const authWindowInterval = React.useRef();
     const shouldPool = React.useRef(false);
-    const userJwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
+    const userJwt = (_a = getMinAuthToken.getMinAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
     const clearError = () => {
         setError(undefined);
         setContextError(undefined);
@@ -178,14 +180,13 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         }
     });
     const signInAccount = (provider, apiCall) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b;
+        var _b, _c;
         try {
             const response = yield apiCall();
             if (!response) {
                 handleError(types.SocialOAuthErrorCode.SIGNIN_ERROR, `Failed to sign-in with social account: ${provider}`);
                 return;
             }
-            setIsVerificationInProgress(true);
             const decodedJwt = decodeJwt.decodeJwt(response.jwt);
             if (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length) {
                 setOnboardingOnlyJwt(response.jwt);
@@ -195,9 +196,10 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
             }
+            yield handleBeforeAuthWithJWT(response.jwt);
             setCallback('authSuccess');
             yield createUserProfileByJWT(response.jwt, response.minifiedJwt);
-            if (!((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
+            if (!((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
                 setShowAuthFlow(false);
                 onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
@@ -222,7 +224,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         }
     });
     const connectSocialAccount = ({ provider, validator, captchaToken, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _c, _d;
+        var _d, _e;
         clearInterval(authWindowInterval.current);
         clearError();
         setIsProcessing(true);
@@ -245,9 +247,9 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
         };
         const handleAuthWindowMessage = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            var _e, _f;
+            var _f, _g;
             const message = event.data;
-            const apiProvider = getProviderByType.getProviderByType((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _e !== void 0 ? _e : [], provider);
+            const apiProvider = getProviderByType.getProviderByType((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _f !== void 0 ? _f : [], provider);
             if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
                 return;
             }
@@ -285,7 +287,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setIsProcessing(true);
-            if (!((_f = providersWaitingOauthMessage.current) === null || _f === void 0 ? void 0 : _f[provider])) {
+            if (!((_g = providersWaitingOauthMessage.current) === null || _g === void 0 ? void 0 : _g[provider])) {
                 handleError(types.SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`);
                 return;
             }
@@ -326,12 +328,12 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             setIsProcessing(false);
         });
-        const loginUrl = getOauthLoginUrl.getOauthLoginUrl((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _c !== void 0 ? _c : [], provider);
+        const loginUrl = getOauthLoginUrl.getOauthLoginUrl((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _d !== void 0 ? _d : [], provider);
         if (!loginUrl) {
             handleError(types.SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
             return;
         }
-        if (!((_d = providersWaitingOauthMessage.current) === null || _d === void 0 ? void 0 : _d[provider])) {
+        if (!((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[provider])) {
             window.addEventListener('message', handleAuthWindowMessage);
             providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
         }
@@ -379,10 +381,10 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 authWindowTimeout = authWindowTimeout * 3;
             }
             authWindowInterval.current = setInterval(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                var _g;
+                var _h;
                 shouldPool.current = false;
                 // clear all states/listeners, assuming user closed the window before completing oauth
-                if ((_g = providersWaitingOauthMessage.current) === null || _g === void 0 ? void 0 : _g[provider]) {
+                if ((_h = providersWaitingOauthMessage.current) === null || _h === void 0 ? void 0 : _h[provider]) {
                     clearListeners();
                     handleError(types.SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`);
                 }
@@ -409,6 +411,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             window.location.assign(data.url);
         }
         else {
+            setShowAuthFlow(true);
             setView('farcaster-connect-view', { url: data.url });
         }
         const status = yield farcaster.watchStatus({

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

@@ -5,11 +5,11 @@ import { SocialOAuthErrorCode } from '@dynamic-labs/types';
 import { isMobile, NoAccessError, AccountExistsError, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
-import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
@@ -21,7 +21,7 @@ import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { digestSHA256 } from '../../functions/digestSHA256/digestSHA256.js';
 import { encodeBase64URL } from '../../functions/encodeBase64URL/encodeBase64URL.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
+import { getMinAuthToken } from '../../functions/getMinAuthToken/getMinAuthToken.js';
 import 'react-international-phone';
 import { getOauthLoginUrl } from '../../functions/getOauthLoginUrl/getOauthLoginUrl.js';
 import { getProviderByType } from '../../functions/getProviderByType/getProviderByType.js';
@@ -38,6 +38,7 @@ import 'react-dom';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
+import { useHandleBeforeAuthHandler } from '../useHandleBeforeAuthHandler/useHandleBeforeAuthHandler.js';
 import { connect, watchStatus } from './farcaster.js';
 import 'yup';
 import 'react-i18next';
@@ -101,7 +102,8 @@ const providersWithoutWindowOpenerRefence = ['twitter'];
 // Hook to handle common social auth logic (for social linking and social sign in)
 const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     var _a;
-    const { environmentId, onboardingOnlyJwt, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, setIsVerificationInProgress, projectSettings, consumeNonce, } = useInternalDynamicContext();
+    const { environmentId, onboardingOnlyJwt, setOnboardingOnlyJwt, setCallback, setShowAuthFlow, projectSettings, consumeNonce, } = useInternalDynamicContext();
+    const { handleBeforeAuthWithJWT } = useHandleBeforeAuthHandler();
     const { setView } = useViewContext();
     const { setExistentAccountData } = useAccountExistsContext();
     const { setErrorMessage, setError: setContextError } = useErrorContext();
@@ -113,7 +115,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
     const providersWaitingOauthMessage = useRef({});
     const authWindowInterval = useRef();
     const shouldPool = useRef(false);
-    const userJwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
+    const userJwt = (_a = getMinAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
     const clearError = () => {
         setError(undefined);
         setContextError(undefined);
@@ -174,14 +176,13 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         }
     });
     const signInAccount = (provider, apiCall) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b;
+        var _b, _c;
         try {
             const response = yield apiCall();
             if (!response) {
                 handleError(SocialOAuthErrorCode.SIGNIN_ERROR, `Failed to sign-in with social account: ${provider}`);
                 return;
             }
-            setIsVerificationInProgress(true);
             const decodedJwt = decodeJwt(response.jwt);
             if (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length) {
                 setOnboardingOnlyJwt(response.jwt);
@@ -191,9 +192,10 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
             }
+            yield handleBeforeAuthWithJWT(response.jwt);
             setCallback('authSuccess');
             yield createUserProfileByJWT(response.jwt, response.minifiedJwt);
-            if (!((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
+            if (!((_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
                 setShowAuthFlow(false);
                 onSettled === null || onSettled === void 0 ? void 0 : onSettled();
                 return;
@@ -218,7 +220,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
         }
     });
     const connectSocialAccount = ({ provider, validator, captchaToken, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _c, _d;
+        var _d, _e;
         clearInterval(authWindowInterval.current);
         clearError();
         setIsProcessing(true);
@@ -241,9 +243,9 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
         };
         const handleAuthWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
-            var _e, _f;
+            var _f, _g;
             const message = event.data;
-            const apiProvider = getProviderByType((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _e !== void 0 ? _e : [], provider);
+            const apiProvider = getProviderByType((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _f !== void 0 ? _f : [], provider);
             if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
                 return;
             }
@@ -281,7 +283,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             setIsProcessing(true);
-            if (!((_f = providersWaitingOauthMessage.current) === null || _f === void 0 ? void 0 : _f[provider])) {
+            if (!((_g = providersWaitingOauthMessage.current) === null || _g === void 0 ? void 0 : _g[provider])) {
                 handleError(SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`);
                 return;
             }
@@ -322,12 +324,12 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
             setIsProcessing(false);
         });
-        const loginUrl = getOauthLoginUrl((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _c !== void 0 ? _c : [], provider);
+        const loginUrl = getOauthLoginUrl((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _d !== void 0 ? _d : [], provider);
         if (!loginUrl) {
             handleError(SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`);
             return;
         }
-        if (!((_d = providersWaitingOauthMessage.current) === null || _d === void 0 ? void 0 : _d[provider])) {
+        if (!((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[provider])) {
             window.addEventListener('message', handleAuthWindowMessage);
             providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
         }
@@ -375,10 +377,10 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 authWindowTimeout = authWindowTimeout * 3;
             }
             authWindowInterval.current = setInterval(() => __awaiter(void 0, void 0, void 0, function* () {
-                var _g;
+                var _h;
                 shouldPool.current = false;
                 // clear all states/listeners, assuming user closed the window before completing oauth
-                if ((_g = providersWaitingOauthMessage.current) === null || _g === void 0 ? void 0 : _g[provider]) {
+                if ((_h = providersWaitingOauthMessage.current) === null || _h === void 0 ? void 0 : _h[provider]) {
                     clearListeners();
                     handleError(SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`);
                 }
@@ -405,6 +407,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             window.location.assign(data.url);
         }
         else {
+            setShowAuthFlow(true);
             setView('farcaster-connect-view', { url: data.url });
         }
         const status = yield watchStatus({

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

@@ -24,6 +24,7 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
+require('i18next');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -61,7 +62,6 @@ require('formik');
 require('../../../views/WalletList/WalletList.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');

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

@@ -20,6 +20,7 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
+import 'i18next';
 import '../../../config/ApiEndpoint.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -57,7 +58,6 @@ import 'formik';
 import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';

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

@@ -7,16 +7,16 @@ 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');
+require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
-require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
-require('@dynamic-labs/sdk-api');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
@@ -100,8 +100,8 @@ const userFieldsSchema = yup.object().shape({
     username: yup.string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
-    const jwtToken = onboardingOnlyJwt || authToken;
+    const { minAuthToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    const jwtToken = onboardingOnlyJwt || minAuthToken;
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     const { setRetryData } = VerificationContext.useVerification();
     const { selectedPhoneCountry } = FieldsStateContext.useFieldsState();
@@ -113,28 +113,16 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
-        if (validatedUserFields.phoneNumber && selectedPhoneCountry.current) {
-            // If phone number is just the country code (preceded by "+") and nothing else,
-            // that means we should treat it as empty.
-            //
-            // Elaboration: the phone input field, when using the logic from the "react-international-phone" lib
-            // will always have at least a + and the country code as value (though they are omitted from view).
-            // That means if the user tries to erase his phone number from the input field, the phone number value
-            // will still be `+${countryDialCode}`.
-            // If we were to leave this in, the api would reject this as an invalid number. The user's intention is to
-            // erase his phone number, so we clear this field out to achieve that.
-            if (validatedUserFields.phoneNumber.length ===
-                selectedPhoneCountry.current.dialCode.length + 1)
-                validatedUserFields.phoneNumber = '';
-            // If there is a phone number, store if in the retry verification data
-            // in case we need to perform sms verification
-            else
-                setRetryData({
-                    dialCode: selectedPhoneCountry.current.dialCode,
-                    iso2: selectedPhoneCountry.current.iso2,
-                    phone: validatedUserFields.phoneNumber,
-                });
-        }
+        // If there is a phone number, store it in the retry verification data
+        // in case we need to perform sms verification
+        if (validatedUserFields.phoneNumber &&
+            validatedUserFields.phoneNumber.length > 0 &&
+            selectedPhoneCountry.current)
+            setRetryData({
+                dialCode: selectedPhoneCountry.current.dialCode,
+                iso2: selectedPhoneCountry.current.iso2,
+                phone: validatedUserFields.phoneNumber,
+            });
         const updateUserProfileResponse = yield api.updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.jwtOverride) !== null && _a !== void 0 ? _a : jwtToken, (_b = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _b !== void 0 ? _b : 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);

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

@@ -3,16 +3,16 @@ 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';
+import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
-import '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
-import '@dynamic-labs/sdk-api';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
@@ -96,8 +96,8 @@ const userFieldsSchema = object().shape({
     username: string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext();
-    const jwtToken = onboardingOnlyJwt || authToken;
+    const { minAuthToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext();
+    const jwtToken = onboardingOnlyJwt || minAuthToken;
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     const { setRetryData } = useVerification();
     const { selectedPhoneCountry } = useFieldsState();
@@ -109,28 +109,16 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
-        if (validatedUserFields.phoneNumber && selectedPhoneCountry.current) {
-            // If phone number is just the country code (preceded by "+") and nothing else,
-            // that means we should treat it as empty.
-            //
-            // Elaboration: the phone input field, when using the logic from the "react-international-phone" lib
-            // will always have at least a + and the country code as value (though they are omitted from view).
-            // That means if the user tries to erase his phone number from the input field, the phone number value
-            // will still be `+${countryDialCode}`.
-            // If we were to leave this in, the api would reject this as an invalid number. The user's intention is to
-            // erase his phone number, so we clear this field out to achieve that.
-            if (validatedUserFields.phoneNumber.length ===
-                selectedPhoneCountry.current.dialCode.length + 1)
-                validatedUserFields.phoneNumber = '';
-            // If there is a phone number, store if in the retry verification data
-            // in case we need to perform sms verification
-            else
-                setRetryData({
-                    dialCode: selectedPhoneCountry.current.dialCode,
-                    iso2: selectedPhoneCountry.current.iso2,
-                    phone: validatedUserFields.phoneNumber,
-                });
-        }
+        // If there is a phone number, store it in the retry verification data
+        // in case we need to perform sms verification
+        if (validatedUserFields.phoneNumber &&
+            validatedUserFields.phoneNumber.length > 0 &&
+            selectedPhoneCountry.current)
+            setRetryData({
+                dialCode: selectedPhoneCountry.current.dialCode,
+                iso2: selectedPhoneCountry.current.iso2,
+                phone: validatedUserFields.phoneNumber,
+            });
         const updateUserProfileResponse = yield updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.jwtOverride) !== null && _a !== void 0 ? _a : jwtToken, (_b = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _b !== void 0 ? _b : 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);

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

@@ -24,6 +24,7 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
+require('i18next');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -61,7 +62,6 @@ require('formik');
 require('../../../../views/WalletList/WalletList.cjs');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('i18next');
 require('@hcaptcha/react-hcaptcha');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');

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

@@ -20,6 +20,7 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
+import 'i18next';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -57,7 +58,6 @@ import 'formik';
 import '../../../../views/WalletList/WalletList.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import 'i18next';
 import '@hcaptcha/react-hcaptcha';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/FooterAnimationContext/index.js';

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

@@ -10,16 +10,16 @@ var AccountExistsContext = require('../../../context/AccountExistsContext/Accoun
 require('react');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+require('@dynamic-labs/sdk-api');
+var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
-var logger = require('../../../shared/logger.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('@dynamic-labs/sdk-api');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -39,6 +39,7 @@ require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+var useHandleBeforeAuthHandler = require('../useHandleBeforeAuthHandler/useHandleBeforeAuthHandler.cjs');
 require('yup');
 require('react-i18next');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -86,10 +87,11 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 // This logic is the best place to determine whether we should verify or verify and link.
 const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
+    const { handleBeforeAuthWithUser } = useHandleBeforeAuthHandler.useHandleBeforeAuthHandler();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, enableConnectOnlyFallback, setMultiWalletWidgetState, setLogInWithEmail, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, eventsCallbacks, primaryWallet, enableConnectOnlyFallback, setMultiWalletWidgetState, setLogInWithEmail, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -160,8 +162,6 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     };
     const handleDisconnectWallet = ({ walletConnector, endSession = true, }) => {
         removeConnectedWalletsInfo();
-        // Ensure auth verification flag is taken down
-        setIsVerificationInProgress(false);
         if (endSession)
             walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.endSession();
     };
@@ -213,7 +213,6 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             // verification failed for unknown reason, set authmode to connect-only and show wallet list
             setAuthMode('connect-only');
             setView('wallet-list');
-            setIsVerificationInProgress(false);
             return;
         }
         else {
@@ -232,7 +231,6 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         var _a;
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
         try {
-            setIsVerificationInProgress(true);
             const { response, verifyArgs } = yield generateJWT(walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride);
             const decodedJwt = decodeJwt.decodeJwt(response.jwt);
             if (decodedJwt === undefined)
@@ -257,6 +255,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
                 setShowAuthFlow(true);
                 return setView('collect-user-data');
             }
+            yield handleBeforeAuthWithUser(user);
             index.storeAuthToken(response.jwt, response.minifiedJwt);
             setOnboardingOnlyJwt(undefined);
             setMultiWalletWidgetState('idle');