@dynamic-labs/sdk-react-core 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+### [1.4.1](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.0...v1.4.1) (2024-03-22)
+
+
+### Bug Fixes
+
+* validate user session whenever user is connected/authenticated ([#5079](https://github.com/dynamic-labs/DynamicAuth/issues/5079)) ([d346cef](https://github.com/dynamic-labs/DynamicAuth/commit/d346cefb027305e43020b2a3b48a83bafeae4131))
+
 ## [1.4.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.3.1...v1.4.0) (2024-03-21)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.4.0";
+var version = "1.4.1";
 var dependencies = {
 	"@dynamic-labs/sdk-api": "0.0.387",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,4 +1,4 @@
-var version = "1.4.0";
+var version = "1.4.1";
 var dependencies = {
 	"@dynamic-labs/sdk-api": "0.0.387",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,16 +16,16 @@
     "react-focus-lock": "2.9.2",
     "react-i18next": "^13.2.0",
     "yup": "0.32.11",
-    "@dynamic-labs/ethereum": "1.4.0",
-    "@dynamic-labs/iconic": "1.4.0",
-    "@dynamic-labs/logger": "1.4.0",
-    "@dynamic-labs/multi-wallet": "1.4.0",
-    "@dynamic-labs/rpc-providers": "1.4.0",
-    "@dynamic-labs/types": "1.4.0",
-    "@dynamic-labs/utils": "1.4.0",
-    "@dynamic-labs/viem-utils": "1.4.0",
-    "@dynamic-labs/wallet-book": "1.4.0",
-    "@dynamic-labs/wallet-connector-core": "1.4.0",
+    "@dynamic-labs/ethereum": "1.4.1",
+    "@dynamic-labs/iconic": "1.4.1",
+    "@dynamic-labs/logger": "1.4.1",
+    "@dynamic-labs/multi-wallet": "1.4.1",
+    "@dynamic-labs/rpc-providers": "1.4.1",
+    "@dynamic-labs/types": "1.4.1",
+    "@dynamic-labs/utils": "1.4.1",
+    "@dynamic-labs/viem-utils": "1.4.1",
+    "@dynamic-labs/wallet-book": "1.4.1",
+    "@dynamic-labs/wallet-connector-core": "1.4.1",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

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

@@ -244,13 +244,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         user,
         walletConnectorOptions,
     });
-    // Ties all client callbacks to dynamic's events, such that
-    // when our events are triggered, so are the client callbacks
-    useTieCallbacksToEvents.useTieCallbacksToEvents({
-        clientCallbacks: eventsCallbacks,
-        connectedWallets,
-        user,
-    });
     React.useEffect(() => {
         const missingChains = getMissingChains.getMissingChains(bridgeChains, connectedWalletsInfo);
         setBridgeChainsToConnect(missingChains);
@@ -335,7 +328,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
                 ? 2
                 : 1;
     }
-    useValidateSession.useValidateSession({
+    const { setHasLoggedOut } = useValidateSession.useValidateSession({
         authToken,
         handleLogOut,
         user,
@@ -343,6 +336,14 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         walletConnectors,
         wcVersion,
     });
+    // Ties all client callbacks to dynamic's events, such that
+    // when our events are triggered, so are the client callbacks
+    useTieCallbacksToEvents.useTieCallbacksToEvents({
+        clientCallbacks: eventsCallbacks,
+        connectedWallets,
+        setHasLoggedOut,
+        user,
+    });
     const handleUnlinkWallet = useHandleUnlinkWallet.useHandleUnlinkWallet({
         environmentId,
         eventsCallbacks,
@@ -386,6 +387,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         isAuthenticated,
         primaryWallet,
         secondaryWallets,
+        setHasLoggedOut,
         setIsVerificationInProgress,
         user,
     });

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

@@ -240,13 +240,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         user,
         walletConnectorOptions,
     });
-    // Ties all client callbacks to dynamic's events, such that
-    // when our events are triggered, so are the client callbacks
-    useTieCallbacksToEvents({
-        clientCallbacks: eventsCallbacks,
-        connectedWallets,
-        user,
-    });
     useEffect(() => {
         const missingChains = getMissingChains(bridgeChains, connectedWalletsInfo);
         setBridgeChainsToConnect(missingChains);
@@ -331,7 +324,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
                 ? 2
                 : 1;
     }
-    useValidateSession({
+    const { setHasLoggedOut } = useValidateSession({
         authToken,
         handleLogOut,
         user,
@@ -339,6 +332,14 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         walletConnectors,
         wcVersion,
     });
+    // Ties all client callbacks to dynamic's events, such that
+    // when our events are triggered, so are the client callbacks
+    useTieCallbacksToEvents({
+        clientCallbacks: eventsCallbacks,
+        connectedWallets,
+        setHasLoggedOut,
+        user,
+    });
     const handleUnlinkWallet = useHandleUnlinkWallet({
         environmentId,
         eventsCallbacks,
@@ -382,6 +383,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         isAuthenticated,
         primaryWallet,
         secondaryWallets,
+        setHasLoggedOut,
         setIsVerificationInProgress,
         user,
     });

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

@@ -72,7 +72,7 @@ require('../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGa
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 
 /** Ties the customer callbacks to our events, such that our events will also trigger the callbacks */
-const useTieCallbacksToEvents = ({ clientCallbacks, connectedWallets, user, }) => {
+const useTieCallbacksToEvents = ({ clientCallbacks, connectedWallets, user, setHasLoggedOut, }) => {
     useDynamicEvents.useInternalDynamicEvents('emailVerificationResult', (result, email) => {
         var _a, _b;
         if (result)
@@ -92,6 +92,7 @@ const useTieCallbacksToEvents = ({ clientCallbacks, connectedWallets, user, }) =
     useDynamicEvents.useInternalDynamicEvents('walletConnected', (wallet) => {
         var _a;
         (_a = clientCallbacks === null || clientCallbacks === void 0 ? void 0 : clientCallbacks.onConnect) === null || _a === void 0 ? void 0 : _a.call(clientCallbacks, { wallet, walletConnector: wallet.connector });
+        setHasLoggedOut(false);
     });
     useDynamicEvents.useInternalDynamicEvents('logout', () => {
         var _a;

package/src/lib/context/DynamicContext/hooks/useTieCallbacksToEvents/useTieCallbacksToEvents.d.ts

@@ -1,8 +1,10 @@
+import { Dispatch, SetStateAction } from 'react';
 import { DynamicEventsCallbacks, UserProfile, Wallet } from '../../../../shared';
 export type UseTieCallbacksToEventsParams = {
     clientCallbacks: DynamicEventsCallbacks | undefined;
     connectedWallets: Wallet[];
     user: UserProfile | undefined;
+    setHasLoggedOut: Dispatch<SetStateAction<boolean>>;
 };
 /** Ties the customer callbacks to our events, such that our events will also trigger the callbacks */
-export declare const useTieCallbacksToEvents: ({ clientCallbacks, connectedWallets, user, }: UseTieCallbacksToEventsParams) => void;
+export declare const useTieCallbacksToEvents: ({ clientCallbacks, connectedWallets, user, setHasLoggedOut, }: UseTieCallbacksToEventsParams) => void;

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

@@ -68,7 +68,7 @@ import '../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGas
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
 /** Ties the customer callbacks to our events, such that our events will also trigger the callbacks */
-const useTieCallbacksToEvents = ({ clientCallbacks, connectedWallets, user, }) => {
+const useTieCallbacksToEvents = ({ clientCallbacks, connectedWallets, user, setHasLoggedOut, }) => {
     useInternalDynamicEvents('emailVerificationResult', (result, email) => {
         var _a, _b;
         if (result)
@@ -88,6 +88,7 @@ const useTieCallbacksToEvents = ({ clientCallbacks, connectedWallets, user, }) =
     useInternalDynamicEvents('walletConnected', (wallet) => {
         var _a;
         (_a = clientCallbacks === null || clientCallbacks === void 0 ? void 0 : clientCallbacks.onConnect) === null || _a === void 0 ? void 0 : _a.call(clientCallbacks, { wallet, walletConnector: wallet.connector });
+        setHasLoggedOut(false);
     });
     useInternalDynamicEvents('logout', () => {
         var _a;

package/src/lib/context/DynamicContext/useCustomerCallbacks/types.d.ts

@@ -1,3 +1,4 @@
+import { Dispatch, SetStateAction } from 'react';
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
 import { OnAuthSuccess, OnEmbeddedWalletCreated, OnLinkSuccess, OnUserProfileUpdate, UserProfile, Wallet } from '../../../shared/types';
 import { IDynamicContext } from '../types';
@@ -21,6 +22,7 @@ export type UseCustomerCallbacksArgs = {
     primaryWallet: Wallet | null;
     secondaryWallets: Wallet[];
     user: UserProfile | undefined;
+    setHasLoggedOut: Dispatch<SetStateAction<boolean>>;
     setIsVerificationInProgress: IDynamicContext['setIsVerificationInProgress'];
 };
 export type SetCallbackType = (callback: Callback, params?: CallbackParams) => void;

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

@@ -21,7 +21,7 @@ require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
 require('viem/chains');
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, setHasLoggedOut, }) => {
     const [callbackQueue, setCallbackQueue] = React.useState([]);
     /** Gets the wallet from its id */
     const getWallet = React.useCallback((id) => {
@@ -44,6 +44,7 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
                         user,
                         walletConnector: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector,
                     });
+                    setHasLoggedOut(false);
                 }
                 catch (e) {
                     logger.logger.error('Error calling onAuthSuccess: ', e);
@@ -92,6 +93,7 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         onLinkSuccess,
         onUserProfileUpdate,
         primaryWallet,
+        setHasLoggedOut,
         setIsVerificationInProgress,
     ]);
     React.useEffect(() => {

package/src/lib/context/DynamicContext/useCustomerCallbacks/useCustomerCallbacks.d.ts

@@ -1,4 +1,4 @@
 import { SetCallbackType, UseCustomerCallbacksArgs } from './types';
-export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, }: UseCustomerCallbacksArgs) => {
+export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, setHasLoggedOut, }: UseCustomerCallbacksArgs) => {
     setCallback: SetCallbackType;
 };

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

@@ -17,7 +17,7 @@ import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
 import 'viem/chains';
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, setHasLoggedOut, }) => {
     const [callbackQueue, setCallbackQueue] = useState([]);
     /** Gets the wallet from its id */
     const getWallet = useCallback((id) => {
@@ -40,6 +40,7 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
                         user,
                         walletConnector: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector,
                     });
+                    setHasLoggedOut(false);
                 }
                 catch (e) {
                     logger.error('Error calling onAuthSuccess: ', e);
@@ -88,6 +89,7 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         onLinkSuccess,
         onUserProfileUpdate,
         primaryWallet,
+        setHasLoggedOut,
         setIsVerificationInProgress,
     ]);
     useEffect(() => {

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

@@ -20,9 +20,6 @@ require('../../../shared/consts/index.cjs');
 
 const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
     const [hasLoggedOut, setHasLoggedOut] = React.useState(false);
-    if (hasLoggedOut) {
-        return;
-    }
     const logout = (reason, params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setHasLoggedOut(true);
         logger.logger.debug(`Logging out - Reason: ${reason}`, Object.assign({}, params));
@@ -77,9 +74,15 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
             oldVersion: hasWCV1Data ? 1 : 2,
         });
     });
-    handleUserDataOutOfSync();
-    handleConnectorBridgeOutOfSync();
-    handleConnectorVersionOutOfSync();
+    const validate = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        yield handleUserDataOutOfSync();
+        yield handleConnectorBridgeOutOfSync();
+        yield handleConnectorVersionOutOfSync();
+    });
+    if (!hasLoggedOut) {
+        validate();
+    }
+    return { setHasLoggedOut };
 };
 
 exports.useValidateSession = useValidateSession;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { UserProfile } from '../../../shared';
 import { WalletConnector } from '../../../..';
 type Props = {
@@ -8,5 +9,7 @@ type Props = {
     walletConnectors: WalletConnector[] | undefined;
     wcVersion: number | undefined;
 };
-export declare const useValidateSession: ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }: Props) => void;
+export declare const useValidateSession: ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }: Props) => {
+    setHasLoggedOut: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+};
 export {};

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

@@ -16,9 +16,6 @@ import '../../../shared/consts/index.js';
 
 const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
     const [hasLoggedOut, setHasLoggedOut] = useState(false);
-    if (hasLoggedOut) {
-        return;
-    }
     const logout = (reason, params) => __awaiter(void 0, void 0, void 0, function* () {
         setHasLoggedOut(true);
         logger.debug(`Logging out - Reason: ${reason}`, Object.assign({}, params));
@@ -73,9 +70,15 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
             oldVersion: hasWCV1Data ? 1 : 2,
         });
     });
-    handleUserDataOutOfSync();
-    handleConnectorBridgeOutOfSync();
-    handleConnectorVersionOutOfSync();
+    const validate = () => __awaiter(void 0, void 0, void 0, function* () {
+        yield handleUserDataOutOfSync();
+        yield handleConnectorBridgeOutOfSync();
+        yield handleConnectorVersionOutOfSync();
+    });
+    if (!hasLoggedOut) {
+        validate();
+    }
+    return { setHasLoggedOut };
 };
 
 export { useValidateSession };