@dynamic-labs/sdk-react-core 0.18.0-RC.14 → 0.18.0-RC.16

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

@@ -12,8 +12,9 @@ require('../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../utils/constants/colors.cjs');
-var localStorage = require('../../shared/utils/classes/storage/localStorage.cjs');
+require('../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
+var getAuthToken = require('../../utils/functions/getAuthToken/getAuthToken.cjs');
 
 let logoutTimer;
 const isAuthTokenExpired = (token) => {
@@ -32,7 +33,7 @@ const isAuthTokenExpired = (token) => {
     return false;
 };
 const initExpirationTime = (logout) => {
-    const decodedJwt = decodeJwt.decodeJwt(localStorage.LocalStorage.getAuthTokenValue());
+    const decodedJwt = decodeJwt.decodeJwt(getAuthToken.getAuthToken());
     if (!decodedJwt)
         return clearTimeout(logoutTimer);
     const tokenExp = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.exp;
@@ -53,14 +54,14 @@ const initExpirationTime = (logout) => {
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
 };
-const getInitialView = ({ loginWithEmail, isBridgeFlow, isUserConnected, }) => {
+const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isUserConnected, }) => {
     if (loginWithEmail) {
         return 'login-with-email-or-wallet';
     }
     if (isUserConnected) {
         return 'wallet-list';
     }
-    if (isBridgeFlow) {
+    if (isBridgeFlow && !connectedWallets.length) {
         return 'bridge-welcome';
     }
     return 'wallet-list';

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

@@ -1,7 +1,9 @@
+import { Wallet } from '../../shared';
 import { ViewType } from '../ViewContext';
 export declare const isAuthTokenExpired: (token: string) => boolean;
 export declare const initExpirationTime: (logout: VoidFunction) => void;
-export declare const getInitialView: ({ loginWithEmail, isBridgeFlow, isUserConnected, }: {
+export declare const getInitialView: ({ connectedWallets, loginWithEmail, isBridgeFlow, isUserConnected, }: {
+    connectedWallets: Wallet[];
     loginWithEmail: boolean;
     isBridgeFlow: boolean;
     isUserConnected: boolean;

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

@@ -8,8 +8,9 @@ import '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../utils/constants/colors.js';
-import { LocalStorage } from '../../shared/utils/classes/storage/localStorage.js';
+import '../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
+import { getAuthToken } from '../../utils/functions/getAuthToken/getAuthToken.js';
 
 let logoutTimer;
 const isAuthTokenExpired = (token) => {
@@ -28,7 +29,7 @@ const isAuthTokenExpired = (token) => {
     return false;
 };
 const initExpirationTime = (logout) => {
-    const decodedJwt = decodeJwt(LocalStorage.getAuthTokenValue());
+    const decodedJwt = decodeJwt(getAuthToken());
     if (!decodedJwt)
         return clearTimeout(logoutTimer);
     const tokenExp = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.exp;
@@ -49,14 +50,14 @@ const initExpirationTime = (logout) => {
     const expiryTimeout = Math.min(expirationTimeInMs, 2147483647);
     logoutTimer = setTimeout(logout, expiryTimeout);
 };
-const getInitialView = ({ loginWithEmail, isBridgeFlow, isUserConnected, }) => {
+const getInitialView = ({ connectedWallets, loginWithEmail, isBridgeFlow, isUserConnected, }) => {
     if (loginWithEmail) {
         return 'login-with-email-or-wallet';
     }
     if (isUserConnected) {
         return 'wallet-list';
     }
-    if (isBridgeFlow) {
+    if (isBridgeFlow && !connectedWallets.length) {
         return 'bridge-welcome';
     }
     return 'wallet-list';

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

@@ -12,4 +12,5 @@ export type UseCustomerCallbacksArgs = {
     isAuthenticated: boolean;
     primaryWallet: Wallet | null;
     user: UserProfile | undefined;
+    connectedWallets: Wallet[];
 };

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

@@ -19,7 +19,7 @@ require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
 var isConnectOnly = require('../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.cjs');
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, connectedWallets, }) => {
     const [callbackQueue, setCallbackQueue] = React.useState([]);
     const isConnectOnlyAndCallbackIsConnectSuccess = React.useCallback((next) => isConnectOnly.isConnectOnly(user, authMode) && next === 'connectSuccess', [authMode, user]);
     React.useEffect(() => {

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

@@ -1,4 +1,4 @@
-import { Callback, UseCustomerCallbacksArgs } from './types';
-export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, }: UseCustomerCallbacksArgs) => {
+import type { Callback, UseCustomerCallbacksArgs } from './types';
+export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, connectedWallets, }: UseCustomerCallbacksArgs) => {
     setCallback: (callback: Callback) => void;
 };

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

@@ -15,7 +15,7 @@ import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
 import { isConnectOnly } from '../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.js';
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnectSuccess, }, handleLogOut, primaryWallet, user, isAuthenticated, authMode, connectedWallets, }) => {
     const [callbackQueue, setCallbackQueue] = useState([]);
     const isConnectOnlyAndCallbackIsConnectSuccess = useCallback((next) => isConnectOnly(user, authMode) && next === 'connectSuccess', [authMode, user]);
     useEffect(() => {

package/src/lib/shared/types/index.d.ts

@@ -10,6 +10,7 @@ export type Wallet = {
     connected: boolean;
     connector: WalletConnector;
     id: string;
+    network?: string | number;
 };
 export type WalletAction = 'select' | 'unlink';
 export type WalletWithAction = {

package/src/lib/shared/utils/classes/storage/localStorage.cjs

@@ -6,46 +6,50 @@ var localStorage = require('../../../../utils/constants/localStorage.cjs');
 require('../../../../utils/constants/colors.cjs');
 var logger = require('../../../logger.cjs');
 
+const connectedKeys = {
+    [localStorage.AUTH_TOKEN]: [localStorage.AUTH_USER],
+    [localStorage.AUTH_USER]: [localStorage.AUTH_TOKEN],
+};
 class LocalStorage {
     static getDynamicLSKey(key) {
         return `${key}${LocalStorage.getSuffix()}`;
     }
+    static validateRequest(key, fromAuxiliarAuthFunctions) {
+        if (key === localStorage.AUTH_TOKEN && !fromAuxiliarAuthFunctions) {
+            throw new Error('You cannot access AUTH_TOKEN through localStorage. Use getAuthToken/ storeAuthToken helper functions instead');
+        }
+    }
     static setSuffix(localStorageSuffix) {
         if (!LocalStorage.__suffix__) {
             const suffix = (localStorageSuffix && `_${localStorageSuffix}`) || '';
             LocalStorage.__suffix__ = suffix;
         }
     }
-    // Will be refactored on INC-155
-    static getAuthTokenValue() {
+    /**
+     *
+     * @param key
+     * @param getAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static getFromLS(key, getAuth = false) {
         if (typeof window === 'undefined') {
             return undefined;
         }
-        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(localStorage.AUTH_TOKEN));
-        try {
-            if (value) {
-                return JSON.parse(value);
-            }
-        }
-        catch (e) {
-            logger.logger.debug(e);
-            // Return auth token string for backwards compatibility
-            return value || undefined;
-        }
-        return undefined;
-    }
-    static getFromLS(key) {
-        if (typeof window === 'undefined') {
+        LocalStorage.validateRequest(key, getAuth);
+        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(key));
+        if (!value) {
             return undefined;
         }
-        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(key));
         try {
-            if (value) {
-                return JSON.parse(value);
-            }
+            return JSON.parse(value);
         }
-        catch (e) {
-            logger.logger.error(e);
+        catch (error) {
+            logger.logger.debug(`Error while parsing ${key} from local storage`, { value });
+            // keep it in case handleLogOut is not yet loaded when calling this method
+            [key]
+                .concat(connectedKeys[key] || [])
+                .forEach((_key) => LocalStorage.removeFromLS(_key));
+            window.dispatchEvent(new Event('logOut'));
         }
         return undefined;
     }
@@ -55,10 +59,18 @@ class LocalStorage {
         }
         return window.localStorage.removeItem(LocalStorage.getDynamicLSKey(key));
     }
-    static setToLS(key, value) {
+    /**
+     *
+     * @param key
+     * @param value
+     * @param storeAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static setToLS(key, value, storeAuth = false) {
         if (typeof window === 'undefined') {
             return;
         }
+        LocalStorage.validateRequest(key, storeAuth);
         window.localStorage.setItem(LocalStorage.getDynamicLSKey(key), JSON.stringify(value));
     }
     static getKeys() {

package/src/lib/shared/utils/classes/storage/localStorage.d.ts

@@ -2,11 +2,24 @@ export declare class LocalStorage {
     private static __suffix__;
     static getSuffix: () => string;
     private static getDynamicLSKey;
+    private static validateRequest;
     static setSuffix(localStorageSuffix?: string): void;
-    static getAuthTokenValue(): string | undefined;
-    static getFromLS<T = any>(key: string): T | undefined;
+    /**
+     *
+     * @param key
+     * @param getAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static getFromLS<T = any>(key: string, getAuth?: boolean): T | undefined;
     static removeFromLS(key: string): void;
-    static setToLS<T = any>(key: string, value: T): void;
+    /**
+     *
+     * @param key
+     * @param value
+     * @param storeAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static setToLS<T = any>(key: string, value: T, storeAuth?: boolean): void;
     static getKeys(): string[];
 }
 export default LocalStorage;

package/src/lib/shared/utils/classes/storage/localStorage.js

@@ -1,47 +1,51 @@
-import { AUTH_TOKEN } from '../../../../utils/constants/localStorage.js';
+import { AUTH_TOKEN, AUTH_USER } from '../../../../utils/constants/localStorage.js';
 import '../../../../utils/constants/colors.js';
 import { logger } from '../../../logger.js';
 
+const connectedKeys = {
+    [AUTH_TOKEN]: [AUTH_USER],
+    [AUTH_USER]: [AUTH_TOKEN],
+};
 class LocalStorage {
     static getDynamicLSKey(key) {
         return `${key}${LocalStorage.getSuffix()}`;
     }
+    static validateRequest(key, fromAuxiliarAuthFunctions) {
+        if (key === AUTH_TOKEN && !fromAuxiliarAuthFunctions) {
+            throw new Error('You cannot access AUTH_TOKEN through localStorage. Use getAuthToken/ storeAuthToken helper functions instead');
+        }
+    }
     static setSuffix(localStorageSuffix) {
         if (!LocalStorage.__suffix__) {
             const suffix = (localStorageSuffix && `_${localStorageSuffix}`) || '';
             LocalStorage.__suffix__ = suffix;
         }
     }
-    // Will be refactored on INC-155
-    static getAuthTokenValue() {
+    /**
+     *
+     * @param key
+     * @param getAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static getFromLS(key, getAuth = false) {
         if (typeof window === 'undefined') {
             return undefined;
         }
-        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(AUTH_TOKEN));
-        try {
-            if (value) {
-                return JSON.parse(value);
-            }
-        }
-        catch (e) {
-            logger.debug(e);
-            // Return auth token string for backwards compatibility
-            return value || undefined;
-        }
-        return undefined;
-    }
-    static getFromLS(key) {
-        if (typeof window === 'undefined') {
+        LocalStorage.validateRequest(key, getAuth);
+        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(key));
+        if (!value) {
             return undefined;
         }
-        const value = window.localStorage.getItem(LocalStorage.getDynamicLSKey(key));
         try {
-            if (value) {
-                return JSON.parse(value);
-            }
+            return JSON.parse(value);
         }
-        catch (e) {
-            logger.error(e);
+        catch (error) {
+            logger.debug(`Error while parsing ${key} from local storage`, { value });
+            // keep it in case handleLogOut is not yet loaded when calling this method
+            [key]
+                .concat(connectedKeys[key] || [])
+                .forEach((_key) => LocalStorage.removeFromLS(_key));
+            window.dispatchEvent(new Event('logOut'));
         }
         return undefined;
     }
@@ -51,10 +55,18 @@ class LocalStorage {
         }
         return window.localStorage.removeItem(LocalStorage.getDynamicLSKey(key));
     }
-    static setToLS(key, value) {
+    /**
+     *
+     * @param key
+     * @param value
+     * @param storeAuth - verifies if the request to get AUTH_TOKEN is comming from getAuthToken and not directly
+     * @returns
+     */
+    static setToLS(key, value, storeAuth = false) {
         if (typeof window === 'undefined') {
             return;
         }
+        LocalStorage.validateRequest(key, storeAuth);
         window.localStorage.setItem(LocalStorage.getDynamicLSKey(key), JSON.stringify(value));
     }
     static getKeys() {

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

@@ -3,3 +3,4 @@ export { useOnClickOutside } from './useOnClickOutside';
 export { usePreventPageScroll } from './usePreventPageScroll';
 export { useGlobalLoading } from './useGlobalLoading';
 export { useMediaQuery } from './useMediaQuery';
+export { useEffectOnce } from './useEffectOnce';

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

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

package/src/lib/shared/utils/hooks/useEffectOnce/useEffectOnce.cjs

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+/**
+ * Runs an effect function only once during component initialization.
+ *
+ * @param {Function} effect - The effect function to be executed.
+ * @returns {void}
+ *
+ * @example
+ * function ExampleComponent() {
+ *   useEffectOnce(() => {
+ *     console.log('Effect executed once');
+ *   });
+ *
+ *   return <div>Example Component</div>;
+ * }
+ */
+const useEffectOnce = (effect) => {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    React.useEffect(effect, []);
+};
+
+exports.useEffectOnce = useEffectOnce;

package/src/lib/shared/utils/hooks/useEffectOnce/useEffectOnce.d.ts

@@ -0,0 +1,17 @@
+import { EffectCallback } from 'react';
+/**
+ * Runs an effect function only once during component initialization.
+ *
+ * @param {Function} effect - The effect function to be executed.
+ * @returns {void}
+ *
+ * @example
+ * function ExampleComponent() {
+ *   useEffectOnce(() => {
+ *     console.log('Effect executed once');
+ *   });
+ *
+ *   return <div>Example Component</div>;
+ * }
+ */
+export declare const useEffectOnce: (effect: EffectCallback) => void;

package/src/lib/shared/utils/hooks/useEffectOnce/useEffectOnce.js

@@ -0,0 +1,23 @@
+import { useEffect } from 'react';
+
+/**
+ * Runs an effect function only once during component initialization.
+ *
+ * @param {Function} effect - The effect function to be executed.
+ * @returns {void}
+ *
+ * @example
+ * function ExampleComponent() {
+ *   useEffectOnce(() => {
+ *     console.log('Effect executed once');
+ *   });
+ *
+ *   return <div>Example Component</div>;
+ * }
+ */
+const useEffectOnce = (effect) => {
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    useEffect(effect, []);
+};
+
+export { useEffectOnce };