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

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

@@ -27,6 +27,7 @@ require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -42,9 +43,6 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('zustand');
-require('zustand/middleware');
-require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
@@ -72,6 +70,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');

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

@@ -23,6 +23,7 @@ import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '../../../locale/locale.js';
+import '@dynamic-labs/store';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -38,9 +39,6 @@ import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
 import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import 'zustand';
-import 'zustand/middleware';
-import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -68,6 +66,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';

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

@@ -7,7 +7,6 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 require('react');
 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');
@@ -23,12 +22,14 @@ require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
+var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -46,9 +47,6 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('zustand');
-require('zustand/middleware');
-require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
@@ -76,6 +74,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -90,28 +89,29 @@ const useUserAuth = ({ authMethod, }) => {
     const { setLoading } = LoadingContext.useLoadingContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
-    const { handleVerifiedUserWithJWT } = useHandleVerifiedUser.useHandleVerifiedUser();
+    const { handleVerifiedUserWithJWT, handleVerifiedUserWithUser } = useHandleVerifiedUser.useHandleVerifiedUser();
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const { displayedDestination: formattedPhone } = VerificationContext.useVerification();
     const { shouldAutoCreateEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
     const initAuth = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
+        var _b;
         logger.logger.debug('initAuth', { authMethod, isSignIn });
         try {
-            const { jwt, minifiedJwt } = (yield verifyFunction()) || {};
-            if (!jwt || !minifiedJwt) {
+            const { jwt, minifiedJwt, user } = (yield verifyFunction()) || {};
+            if (!jwt || !minifiedJwt || !user) {
                 yield cancelAuth();
                 throw new utils.DynamicError('No jwt returned from verify function');
             }
-            const decodedJwt = decodeJwt.decodeJwt(jwt);
-            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(decodedJwt);
-            if (isSignIn && (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length)) {
+            const userProfile = createUserProfile.createUserProfileFromSdkUser(user);
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(userProfile);
+            if (isSignIn && ((_b = userProfile.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
                 yield handleOnboarding(jwt, showSuccessMessage, onSettled);
                 return;
             }
             setMultiWalletWidgetState('idle');
             setOnboardingOnlyJwt(undefined);
             localStorage.LocalStorage.removeFromLS(localStorage$1.AUTH_ONBOARDING_TOKEN);
-            yield handleVerifiedUserWithJWT(jwt);
+            yield handleVerifiedUserWithUser(userProfile);
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();
@@ -201,7 +201,7 @@ const useUserAuth = ({ authMethod, }) => {
             setError(error.message);
         }
     };
-    const handleVerifyMissingFields = (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
+    const handleVerifyMissingFields = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
         if (isEmailVerificationRequired &&
             missingFields.find((field) => field.name === 'email')) {
             setView('verify-email');
@@ -214,7 +214,7 @@ const useUserAuth = ({ authMethod, }) => {
         }
         setView(view.type);
     });
-    const completeAuth = (_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
+    const completeAuth = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
         logger.logger.debug('completeAuth', { authMethod });
         try {
             const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();

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

@@ -3,7 +3,6 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { DynamicError, EmailAlreadyExistsError, CustomFieldNotUniqueError, UsernameAlreadyExistsError, TooManyEmailVerificationsError, InvalidPhoneNumberError, 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';
@@ -19,12 +18,14 @@ import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import { createUserProfileFromSdkUser } from '../../functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '../../../locale/locale.js';
+import '@dynamic-labs/store';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -42,9 +43,6 @@ import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
 import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import 'zustand';
-import 'zustand/middleware';
-import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -72,6 +70,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -86,28 +85,29 @@ const useUserAuth = ({ authMethod, }) => {
     const { setLoading } = useLoadingContext();
     const { setErrorMessage, setError } = useErrorContext();
     const { setExistentAccountData } = useAccountExistsContext();
-    const { handleVerifiedUserWithJWT } = useHandleVerifiedUser();
+    const { handleVerifiedUserWithJWT, handleVerifiedUserWithUser } = useHandleVerifiedUser();
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
     const { displayedDestination: formattedPhone } = useVerification();
     const { shouldAutoCreateEmbeddedWallet } = useEmbeddedWallet();
     const initAuth = (_a) => __awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
+        var _b;
         logger.debug('initAuth', { authMethod, isSignIn });
         try {
-            const { jwt, minifiedJwt } = (yield verifyFunction()) || {};
-            if (!jwt || !minifiedJwt) {
+            const { jwt, minifiedJwt, user } = (yield verifyFunction()) || {};
+            if (!jwt || !minifiedJwt || !user) {
                 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)) {
+            const userProfile = createUserProfileFromSdkUser(user);
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(userProfile);
+            if (isSignIn && ((_b = userProfile.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
                 yield handleOnboarding(jwt, showSuccessMessage, onSettled);
                 return;
             }
             setMultiWalletWidgetState('idle');
             setOnboardingOnlyJwt(undefined);
             LocalStorage.removeFromLS(AUTH_ONBOARDING_TOKEN);
-            yield handleVerifiedUserWithJWT(jwt);
+            yield handleVerifiedUserWithUser(userProfile);
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();
@@ -197,7 +197,7 @@ const useUserAuth = ({ authMethod, }) => {
             setError(error.message);
         }
     };
-    const handleVerifyMissingFields = (_b) => __awaiter(void 0, [_b], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
+    const handleVerifyMissingFields = (_c) => __awaiter(void 0, [_c], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
         if (isEmailVerificationRequired &&
             missingFields.find((field) => field.name === 'email')) {
             setView('verify-email');
@@ -210,7 +210,7 @@ const useUserAuth = ({ authMethod, }) => {
         }
         setView(view.type);
     });
-    const completeAuth = (_c) => __awaiter(void 0, [_c], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
+    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();

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

@@ -1,6 +1,5 @@
 import { ProviderEnum, UpdateSelfResponse, VerifyResponse } from '@dynamic-labs/sdk-api-core';
-import { WalletConnector } from '../../../..';
-import { decodeJwt } from '../../../shared';
+import { UserProfile, WalletConnector } from '../../../..';
 import { UpdateUserReturnPayload } from '../useUserUpdateRequest';
 export type AuthOptions = {
     email: EmailOptions;
@@ -39,15 +38,15 @@ export type InitUserAuthProps<T extends AuthMethod> = {
      */
     verifyFunction: () => Promise<VerifyResponse | undefined>;
     /**
-     * Otional callback that will be called with the new jwt right after the user is verified.
+     * Optional callback that will be called with the new jwt right after the user is verified.
      */
-    onVerifySuccess?: (jwt?: ReturnType<typeof decodeJwt>) => void;
+    onVerifySuccess?: (user?: UserProfile) => void;
     /**
-     * Otional callback that will be called whenever initAuth finishes (either successfully or not).
+     * Optional 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.
+     * Optional callback that will be called whenever there is an error with initAuth.
      */
     onError?: OnErrorCallback;
     /**

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

@@ -44,9 +44,7 @@ require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('zustand');
-require('zustand/middleware');
-require('zustand/react/shallow');
+require('@dynamic-labs/store');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../../components/Alert/Alert.cjs');
@@ -74,6 +72,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');

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

@@ -40,9 +40,7 @@ import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/MockContext/MockContext.js';
 import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import 'zustand';
-import 'zustand/middleware';
-import 'zustand/react/shallow';
+import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../../components/Alert/Alert.js';
@@ -70,6 +68,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';

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

@@ -27,6 +27,7 @@ require('viem');
 require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
 require('../../../../locale/locale.cjs');
+require('@dynamic-labs/store');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -42,9 +43,6 @@ require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../useUpdateUser/useUpdateUser.cjs');
 var UserFieldEditorContext = require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 var validateUpdateRequest = require('./validateUpdateRequest/validateUpdateRequest.cjs');
-require('zustand');
-require('zustand/middleware');
-require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../../components/Alert/Alert.cjs');
@@ -72,6 +70,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');

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

@@ -23,6 +23,7 @@ import 'viem';
 import 'viem/chains';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../locale/locale.js';
+import '@dynamic-labs/store';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -38,9 +39,6 @@ import '../../../../views/CollectUserDataView/useFields.js';
 import '../useUpdateUser/useUpdateUser.js';
 import { UserFieldEditorContext } from '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import { validateUpdateRequest } from './validateUpdateRequest/validateUpdateRequest.js';
-import 'zustand';
-import 'zustand/middleware';
-import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../../components/Alert/Alert.js';
@@ -68,6 +66,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';

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,7 +16,6 @@ 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');
@@ -24,12 +24,12 @@ require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../locale/locale.cjs');
+var user = require('../../../data/api/user/user.cjs');
+var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.cjs');
 var userActions = require('../../../store/actions/userActions/userActions.cjs');
-require('zustand');
-require('zustand/middleware');
-require('zustand/react/shallow');
+require('@dynamic-labs/store');
 
-const useValidateSession = ({ handleLogOut }) => {
+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);
@@ -37,14 +37,29 @@ const useValidateSession = ({ handleLogOut }) => {
         yield handleLogOut();
     });
     const handleUserDataOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const cookieEnabled = isCookieEnabled.isCookieEnabled();
         const authToken = getAuthToken.getAuthToken();
-        const user = userActions.getUser();
-        if (authToken || !user) {
+        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) {

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

@@ -1,8 +1,9 @@
 /// <reference types="react" />
 type Props = {
+    environmentId: string;
     handleLogOut: () => Promise<void>;
 };
-export declare const useValidateSession: ({ handleLogOut }: 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 { CookieInvalidError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -11,7 +12,6 @@ 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';
@@ -20,12 +20,12 @@ import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '../../../locale/locale.js';
+import { getAuthenticatedUser } from '../../../data/api/user/user.js';
+import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled.js';
 import { getUser } from '../../../store/actions/userActions/userActions.js';
-import 'zustand';
-import 'zustand/middleware';
-import 'zustand/react/shallow';
+import '@dynamic-labs/store';
 
-const useValidateSession = ({ handleLogOut }) => {
+const useValidateSession = ({ environmentId, handleLogOut }) => {
     const [hasLoggedOut, setHasLoggedOut] = useState(false);
     const logout = (reason, params) => __awaiter(void 0, void 0, void 0, function* () {
         setHasLoggedOut(true);
@@ -33,11 +33,26 @@ const useValidateSession = ({ handleLogOut }) => {
         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,

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

@@ -23,6 +23,7 @@ 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 errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
@@ -30,6 +31,7 @@ require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('../../../locale/locale.cjs');
+require('@dynamic-labs/store');
 var wallets = require('../../../data/api/wallets/wallets.cjs');
 var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -47,9 +49,6 @@ require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
 require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('zustand');
-require('zustand/middleware');
-require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
@@ -78,6 +77,7 @@ require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -240,10 +240,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
                 onError: (e) => {
                     handleError(e, walletConnector, publicWalletAddress, oauth);
                 },
-                onVerifySuccess: (decodedJwt) => {
+                onVerifySuccess: (user) => {
                     var _a;
-                    if (decodedJwt === undefined)
-                        throw new utils.DynamicError('Invalid token!');
+                    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,
@@ -256,11 +257,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
                     localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
                     setAuthMode('connect-and-sign');
                     updatePrimaryWalletId({
-                        lastVerifiedCredentialId: decodedJwt.lastVerifiedCredentialId,
-                        verifiedCredentials: decodedJwt.verifiedCredentials,
+                        lastVerifiedCredentialId: user.lastVerifiedCredentialId,
+                        verifiedCredentials: user.verifiedCredentials,
                         walletConnector,
                     });
-                    const walletId = decodedJwt.lastVerifiedCredentialId;
+                    const walletId = user.lastVerifiedCredentialId;
                     if (walletId) {
                         addedWalletsIds.current.push(walletId);
                     }

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

@@ -19,6 +19,7 @@ import '../../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
@@ -26,6 +27,7 @@ import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '../../../locale/locale.js';
+import '@dynamic-labs/store';
 import { verifyWallet, linkWallet } from '../../../data/api/wallets/wallets.js';
 import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -43,9 +45,6 @@ import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
 import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import 'zustand';
-import 'zustand/middleware';
-import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -74,6 +73,7 @@ import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -236,10 +236,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
                 onError: (e) => {
                     handleError(e, walletConnector, publicWalletAddress, oauth);
                 },
-                onVerifySuccess: (decodedJwt) => {
+                onVerifySuccess: (user) => {
                     var _a;
-                    if (decodedJwt === undefined)
-                        throw new DynamicError('Invalid token!');
+                    if (!user) {
+                        throw new DynamicError(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,
@@ -252,11 +253,11 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
                     LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);
                     setAuthMode('connect-and-sign');
                     updatePrimaryWalletId({
-                        lastVerifiedCredentialId: decodedJwt.lastVerifiedCredentialId,
-                        verifiedCredentials: decodedJwt.verifiedCredentials,
+                        lastVerifiedCredentialId: user.lastVerifiedCredentialId,
+                        verifiedCredentials: user.verifiedCredentials,
                         walletConnector,
                     });
-                    const walletId = decodedJwt.lastVerifiedCredentialId;
+                    const walletId = user.lastVerifiedCredentialId;
                     if (walletId) {
                         addedWalletsIds.current.push(walletId);
                     }