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

package/src/lib/{utils/hooks/useFetchProjectSettings/useFetchProjectSettings.js → store/hooks/useProjectSettings/useProjectSettings.js}

@@ -1,6 +1,5 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useEffect } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
@@ -8,22 +7,22 @@ import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
+import 'react';
 import '@dynamic-labs/wallet-book';
-import { PROJECT_SETTINGS_STORAGE_KEY, CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
-import '../../constants/colors.js';
-import '../../constants/values.js';
-import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
-import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
+import '../../../utils/constants/colors.js';
+import '../../../utils/constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
+import { getStore } from '../../store.js';
 import { fetchProjectSettings } from '../../../data/api/settings/settings.js';
 import '../../../locale/locale.js';
-import '@dynamic-labs/store';
-import { validateLocalStorageExpiry } from '../../../context/DynamicContext/validators/validators.js';
+import { setProjectSettings } from '../../actions/projectSettingsActions/projectSettingsActions.js';
+import { useStoreWithSelector } from '../useStoreWithSelector/useStoreWithSelector.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -34,14 +33,15 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
-import { usePromise } from '../usePromise/usePromise.js';
+import { usePromise } from '../../../utils/hooks/usePromise/usePromise.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../../../utils/hooks/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 '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
@@ -62,7 +62,6 @@ import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../views/WalletList/WalletList.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
@@ -70,6 +69,7 @@ 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';
@@ -77,14 +77,9 @@ import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
-const useFetchProjectSettings = ({ authToken, environmentId, retries = 2, }) => {
-    const [lsSettings, setLsSettings, removeLsSettings] = useLocalStorage(PROJECT_SETTINGS_STORAGE_KEY, undefined, validateLocalStorageExpiry);
-    const lsSettingsExists = (lsSettings === null || lsSettings === void 0 ? void 0 : lsSettings.settings) !== undefined ? true : false;
-    if (lsSettings &&
-        lsSettings.environmentId &&
-        lsSettings.environmentId !== environmentId) {
-        removeLsSettings();
-    }
+const useProjectSettings = ({ environmentId, retries = 2, }) => {
+    const storedSettings = useStoreWithSelector(getStore(), ({ projectSettings }) => projectSettings);
+    const lsSettingsExists = Boolean(storedSettings === null || storedSettings === void 0 ? void 0 : storedSettings.settings);
     const { isLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
         const settings = yield fetchProjectSettings(environmentId);
         if (!settings)
@@ -95,30 +90,17 @@ const useFetchProjectSettings = ({ authToken, environmentId, retries = 2, }) =>
         enabled: !lsSettingsExists,
         onResolve: (projectSettings) => {
             const expiry = new Date().getTime() + 60000 * 5;
-            setLsSettings({
-                environmentId,
-                expiry: expiry,
+            setProjectSettings({
+                expiresAt: expiry,
                 settings: projectSettings,
             });
         },
         retries,
     });
-    /**
-     * This useEffect is require to clean up the project settings
-     * from local storage when no token or connect only wallet is
-     * present
-     */
-    useEffect(() => {
-        const [connectedWalletData] = LocalStorage.getFromLS(CONNECTED_WALLETS_INFO) || [];
-        if (!authToken && !connectedWalletData) {
-            removeLsSettings();
-        }
-    }, [authToken, removeLsSettings]);
     return {
         isLoading,
-        projectSettings: lsSettings === null || lsSettings === void 0 ? void 0 : lsSettings.settings,
-        removeLsSettings,
+        projectSettings: storedSettings === null || storedSettings === void 0 ? void 0 : storedSettings.settings,
     };
 };
 
-export { useFetchProjectSettings };
+export { useProjectSettings };

package/src/lib/store/hooks/useUser/useUser.cjs

@@ -7,15 +7,16 @@ var store = require('../../store.cjs');
 var useStoreWithSelector = require('../useStoreWithSelector/useStoreWithSelector.cjs');
 
 const useUser = () => {
-    var _a;
+    var _a, _b;
     const userFromStore = useStoreWithSelector.useStoreWithSelector(store.getStore(), ({ user }) => user);
-    // adding userWithMissingFields to avoid breaking changes for customer who consider that when we have a user,
-    // it means that they already moved passed onboarding.
+    // adding unauthenticatedUser to avoid breaking changes for customer who consider that when we have a user,
+    // it means that they are already fully authenticated.
     // since we won't have onboarding jwt anymore, the idea is to just store the user in LS and either use the user state
-    // or userWithMissingFields, depending on the value of missing fields
+    // or unauthenticatedUser, depending on the value of missing fields or mfa required.
     // this is just following our existing logic of how we handle authToken vs onboardingOnlyToken.
-    if ((_a = userFromStore === null || userFromStore === void 0 ? void 0 : userFromStore.missingFields) === null || _a === void 0 ? void 0 : _a.length) {
-        return { userWithMissingFields: userFromStore };
+    if (((_a = userFromStore === null || userFromStore === void 0 ? void 0 : userFromStore.missingFields) === null || _a === void 0 ? void 0 : _a.length) ||
+        ((_b = userFromStore === null || userFromStore === void 0 ? void 0 : userFromStore.scope) === null || _b === void 0 ? void 0 : _b.includes('requiresAdditionalAuth'))) {
+        return { unauthenticatedUser: userFromStore };
     }
     return { user: userFromStore };
 };

package/src/lib/store/hooks/useUser/useUser.d.ts

@@ -1,7 +1,7 @@
 export declare const useUser: () => {
-    userWithMissingFields: import("dist/packages/types/src").UserProfile;
+    unauthenticatedUser: import("dist/packages/types/src").UserProfile;
     user?: undefined;
 } | {
     user: import("dist/packages/types/src").UserProfile | undefined;
-    userWithMissingFields?: undefined;
+    unauthenticatedUser?: undefined;
 };

package/src/lib/store/hooks/useUser/useUser.js

@@ -3,15 +3,16 @@ import { getStore } from '../../store.js';
 import { useStoreWithSelector } from '../useStoreWithSelector/useStoreWithSelector.js';
 
 const useUser = () => {
-    var _a;
+    var _a, _b;
     const userFromStore = useStoreWithSelector(getStore(), ({ user }) => user);
-    // adding userWithMissingFields to avoid breaking changes for customer who consider that when we have a user,
-    // it means that they already moved passed onboarding.
+    // adding unauthenticatedUser to avoid breaking changes for customer who consider that when we have a user,
+    // it means that they are already fully authenticated.
     // since we won't have onboarding jwt anymore, the idea is to just store the user in LS and either use the user state
-    // or userWithMissingFields, depending on the value of missing fields
+    // or unauthenticatedUser, depending on the value of missing fields or mfa required.
     // this is just following our existing logic of how we handle authToken vs onboardingOnlyToken.
-    if ((_a = userFromStore === null || userFromStore === void 0 ? void 0 : userFromStore.missingFields) === null || _a === void 0 ? void 0 : _a.length) {
-        return { userWithMissingFields: userFromStore };
+    if (((_a = userFromStore === null || userFromStore === void 0 ? void 0 : userFromStore.missingFields) === null || _a === void 0 ? void 0 : _a.length) ||
+        ((_b = userFromStore === null || userFromStore === void 0 ? void 0 : userFromStore.scope) === null || _b === void 0 ? void 0 : _b.includes('requiresAdditionalAuth'))) {
+        return { unauthenticatedUser: userFromStore };
     }
     return { user: userFromStore };
 };

package/src/lib/store/index.d.ts

@@ -1,4 +1,6 @@
-export * from './actions/userActions';
+export * from './actions/projectSettingsActions';
 export * from './actions/storeActions';
+export * from './actions/userActions';
 export * from './hooks/useUser';
+export * from './hooks/useProjectSettings';
 export { initializeStore } from './store';

package/src/lib/store/store.cjs

@@ -8,6 +8,7 @@ var localStorage$1 = require('../utils/constants/localStorage.cjs');
 require('../utils/constants/colors.cjs');
 require('../utils/constants/values.cjs');
 var syncLegacyStorage = require('./utils/syncLegacyStorage/syncLegacyStorage.cjs');
+var clearExpiredData = require('./utils/clearExpiredData/clearExpiredData.cjs');
 
 let store;
 const getStore = () => {
@@ -16,7 +17,7 @@ const getStore = () => {
     }
     return store;
 };
-const initializeStore = ({ storageSuffix, } = {}) => {
+const initializeStore = ({ storageSuffix, environmentId, }) => {
     if (store) {
         return;
     }
@@ -27,9 +28,11 @@ const initializeStore = ({ storageSuffix, } = {}) => {
         name: persistName,
         storage: getStorage(),
     });
-    store = syncLegacyStorage.syncLegacyStorage(persist(store$1.createStore(() => ({
+    store = clearExpiredData.clearExpiredData(syncLegacyStorage.syncLegacyStorage(persist(store$1.createStore(() => ({
+        environmentId,
+        projectSettings: undefined,
         user: undefined,
-    }))));
+    })))));
 };
 const getStorage = () => {
     if (typeof localStorage === 'undefined') {

package/src/lib/store/store.d.ts

@@ -1,6 +1,4 @@
 import { StoreApi } from '@dynamic-labs/store';
-import { SdkStore } from './types';
+import { SdkStore, SdkStoreProps } from './types';
 export declare const getStore: () => StoreApi<SdkStore>;
-export declare const initializeStore: ({ storageSuffix, }?: {
-    storageSuffix?: string;
-}) => void;
+export declare const initializeStore: ({ storageSuffix, environmentId, }: SdkStoreProps) => void;

package/src/lib/store/store.js

@@ -4,6 +4,7 @@ import { STORE_STORAGE_KEY } from '../utils/constants/localStorage.js';
 import '../utils/constants/colors.js';
 import '../utils/constants/values.js';
 import { syncLegacyStorage } from './utils/syncLegacyStorage/syncLegacyStorage.js';
+import { clearExpiredData } from './utils/clearExpiredData/clearExpiredData.js';
 
 let store;
 const getStore = () => {
@@ -12,7 +13,7 @@ const getStore = () => {
     }
     return store;
 };
-const initializeStore = ({ storageSuffix, } = {}) => {
+const initializeStore = ({ storageSuffix, environmentId, }) => {
     if (store) {
         return;
     }
@@ -23,9 +24,11 @@ const initializeStore = ({ storageSuffix, } = {}) => {
         name: persistName,
         storage: getStorage(),
     });
-    store = syncLegacyStorage(persist(createStore(() => ({
+    store = clearExpiredData(syncLegacyStorage(persist(createStore(() => ({
+        environmentId,
+        projectSettings: undefined,
         user: undefined,
-    }))));
+    })))));
 };
 const getStorage = () => {
     if (typeof localStorage === 'undefined') {

package/src/lib/store/types.d.ts

@@ -1,4 +1,15 @@
+import { ProjectSettings } from '@dynamic-labs/sdk-api-core';
 import { UserProfile } from '@dynamic-labs/types';
+export type SdkStoreProps = {
+    environmentId: string;
+    storageSuffix?: string;
+};
 export type SdkStore = {
+    environmentId: string | undefined;
     user: UserProfile | undefined;
+    projectSettings: StoredProjectSettings | undefined;
+};
+export type StoredProjectSettings = {
+    expiresAt: number;
+    settings: ProjectSettings;
 };

package/src/lib/store/utils/clearExpiredData/clearExpiredData.cjs

@@ -0,0 +1,14 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const clearExpiredData = (store) => {
+    const { projectSettings } = store.getState();
+    if (projectSettings && projectSettings.expiresAt < Date.now()) {
+        store.setState({ projectSettings: undefined });
+    }
+    return store;
+};
+
+exports.clearExpiredData = clearExpiredData;

package/src/lib/store/utils/clearExpiredData/clearExpiredData.d.ts

@@ -0,0 +1,3 @@
+import { StoreApi } from '@dynamic-labs/store';
+import { SdkStore } from '../../types';
+export declare const clearExpiredData: (store: StoreApi<SdkStore>) => StoreApi<SdkStore>;

package/src/lib/store/utils/clearExpiredData/clearExpiredData.js

@@ -0,0 +1,10 @@
+'use client'
+const clearExpiredData = (store) => {
+    const { projectSettings } = store.getState();
+    if (projectSettings && projectSettings.expiresAt < Date.now()) {
+        store.setState({ projectSettings: undefined });
+    }
+    return store;
+};
+
+export { clearExpiredData };

package/src/lib/store/utils/clearExpiredData/index.d.ts

@@ -0,0 +1 @@
+export { clearExpiredData } from './clearExpiredData';

package/src/lib/store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs

@@ -24,8 +24,8 @@ var index = require('../../../utils/functions/storeAuthToken/index.cjs');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../locale/locale.cjs');
 var userActions = require('../../actions/userActions/userActions.cjs');
+require('../../../locale/locale.cjs');
 
 const storeAuthTokenAndUser = ({ user, jwt, minifiedJwt, }) => {
     if (jwt && minifiedJwt) {

package/src/lib/store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js

@@ -20,8 +20,8 @@ import { storeAuthToken } from '../../../utils/functions/storeAuthToken/index.js
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
-import '../../../locale/locale.js';
 import { setUser } from '../../actions/userActions/userActions.js';
+import '../../../locale/locale.js';
 
 const storeAuthTokenAndUser = ({ user, jwt, minifiedJwt, }) => {
     if (jwt && minifiedJwt) {