@dynamic-labs/sdk-react-core 3.9.12 → 3.9.13

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [3.9.13](https://github.com/dynamic-labs/DynamicAuth/compare/v3.9.12...v3.9.13) (2025-02-25)
+
+
+### Bug Fixes
+
+* refresh user from valid token when user is missing from storage ([#8142](https://github.com/dynamic-labs/DynamicAuth/issues/8142)) ([b468815](https://github.com/dynamic-labs/DynamicAuth/commit/b4688156d005d77d1db8da4c4b2ef714da8e7e81))
+
 ### [3.9.12](https://github.com/dynamic-labs/DynamicAuth/compare/v3.9.11...v3.9.12) (2025-02-21)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "3.9.12";
+var version = "3.9.13";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.586",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "3.9.12";
+var version = "3.9.13";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.586",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "3.9.12",
+  "version": "3.9.13",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,16 +17,16 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/assert-package-version": "3.9.12",
-    "@dynamic-labs/iconic": "3.9.12",
-    "@dynamic-labs/logger": "3.9.12",
-    "@dynamic-labs/multi-wallet": "3.9.12",
-    "@dynamic-labs/rpc-providers": "3.9.12",
-    "@dynamic-labs/store": "3.9.12",
-    "@dynamic-labs/types": "3.9.12",
-    "@dynamic-labs/utils": "3.9.12",
-    "@dynamic-labs/wallet-book": "3.9.12",
-    "@dynamic-labs/wallet-connector-core": "3.9.12",
+    "@dynamic-labs/assert-package-version": "3.9.13",
+    "@dynamic-labs/iconic": "3.9.13",
+    "@dynamic-labs/logger": "3.9.13",
+    "@dynamic-labs/multi-wallet": "3.9.13",
+    "@dynamic-labs/rpc-providers": "3.9.13",
+    "@dynamic-labs/store": "3.9.13",
+    "@dynamic-labs/types": "3.9.13",
+    "@dynamic-labs/utils": "3.9.13",
+    "@dynamic-labs/wallet-book": "3.9.13",
+    "@dynamic-labs/wallet-connector-core": "3.9.13",
     "bs58": "5.0.0",
     "eventemitter3": "5.0.1"
   },

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -67,9 +67,9 @@ var useSetWalletConnectorFetchers = require('../../utils/hooks/useSetWalletConne
 var useSendDynamicProps = require('../../utils/hooks/useSendDynamicProps/useSendDynamicProps.cjs');
 require('../../store/state/tokenBalances.cjs');
 var WalletGroupContext = require('../WalletGroupContext/WalletGroupContext.cjs');
-var useResetCookieLocalStorage = require('../../utils/hooks/useResetCookieLocalStorage/useResetCookieLocalStorage.cjs');
 require('../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useAggregateWalletEvents = require('../../utils/hooks/useAggregateWalletEvents/useAggregateWalletEvents.cjs');
+var useRefreshUserState = require('../../utils/hooks/useRefreshUserState/useRefreshUserState.cjs');
 require('../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../components/IconButton/IconButton.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
@@ -355,9 +355,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings: settings$1, lo
         environmentId,
         handleLogOut,
     });
-    const { isLoading: isLoadingUserFromCookie } = useResetCookieLocalStorage.useResetCookieLocalStorage({
-        environmentId,
-        projectSettings: projectSettings$1,
+    const { isLoading: isLoadingUserFromCookie } = useRefreshUserState.useRefreshUserState({
         setPrimaryWalletId,
     });
     const sdkHasLoaded = useGlobalLoading.useGlobalLoading({

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -63,9 +63,9 @@ import { useSetWalletConnectorFetchers } from '../../utils/hooks/useSetWalletCon
 import { useSendDynamicProps } from '../../utils/hooks/useSendDynamicProps/useSendDynamicProps.js';
 import '../../store/state/tokenBalances.js';
 import { WalletGroupContextProvider } from '../WalletGroupContext/WalletGroupContext.js';
-import { useResetCookieLocalStorage } from '../../utils/hooks/useResetCookieLocalStorage/useResetCookieLocalStorage.js';
 import '../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useAggregateWalletEvents } from '../../utils/hooks/useAggregateWalletEvents/useAggregateWalletEvents.js';
+import { useRefreshUserState } from '../../utils/hooks/useRefreshUserState/useRefreshUserState.js';
 import '../../components/ShadowDOM/ShadowDOM.js';
 import '../../components/IconButton/IconButton.js';
 import '../../components/InlineWidget/InlineWidget.js';
@@ -351,9 +351,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, enable
         environmentId,
         handleLogOut,
     });
-    const { isLoading: isLoadingUserFromCookie } = useResetCookieLocalStorage({
-        environmentId,
-        projectSettings,
+    const { isLoading: isLoadingUserFromCookie } = useRefreshUserState({
         setPrimaryWalletId,
     });
     const sdkHasLoaded = useGlobalLoading({

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

@@ -60,7 +60,6 @@ export { useSyncOnboardingFlow } from './useSyncOnboardingFlow';
 export { useExternalAuth } from './useExternalAuth';
 export { useRefreshUser } from './useRefreshUser';
 export { useWalletOptions } from './useWalletOptions';
-export { useResetCookieLocalStorage } from './useResetCookieLocalStorage';
 export { useSyncMfaFlow } from './useSyncMfaFlow';
 export * from './useSmartWallets';
 export { useEmbeddedWalletSessionKeys } from './useEmbeddedWalletSessionKeys';
@@ -69,3 +68,4 @@ export { useDebounce } from './useDebounce';
 export * from './useEmbeddedWallet';
 export { useUpgradeEmbeddedWallet } from './useUpgradeEmbeddedWallet';
 export { useAggregateWalletEvents } from './useAggregateWalletEvents';
+export { useRefreshUserState } from './useRefreshUserState';

package/src/lib/utils/hooks/useRefreshUserState/index.d.ts

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

package/src/lib/utils/hooks/{useResetCookieLocalStorage/useResetCookieLocalStorage.cjs → useRefreshUserState/useRefreshUserState.cjs}

@@ -18,6 +18,7 @@ require('../../constants/values.cjs');
 require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
+var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
 var user = require('../../../store/state/user/user.cjs');
@@ -25,11 +26,14 @@ require('../../../locale/locale.cjs');
 var user$1 = require('../../../data/api/user/user.cjs');
 var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.cjs');
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
+var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
+var environmentId = require('../../../store/state/environmentId.cjs');
 
-const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimaryWalletId, }) => {
+const useRefreshUserState = ({ setPrimaryWalletId, }) => {
     const [isLoading, setIsLoading] = React.useState(true);
     const didRefreshUserRef = React.useRef(false);
-    const user$2 = user.getUser();
+    const environmentId$1 = environmentId.useEnvironmentId();
+    const projectSettings$1 = projectSettings.useProjectSettings();
     /**
      * As an extra layer of safety, we must explicitly prevent the refresh from being called
      * after a logout
@@ -56,36 +60,50 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
          * so attempt to set it here.
          */
         const maybeInitUserRefresh = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            if (!user$2 && isCookieEnabled.isCookieEnabled() && !hasLoggedOut.current) {
+            const mustRefreshUser = (() => {
+                // if user is present, we dont need to refresh anything
+                if (user.getUser())
+                    return false;
+                // if the user has logged out, we dont need to refresh anything
+                if (hasLoggedOut.current)
+                    return false;
+                // should run if cookie is enabled and no user is present
+                if (projectSettings$1 && isCookieEnabled.isCookieEnabled())
+                    return true;
+                // should run if auth token is present but no user is present and cookie is not enabled
+                return Boolean(getAuthToken.getAuthToken());
+            })();
+            if (mustRefreshUser) {
                 // Disable all next calls to this method
                 didRefreshUserRef.current = true;
                 try {
-                    const user = yield user$1.refreshUserJwt({ environmentId });
+                    const user = yield user$1.refreshUserJwt({ environmentId: environmentId$1 });
                     /**
                      * attempt to set primary wallet in this subdomain because LS does not
                      * carry over between different subdomains, even if the cookie does
                      */
                     const lastVerifiedWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => vc.format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain &&
                         vc.id === user.lastVerifiedCredentialId);
-                    if (lastVerifiedWallet)
+                    if (lastVerifiedWallet) {
                         setPrimaryWalletId(lastVerifiedWallet.id);
+                    }
                 }
                 catch (e) {
-                    logger.logger.debug('Ignore failed refreshUserJwt in useResetCookieLocalStorage');
+                    logger.logger.debug('Ignore failed refreshUserJwt in useRefreshUserState');
                 }
             }
-            if (projectSettings) {
+            if (projectSettings$1) {
                 // only set to false if projectSettings are available,
                 // otherwise isCookieEnabled might be a false negative
                 setIsLoading(false);
             }
         });
-        // Ensure this effect only runs once
-        if (didRefreshUserRef.current)
+        // Ensure this effect only runs once projectSettings is available
+        if (didRefreshUserRef.current || !projectSettings$1)
             return;
         maybeInitUserRefresh();
-    }, [user$2, projectSettings, environmentId, setPrimaryWalletId]);
+    }, [projectSettings$1, environmentId$1, setPrimaryWalletId]);
     return { isLoading };
 };
 
-exports.useResetCookieLocalStorage = useResetCookieLocalStorage;
+exports.useRefreshUserState = useRefreshUserState;

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

@@ -0,0 +1,7 @@
+type RefreshUserStateProps = {
+    setPrimaryWalletId(walletId: string): void;
+};
+export declare const useRefreshUserState: ({ setPrimaryWalletId, }: RefreshUserStateProps) => {
+    isLoading: boolean;
+};
+export {};

package/src/lib/utils/hooks/{useResetCookieLocalStorage/useResetCookieLocalStorage.js → useRefreshUserState/useRefreshUserState.js}

@@ -14,6 +14,7 @@ import '../../constants/values.js';
 import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
+import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
 import '../../../config/ApiEndpoint.js';
 import { getUser } from '../../../store/state/user/user.js';
@@ -21,11 +22,14 @@ import '../../../locale/locale.js';
 import { refreshUserJwt } from '../../../data/api/user/user.js';
 import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled.js';
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
+import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
+import { useEnvironmentId } from '../../../store/state/environmentId.js';
 
-const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimaryWalletId, }) => {
+const useRefreshUserState = ({ setPrimaryWalletId, }) => {
     const [isLoading, setIsLoading] = useState(true);
     const didRefreshUserRef = useRef(false);
-    const user = getUser();
+    const environmentId = useEnvironmentId();
+    const projectSettings = useProjectSettings();
     /**
      * As an extra layer of safety, we must explicitly prevent the refresh from being called
      * after a logout
@@ -52,7 +56,20 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
          * so attempt to set it here.
          */
         const maybeInitUserRefresh = () => __awaiter(void 0, void 0, void 0, function* () {
-            if (!user && isCookieEnabled() && !hasLoggedOut.current) {
+            const mustRefreshUser = (() => {
+                // if user is present, we dont need to refresh anything
+                if (getUser())
+                    return false;
+                // if the user has logged out, we dont need to refresh anything
+                if (hasLoggedOut.current)
+                    return false;
+                // should run if cookie is enabled and no user is present
+                if (projectSettings && isCookieEnabled())
+                    return true;
+                // should run if auth token is present but no user is present and cookie is not enabled
+                return Boolean(getAuthToken());
+            })();
+            if (mustRefreshUser) {
                 // Disable all next calls to this method
                 didRefreshUserRef.current = true;
                 try {
@@ -63,11 +80,12 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
                      */
                     const lastVerifiedWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((vc) => vc.format === JwtVerifiedCredentialFormatEnum.Blockchain &&
                         vc.id === user.lastVerifiedCredentialId);
-                    if (lastVerifiedWallet)
+                    if (lastVerifiedWallet) {
                         setPrimaryWalletId(lastVerifiedWallet.id);
+                    }
                 }
                 catch (e) {
-                    logger.debug('Ignore failed refreshUserJwt in useResetCookieLocalStorage');
+                    logger.debug('Ignore failed refreshUserJwt in useRefreshUserState');
                 }
             }
             if (projectSettings) {
@@ -76,12 +94,12 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
                 setIsLoading(false);
             }
         });
-        // Ensure this effect only runs once
-        if (didRefreshUserRef.current)
+        // Ensure this effect only runs once projectSettings is available
+        if (didRefreshUserRef.current || !projectSettings)
             return;
         maybeInitUserRefresh();
-    }, [user, projectSettings, environmentId, setPrimaryWalletId]);
+    }, [projectSettings, environmentId, setPrimaryWalletId]);
     return { isLoading };
 };
 
-export { useResetCookieLocalStorage };
+export { useRefreshUserState };

package/src/lib/utils/hooks/useResetCookieLocalStorage/index.d.ts

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

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

@@ -1,10 +0,0 @@
-import { ProjectSettings } from '@dynamic-labs/sdk-api-core';
-type Props = {
-    environmentId: string;
-    projectSettings: ProjectSettings | undefined;
-    setPrimaryWalletId(walletId: string): void;
-};
-export declare const useResetCookieLocalStorage: ({ environmentId, projectSettings, setPrimaryWalletId, }: Props) => {
-    isLoading: boolean;
-};
-export {};