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

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

@@ -0,0 +1,252 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { DynamicError, NoAccessError, AccountExistsError, UserHasAccountWithEmailError, sleep } from '@dynamic-labs/utils';
+import 'react';
+import '../../../context/DynamicContext/DynamicContext.js';
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/sdk-api-core';
+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 '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.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 '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.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';
+import '../../../context/ThemeContext/ThemeContext.js';
+import '@dynamic-labs/types';
+import { useLoadingContext } from '../../../context/LoadingContext/LoadingContext.js';
+import { useHandleVerifiedUser } from '../useHandleVerifiedUser/useHandleVerifiedUser.js';
+import 'yup';
+import '../../../context/MockContext/MockContext.js';
+import 'react-i18next';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+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/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';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+
+const sleepToShowSuccessMessage = () => sleep(1500);
+const useUserAuth = ({ authMethod, }) => {
+    const { handleLogOut, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, onboardingOnlyJwt, setMultiWalletWidgetState, projectSettings, } = useInternalDynamicContext();
+    const { view, setView, goToInitialView } = useViewContext();
+    const { setLoading } = useLoadingContext();
+    const { setErrorMessage, setError } = useErrorContext();
+    const { setExistentAccountData } = useAccountExistsContext();
+    const { createEmbeddedWallet } = useEmbeddedWallet();
+    const { handleVerifiedUserWithJWT } = useHandleVerifiedUser();
+    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
+    const { displayedDestination: formattedPhone } = useVerification();
+    const initAuth = (_a) => __awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
+        logger.debug('initAuth', { authMethod, isSignIn });
+        try {
+            const { jwt, minifiedJwt } = (yield verifyFunction()) || {};
+            if (!jwt || !minifiedJwt) {
+                yield cancelAuth();
+                throw new DynamicError('No jwt returned from verify function');
+            }
+            const decodedJwt = decodeJwt(jwt);
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(decodedJwt);
+            if (isSignIn && (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length)) {
+                yield handleOnboarding(jwt, showSuccessMessage, onSettled);
+                return;
+            }
+            setMultiWalletWidgetState('idle');
+            setOnboardingOnlyJwt(undefined);
+            yield handleVerifiedUserWithJWT(jwt);
+            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');
+                yield createEmbeddedWalletIfEnabled();
+            }
+            setShowAuthFlow(false);
+            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+        }
+        catch (error) {
+            logger.debug(error);
+            if (skipDefaultErrorHandling) {
+                onError === null || onError === void 0 ? void 0 : onError(error);
+                return;
+            }
+            handleError(error, { onError });
+        }
+        finally {
+            setLoading(false);
+            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+        }
+    });
+    const handleOnboarding = (jwt, showSuccessMessage, onSettled) => __awaiter(void 0, void 0, void 0, function* () {
+        setOnboardingOnlyJwt(jwt);
+        if (showSuccessMessage) {
+            yield sleepToShowSuccessMessage();
+        }
+        setShowAuthFlow(true);
+        if (authMethod === 'email' || authMethod === 'social') {
+            setView('collect-user-data-login-no-wallet', {
+                userIdentification: 'email',
+            });
+        }
+        else if (authMethod === 'sms') {
+            setView('collect-user-data-login-no-wallet', {
+                userIdentification: 'phoneNumber',
+                userIdentificationOverride: formattedPhone,
+            });
+        }
+        else if (authMethod === 'wallet') {
+            setView('collect-user-data');
+        }
+        onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+    });
+    const createEmbeddedWalletIfEnabled = () => __awaiter(void 0, void 0, void 0, function* () {
+        var _b, _c;
+        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)) {
+            return;
+        }
+        try {
+            // this function will check if embedded wallet is enabled and create wallet if needed
+            // if not enabled, it will throw an error.
+            yield createEmbeddedWallet();
+        }
+        catch (e) {
+            logger.debug('createEmbeddedWallet', e);
+            setShowAuthFlow(false);
+        }
+    });
+    const handleError = (error, { options = {}, onError, }) => {
+        if (error instanceof NoAccessError) {
+            setView('no-access');
+            return;
+        }
+        if (error instanceof AccountExistsError) {
+            setExistentAccountData(error.errorPayload);
+            setView('account-exists');
+            return;
+        }
+        // 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
+                    ? 'passkey-recovery-add-email'
+                    : undefined,
+            });
+            return;
+        }
+        if (onError) {
+            onError === null || onError === void 0 ? void 0 : onError(error);
+            return;
+        }
+        if (error.code) {
+            setErrorMessage(error.code);
+        }
+        else {
+            setError(error.message);
+        }
+    };
+    const completeAuth = (_d) => __awaiter(void 0, [_d], 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);
+            if (isEmailVerificationRequired &&
+                missingFields.map((field) => field.name).toString() === 'email') {
+                setView('verify-email');
+                return;
+            }
+            else if (isSmsVerificationRequired &&
+                missingFields.map((field) => field.name).toString() === 'phoneNumber') {
+                setView('verify-sms');
+                return;
+            }
+            else if (missingFields.length > 0) {
+                // make sure we capture the fields that are required and still missing!
+                // do not change the view, just use the current one
+                setView(view.type);
+                return;
+            }
+            if (onboardingOnlyJwt) {
+                yield handleVerifiedUserWithJWT(updateUserProfileResponse.jwt);
+                setOnboardingOnlyJwt(undefined);
+                setCallback('authSuccess');
+            }
+            if (completeSignInFlow) {
+                const shouldReturn = yield completeSignInFlow(updateUserProfileResponse);
+                if (shouldReturn) {
+                    return;
+                }
+            }
+            yield createEmbeddedWalletIfEnabled();
+        }
+        catch (error) {
+            logger.debug(error);
+            handleError(error, { options });
+        }
+        finally {
+            setLoading(false);
+        }
+    });
+    const cancelAuth = () => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('cancelAuth', { authMethod });
+        yield handleLogOut();
+        goToInitialView();
+    });
+    return {
+        cancelAuth,
+        completeAuth,
+        initAuth,
+    };
+};
+
+export { useUserAuth };

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

@@ -0,0 +1,87 @@
+import { ProviderEnum, UpdateSelfResponse, VerifyResponse } from '@dynamic-labs/sdk-api-core';
+import { WalletConnector } from '../../../..';
+import { decodeJwt } from '../../../shared';
+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 OnErrorCallback = (error: unknown) => void;
+export type OnSettledCallback = () => void;
+export type UseUserAuthProps<T extends AuthMethod> = {
+    authMethod?: T;
+};
+export type InitUserAuthProps<T extends AuthMethod> = {
+    /**
+     * Mainly used for wallet auth.
+     * Indicates if the user is signing in or just linking.
+     */
+    isSignIn?: boolean;
+    /**
+     * Api call that will be made to verify the user.
+     */
+    verifyFunction: () => Promise<VerifyResponse | undefined>;
+    /**
+     * Otional callback that will be called with the new jwt right after the user is verified.
+     */
+    onVerifySuccess?: (jwt?: ReturnType<typeof decodeJwt>) => void;
+    /**
+     * Otional callback that will be called whenever initAuth finishes (either successfully or not).
+     */
+    onSettled?: OnSettledCallback;
+    /**
+     * Otional callback that will be called whenever there is an error with initAuth.
+     */
+    onError?: OnErrorCallback;
+    /**
+     * Whether to show a success message after the user is verified or not.
+     * If true, it will wait for 2 seconds before hidding the success message and continuing.
+     */
+    showSuccessMessage?: boolean;
+    /**
+     * If true, it will skip the default error handling and just call the onError callback.
+     */
+    skipDefaultErrorHandling?: boolean;
+    /**
+     * Props specific to the auth method.
+     * (e.g. isRecoveryFlow for email auth, provider for social auth, etc.)
+     */
+    options?: AuthOptions[T];
+};
+export type CompleteUserAuthProps<T extends AuthMethod> = {
+    /**
+     * Optional function specific to each auth method that should be called to complete the auth flow
+     * after onboarding is completed.
+     */
+    completeSignInFlow?: (updateUserProfileResponse: UpdateSelfResponse) => Promise<boolean>;
+    /**
+     * Api call that will be made to update the user to complete the auth and return a UpdateUserReturnPayload.
+     */
+    updateJwtFunction: () => Promise<UpdateUserReturnPayload>;
+    /**
+     * Optional callback that will be called whenever updateJwtFunction completes successfuly.
+     */
+    onValidUpdatedJwt?: () => void;
+    /**
+     * Props specific to the auth method.
+     * (e.g. isRecoveryFlow for email auth, provider for social auth, etc.)
+     */
+    options?: AuthOptions[T];
+};

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

@@ -40,6 +40,7 @@ require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var useHandleVerificationRequired = require('../../useHandleVerificationRequired/useHandleVerificationRequired.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/MockContext/MockContext.cjs');
 require('react-i18next');
 var FieldsStateContext = require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
@@ -66,7 +67,6 @@ 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/LoadingContext/LoadingContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');

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

@@ -36,6 +36,7 @@ import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { useHandleVerificationRequired, isVerificationRequired } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/MockContext/MockContext.js';
 import 'react-i18next';
 import { useFieldsState } from '../../../../context/FieldsStateContext/FieldsStateContext.js';
@@ -62,7 +63,6 @@ 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';

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

@@ -35,6 +35,7 @@ require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
 require('react-i18next');
@@ -64,7 +65,6 @@ 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/LoadingContext/LoadingContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');

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

@@ -31,6 +31,7 @@ import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
 import 'react-i18next';
@@ -60,7 +61,6 @@ 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';

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

@@ -9,7 +9,6 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('react');
 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,11 +23,9 @@ 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');
 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');
@@ -44,7 +41,7 @@ require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.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');
@@ -87,20 +84,19 @@ 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, authToken, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, } = 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;
     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 +112,24 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             walletConnector,
             walletProvider,
         });
+        let verifyResponse;
         if (authToken === undefined || !multiWalletEnabled) {
-            response = yield wallets.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
+            verifyResponse = wallets.verifyWallet(environmentId, Object.assign(Object.assign({}, verifyArgs), { captchaToken,
                 oauth }));
         }
         else {
-            response = yield wallets.linkWallet(environmentId, verifyArgs, authToken);
+            verifyResponse = wallets.linkWallet(environmentId, verifyArgs, authToken);
         }
-        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' &&
@@ -235,51 +228,43 @@ 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);
         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: (decodedJwt) => {
+                    var _a;
+                    if (decodedJwt === undefined)
+                        throw new utils.DynamicError('Invalid token!');
+                    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: decodedJwt.lastVerifiedCredentialId,
+                        verifiedCredentials: decodedJwt.verifiedCredentials,
+                        walletConnector,
+                    });
+                    const walletId = decodedJwt.lastVerifiedCredentialId;
+                    if (walletId) {
+                        addedWalletsIds.current.push(walletId);
+                    }
+                },
+                options: { walletAddress: publicWalletAddress, walletConnector },
+                skipDefaultErrorHandling: true,
+                verifyFunction,
+            });
         }
         catch (e) {
             handleError(e, walletConnector, publicWalletAddress, oauth);