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

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

@@ -22,6 +22,7 @@ import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -30,15 +31,17 @@ import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
+import '../useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
-import 'react-i18next';
+import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../context/FieldsStateContext/FieldsStateContext.js';
-import '../useUpdateUser/useUpdateUser.js';
 import { UserFieldEditorContext } from '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import { validateUpdateRequest } from './validateUpdateRequest/validateUpdateRequest.js';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/IconButton/IconButton.js';
@@ -60,10 +63,11 @@ import '../../../../views/WalletList/WalletList.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../../../context/LoadingContext/LoadingContext.js';
 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';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';

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

@@ -18,6 +18,7 @@ const validateUpdateRequest = (fields, user, projectSettings) => {
         return 'No signed-in user';
     // Catch field not set in dashboard
     const allUserFields = getUserProfileFields.getUserProfileFields({
+        customFields: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.customFields,
         projectSettingsKyc: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc,
         user,
     });

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

@@ -14,6 +14,7 @@ const validateUpdateRequest = (fields, user, projectSettings) => {
         return 'No signed-in user';
     // Catch field not set in dashboard
     const allUserFields = getUserProfileFields({
+        customFields: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.customFields,
         projectSettingsKyc: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc,
         user,
     });

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+var utils = require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -15,10 +16,73 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+var userActions = require('../../../store/actions/userActions/userActions.cjs');
+require('../../../locale/locale.cjs');
+var user = require('../../../data/api/user/user.cjs');
+var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.cjs');
+require('@dynamic-labs/store');
+var storeActions = require('../../../store/actions/storeActions/storeActions.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../context/VerificationContext/VerificationContext.cjs');
+require('react-dom');
+require('../../../context/WalletContext/WalletContext.cjs');
+require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+require('@dynamic-labs/types');
+require('../../../context/LoadingContext/LoadingContext.cjs');
+require('yup');
+require('../../../context/MockContext/MockContext.cjs');
+require('../../../views/CollectUserDataView/useFields.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/rpc-providers');
+require('react-i18next');
+require('../../../components/Alert/Alert.cjs');
+require('../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../components/IconButton/IconButton.cjs');
+require('../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../components/Input/Input.cjs');
+require('../../../components/IsBrowser/IsBrowser.cjs');
+require('../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../components/Popper/Popper/Popper.cjs');
+require('../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
+require('qrcode');
+require('formik');
+require('../../../views/WalletList/WalletList.cjs');
+require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+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');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 
-const useValidateSession = ({ handleLogOut, user, authToken, }) => {
+const useValidateSession = ({ environmentId, handleLogOut }) => {
     const [hasLoggedOut, setHasLoggedOut] = React.useState(false);
     const logout = (reason, params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setHasLoggedOut(true);
@@ -26,17 +90,48 @@ const useValidateSession = ({ handleLogOut, user, authToken, }) => {
         yield handleLogOut();
     });
     const handleUserDataOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (authToken || !user) {
+        const cookieEnabled = isCookieEnabled.isCookieEnabled();
+        const authToken = getAuthToken.getAuthToken();
+        const user$1 = userActions.getUser();
+        if (authToken || !user$1) {
+            return;
+        }
+        if (user$1 && !authToken && cookieEnabled) {
+            try {
+                yield user.getAuthenticatedUser({ environmentId });
+            }
+            catch (e) {
+                if (e instanceof utils.CookieInvalidError) {
+                    yield logout('user auth cookie invalid', {
+                        authToken,
+                        user: user$1,
+                    });
+                }
+            }
             return;
         }
         yield logout('user data out of sync', {
             authToken,
-            user,
+            user: user$1,
         });
     });
-    if (!hasLoggedOut) {
-        handleUserDataOutOfSync();
-    }
+    const handleStoreAndEnvironemntMismatch = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const storeEnvId = storeActions.getEnvironment();
+        if (!storeEnvId || environmentId === storeEnvId) {
+            return;
+        }
+        yield logout('store and environment are out of sync', {
+            currentEnvId: environmentId,
+            storedEnvId: storeEnvId,
+        });
+        storeActions.setEnvironment(environmentId);
+    });
+    React.useEffect(() => {
+        if (!hasLoggedOut) {
+            handleStoreAndEnvironemntMismatch();
+            handleUserDataOutOfSync();
+        }
+    }, [hasLoggedOut]);
     return { setHasLoggedOut };
 };
 

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

@@ -1,11 +1,9 @@
 /// <reference types="react" />
-import { UserProfile } from '@dynamic-labs/types';
 type Props = {
+    environmentId: string;
     handleLogOut: () => Promise<void>;
-    user: UserProfile | undefined;
-    authToken: string | undefined;
 };
-export declare const useValidateSession: ({ handleLogOut, user, authToken, }: Props) => {
+export declare const useValidateSession: ({ environmentId, handleLogOut }: Props) => {
     setHasLoggedOut: import("react").Dispatch<import("react").SetStateAction<boolean>>;
 };
 export {};

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

@@ -1,6 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
+import { CookieInvalidError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -11,10 +12,73 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
-import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import { getUser } from '../../../store/actions/userActions/userActions.js';
+import '../../../locale/locale.js';
+import { getAuthenticatedUser } from '../../../data/api/user/user.js';
+import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled.js';
+import '@dynamic-labs/store';
+import { getEnvironment, setEnvironment } from '../../../store/actions/storeActions/storeActions.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+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 '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
+import '../../../components/Alert/Alert.js';
+import '../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../components/IconButton/IconButton.js';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/Input/Input.js';
+import '../../../components/IsBrowser/IsBrowser.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../components/Popper/Popper/Popper.js';
+import '../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
+import 'qrcode';
+import 'formik';
+import '../../../views/WalletList/WalletList.js';
+import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+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';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
-const useValidateSession = ({ handleLogOut, user, authToken, }) => {
+const useValidateSession = ({ environmentId, handleLogOut }) => {
     const [hasLoggedOut, setHasLoggedOut] = useState(false);
     const logout = (reason, params) => __awaiter(void 0, void 0, void 0, function* () {
         setHasLoggedOut(true);
@@ -22,17 +86,48 @@ const useValidateSession = ({ handleLogOut, user, authToken, }) => {
         yield handleLogOut();
     });
     const handleUserDataOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
+        const cookieEnabled = isCookieEnabled();
+        const authToken = getAuthToken();
+        const user = getUser();
         if (authToken || !user) {
             return;
         }
+        if (user && !authToken && cookieEnabled) {
+            try {
+                yield getAuthenticatedUser({ environmentId });
+            }
+            catch (e) {
+                if (e instanceof CookieInvalidError) {
+                    yield logout('user auth cookie invalid', {
+                        authToken,
+                        user,
+                    });
+                }
+            }
+            return;
+        }
         yield logout('user data out of sync', {
             authToken,
             user,
         });
     });
-    if (!hasLoggedOut) {
-        handleUserDataOutOfSync();
-    }
+    const handleStoreAndEnvironemntMismatch = () => __awaiter(void 0, void 0, void 0, function* () {
+        const storeEnvId = getEnvironment();
+        if (!storeEnvId || environmentId === storeEnvId) {
+            return;
+        }
+        yield logout('store and environment are out of sync', {
+            currentEnvId: environmentId,
+            storedEnvId: storeEnvId,
+        });
+        setEnvironment(environmentId);
+    });
+    useEffect(() => {
+        if (!hasLoggedOut) {
+            handleStoreAndEnvironemntMismatch();
+            handleUserDataOutOfSync();
+        }
+    }, [hasLoggedOut]);
     return { setHasLoggedOut };
 };
 

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

@@ -7,9 +7,8 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('react');
-require('../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
-var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -24,14 +23,14 @@ require('../../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
-var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
+var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
-var index = require('../../functions/storeAuthToken/index.cjs');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 var wallets = require('../../../data/api/wallets/wallets.cjs');
 var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -43,15 +42,16 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
-var useHandleVerifiedUser = require('../useHandleVerifiedUser/useHandleVerifiedUser.cjs');
+var useUserAuth = require('../useUserAuth/useUserAuth.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
-require('react-i18next');
+require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../components/IconButton/IconButton.cjs');
@@ -77,6 +77,8 @@ require('../../../context/LoadingContext/LoadingContext.cjs');
 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');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -87,20 +89,18 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 // Since we are re-using the different screens to authenticate or link the wallet.
 // 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 { handleVerifiedUserWithUser } = useHandleVerifiedUser.useHandleVerifiedUser();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
+    const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
     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, events, primaryWallet, enableConnectOnlyFallback, setMultiWalletWidgetState, setLogInWithEmail, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, user, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
+    const { initAuth } = useUserAuth.useUserAuth({ authMethod: 'wallet' });
     // 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.
-    const verifyOnly = !authToken;
+    // We need this boolean to distinguish between logic for verify or linking.
+    const verifyOnly = !user;
     const shouldFallbackToConnectOnly = enableConnectOnlyFallback && (verifyOnly || !multiWalletEnabled);
     const generateJWT = (walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        let response;
         const nonce = consumeNonce();
         if (nonce === undefined)
             throw new utils.DynamicError('Missing nonce');
@@ -116,27 +116,24 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             walletConnector,
             walletProvider,
         });
-        if (authToken === undefined || !multiWalletEnabled) {
-            response = yield wallets.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
+        let verifyResponse;
+        if (!user || !multiWalletEnabled) {
+            verifyResponse = wallets.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
                 oauth }));
         }
         else {
-            response = yield wallets.linkWallet(environmentId, verifyArgs, authToken);
+            verifyResponse = wallets.linkWallet(environmentId, verifyArgs);
         }
-        if (response === undefined)
-            throw new utils.DynamicError('Could not obtain a valid JWT');
-        // TODO DYN-523: add verification here that the JWT is valid with the publicKey
-        return { response, verifyArgs };
+        return { verifyArgs, verifyFunction: () => verifyResponse };
     });
     // Overrides the stored primary wallet id when the
     // user logs in for the first time.
     // Or when the user is linking an additional
     // account on the same wallet as the primary wallet.
-    const updatePrimaryWalletId = (walletConnector, user) => {
-        const newSelectedCredentialWallet = user.verifiedCredentials.find((cred) => cred.id === user.lastVerifiedCredentialId &&
-            cred.format === 'blockchain');
+    const updatePrimaryWalletId = ({ walletConnector, verifiedCredentials, lastVerifiedCredentialId, }) => {
+        const newSelectedCredentialWallet = verifiedCredentials.find((cred) => cred.id === lastVerifiedCredentialId && cred.format === 'blockchain');
         if (newSelectedCredentialWallet) {
-            const currentPrimaryWallet = user.verifiedCredentials.find((a) => a.id === primaryWalletId);
+            const currentPrimaryWallet = verifiedCredentials.find((a) => a.id === primaryWalletId);
             if (verifyOnly ||
                 !primaryWallet ||
                 (multiWalletWidgetState === 'awaiting_signature' &&
@@ -173,6 +170,15 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         if (e.message === 'ignore') {
             return;
         }
+        // Emit failure if this wallet connector was currently selected for auth
+        if (selectedWalletConnector &&
+            selectedWalletConnector.key === walletConnector.key)
+            dynamicEvents.dynamicEvents.emit('authFailure', {
+                address,
+                connectorName: walletConnector.name,
+                option: walletConnector.name,
+                type: 'wallet',
+            }, { error: e });
         if (e instanceof utils.WalletUsedError) {
             handleDisconnectWallet({ endSession: false, walletConnector });
             return handleWalletUsedError(e);
@@ -235,51 +241,53 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
         }
     };
     return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride, }) {
-        var _b;
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
+        dynamicEvents.dynamicEvents.emit('authInit', {
+            address: publicWalletAddress,
+            connectorName: walletConnector.name,
+            option: walletConnector.name,
+            type: 'wallet',
+        });
         try {
-            const { response, verifyArgs } = yield generateJWT(walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride);
-            const decodedJwt = decodeJwt.decodeJwt(response.jwt);
-            if (decodedJwt === undefined)
-                throw new utils.DynamicError('Invalid token!');
-            try {
-                (_b = events === null || events === void 0 ? void 0 : events.onSignedMessage) === null || _b === void 0 ? void 0 : _b.call(events, {
-                    messageToSign: verifyArgs.messageToSign,
-                    signedMessage: verifyArgs.signedMessage,
-                });
-            }
-            catch (_c) {
-                logger.logger.warn('Error calling onSignedMessage callback');
-            }
-            const user = yield createUserProfile.createUserProfile(decodedJwt);
-            const isKycRequired = decodedJwt.missingFields.length;
-            setOnboardingOnlyJwt(response.jwt);
-            localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
-            setAuthMode('connect-and-sign');
-            updatePrimaryWalletId(walletConnector, user);
-            const walletId = decodedJwt.lastVerifiedCredentialId;
-            if (walletId) {
-                addedWalletsIds.current.push(walletId);
-            }
-            // TODO: how can projectSettings be undefined?
-            if (verifyOnly && projectSettings && isKycRequired) {
-                setShowAuthFlow(true);
-                return setView('collect-user-data');
-            }
-            yield handleVerifiedUserWithUser(user);
-            index.storeAuthToken(response.jwt, response.minifiedJwt);
-            setOnboardingOnlyJwt(undefined);
-            setMultiWalletWidgetState('idle');
-            setUser(user); // The user should only be set if no KYC is needed.
-            setLogInWithEmail(false);
-            setShowAuthFlow(false);
-            /* istanbul ignore else */
-            if (verifyOnly) {
-                setCallback('authSuccess');
-            }
-            else {
-                setView('wallet-list');
-            }
+            const { verifyFunction, verifyArgs } = yield generateJWT(walletConnector, walletProvider, getAddressOpts, publicWalletAddress, captchaToken, oauth, signedMessageOverride, messageToSignOverride);
+            yield initAuth({
+                isSignIn: verifyOnly,
+                onError: (e) => {
+                    handleError(e, walletConnector, publicWalletAddress, oauth);
+                },
+                onVerifySuccess: (user) => {
+                    var _a;
+                    if (!user) {
+                        throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+                    }
+                    try {
+                        (_a = events === null || events === void 0 ? void 0 : events.onSignedMessage) === null || _a === void 0 ? void 0 : _a.call(events, {
+                            messageToSign: verifyArgs.messageToSign,
+                            signedMessage: verifyArgs.signedMessage,
+                        });
+                    }
+                    catch (_b) {
+                        logger.logger.warn('Error calling onSignedMessage callback');
+                    }
+                    localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
+                    setAuthMode('connect-and-sign');
+                    updatePrimaryWalletId({
+                        lastVerifiedCredentialId: user.lastVerifiedCredentialId,
+                        verifiedCredentials: user.verifiedCredentials,
+                        walletConnector,
+                    });
+                    const walletId = user.lastVerifiedCredentialId;
+                    if (walletId) {
+                        addedWalletsIds.current.push(walletId);
+                    }
+                },
+                options: {
+                    address: publicWalletAddress,
+                    connectorName: walletConnector.name,
+                },
+                skipDefaultErrorHandling: true,
+                verifyFunction,
+            });
         }
         catch (e) {
             handleError(e, walletConnector, publicWalletAddress, oauth);