@dynamic-labs/sdk-react-core 3.1.0 → 3.1.1

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

@@ -145,6 +145,7 @@ const useAuthLayoutChecks = () => {
         view.type !== 'wallet-claim-intro' &&
         view.type !== 'passkey-recovery-add-email' &&
         view.type !== 'global-wallet-confirm' &&
+        view.type !== 'global-wallet-malicious' &&
         view.type !== 'global-wallet-info' &&
         view.type !== 'mfa-choose-device' &&
         view.type !== 'mfa-verification';

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

@@ -141,6 +141,7 @@ const useAuthLayoutChecks = () => {
         view.type !== 'wallet-claim-intro' &&
         view.type !== 'passkey-recovery-add-email' &&
         view.type !== 'global-wallet-confirm' &&
+        view.type !== 'global-wallet-malicious' &&
         view.type !== 'global-wallet-info' &&
         view.type !== 'mfa-choose-device' &&
         view.type !== 'mfa-verification';

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

@@ -24,10 +24,17 @@ var user = require('../../../store/state/user/user.cjs');
 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');
 
 const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimaryWalletId, }) => {
     const didRefreshUserRef = React.useRef(false);
     const user$2 = user.getUser();
+    /**
+     * As an extra layer of safety, we must explicitly prevent the refresh from being called
+     * after a logout
+     */
+    const hasLoggedOut = React.useRef(false);
+    useDynamicEvents.useInternalDynamicEvents('logout', () => (hasLoggedOut.current = true));
     /**
      * run this effect every time the user or project settings change
      * but not when the process was already done.
@@ -48,7 +55,7 @@ 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()) {
+            if (!user$2 && isCookieEnabled.isCookieEnabled() && !hasLoggedOut.current) {
                 // Disable all next calls to this method
                 didRefreshUserRef.current = true;
                 try {

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

@@ -20,10 +20,17 @@ import { getUser } from '../../../store/state/user/user.js';
 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';
 
 const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimaryWalletId, }) => {
     const didRefreshUserRef = useRef(false);
     const user = getUser();
+    /**
+     * As an extra layer of safety, we must explicitly prevent the refresh from being called
+     * after a logout
+     */
+    const hasLoggedOut = useRef(false);
+    useInternalDynamicEvents('logout', () => (hasLoggedOut.current = true));
     /**
      * run this effect every time the user or project settings change
      * but not when the process was already done.
@@ -44,7 +51,7 @@ const useResetCookieLocalStorage = ({ environmentId, projectSettings, setPrimary
          * so attempt to set it here.
          */
         const maybeInitUserRefresh = () => __awaiter(void 0, void 0, void 0, function* () {
-            if (!user && isCookieEnabled()) {
+            if (!user && isCookieEnabled() && !hasLoggedOut.current) {
                 // Disable all next calls to this method
                 didRefreshUserRef.current = true;
                 try {

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

@@ -131,11 +131,11 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     const { generateSessionKey, shouldRegisterSessionKeysOnSignin } = useEmbeddedWalletSessionKeys.useEmbeddedWalletSessionKeys(environmentId);
     const [isProcessing, setIsProcessing] = React.useState(false);
     const [error, setError] = React.useState();
-    const clearError = () => {
+    const clearError = React.useCallback(() => {
         setError(undefined);
         setContextError(undefined);
-    };
-    const onFailed = (provider, reason, options) => {
+    }, [setContextError]);
+    const onFailed = React.useCallback((provider, reason, options) => {
         setIsProcessing(false);
         onError === null || onError === void 0 ? void 0 : onError();
         onSettled === null || onSettled === void 0 ? void 0 : onSettled();
@@ -145,15 +145,15 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                 provider,
                 type: 'social',
             }, reason);
-    };
-    const handleError = (provider, code, message, options) => {
+    }, [onError, onSettled]);
+    const handleError = React.useCallback((provider, code, message, options) => {
         const error = { code, message };
         logger.logger.error(message);
         setError(error);
         setErrorMessage(code);
         onFailed(provider, { error }, options);
-    };
-    const checkValidProvider = (provider, authMode) => {
+    }, [onFailed, setErrorMessage]);
+    const checkValidProvider = React.useCallback((provider, authMode) => {
         if (!provider) {
             handleError(provider, types.SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required', { raiseAuthFailure: authMode === 'signin' });
             return false;
@@ -163,8 +163,8 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             return false;
         }
         return true;
-    };
-    const linkAccount = (provider, apiCall) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    }, [handleError]);
+    const linkAccount = React.useCallback((provider, apiCall) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {
             const response = yield apiCall();
             if (!response) {
@@ -178,112 +178,16 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                 handleError(provider, types.SocialOAuthErrorCode.ACCOUNT_ALREADY_LINKED_TO_DIFFERENT_PROFILE, `Social account already linked to a different profile: ${provider}`, { raiseAuthFailure: false });
             }
         }
-    });
-    const signInAccount = (provider, apiCall) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    }), [handleError, onSettled]);
+    const signInAccount = React.useCallback((provider, apiCall) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         yield initAuth({
             onError: () => handleError(provider, types.SocialOAuthErrorCode.SIGNIN_ERROR, `Failed to sign-in with social account: ${provider}`, { raiseAuthFailure: true }),
             onSettled,
             options: { provider },
             verifyFunction: () => apiCall(),
         });
-    });
-    const connectSocialAccount = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authMode, provider, validator, captchaToken, redirectUrl, telegramAuthToken, }) {
-        var _b, _c;
-        clearError();
-        setIsProcessing(true);
-        if (!authMode) {
-            logger.logger.error('Auth mode is required. Please use either "link" or "signin"');
-            return;
-        }
-        if (!checkValidProvider(provider, authMode)) {
-            return;
-        }
-        // invalid connect request
-        if (validator && !validator(provider)) {
-            return;
-        }
-        dynamicEvents.dynamicEvents.emit('authInit', {
-            option: provider,
-            provider,
-            type: 'social',
-        });
-        if (provider === sdkApiCore.ProviderEnum.Farcaster) {
-            return connectWithFarcaster(authMode, {
-                captchaToken,
-                redirectUrl,
-            });
-        }
-        const state = randomString.randomString(32);
-        const verifier = randomString.randomString(43);
-        // Whether we will use PKCE (code verifier/challenge) for this provider
-        const usingPkce = providersRequiringPkce.includes(provider);
-        socialStorage.setSocialStorageFor(provider, {
-            captchaToken,
-            codeVerifier: usingPkce ? verifier : undefined,
-            state,
-        });
-        const loginUrlString = getOauthLoginUrl.getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider);
-        if (!loginUrlString) {
-            handleError(provider, types.SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`, { raiseAuthFailure: authMode === 'signin' });
-            return;
-        }
-        const oauthLoginUrl = new URL(loginUrlString);
-        oauthLoginUrl.searchParams.set('state', state);
-        // only add pkce params for providers that support/require it
-        if (usingPkce) {
-            const digest = yield digestSHA256.digestSHA256(verifier);
-            oauthLoginUrl.searchParams.set('code_challenge', encodeBase64URL.encodeBase64URL(digest));
-            oauthLoginUrl.searchParams.set('code_challenge_method', 'S256');
-        }
-        const isMobile = utils.isMobile();
-        try {
-            const authCode = yield utils.Oauth2Service.getOauthCode({
-                apiProvider: getProviderByType.getProviderByType((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _c !== void 0 ? _c : [], provider),
-                getOAuthResultFromApi: () => oauth.getOAuthResult(environmentId, provider, {
-                    state,
-                }),
-                initWebAuth: ({ redirectUrl } = {}) => oauth.initAuth(environmentId, provider, {
-                    redirectUrl: redirectUrl
-                        ? removeDynamicOauthParamsFromUrl(redirectUrl)
-                        : undefined,
-                    state,
-                }),
-                isMobile,
-                oauthLoginUrl,
-                onSettled,
-                provider,
-                redirectUrl: redirectUrl !== null && redirectUrl !== void 0 ? redirectUrl : defaultRedirectUrl,
-                sessionTimeout,
-                setIsProcessing,
-                state,
-                strategy,
-            });
-            yield completeConnection({
-                authCode,
-                authMode,
-                captchaToken,
-                provider,
-                state,
-                telegramAuthToken,
-                verifier,
-            });
-        }
-        catch (error) {
-            if (!utils.Oauth2Service.isGetOauthCodeError(error)) {
-                logger.logger.error('Social connection failed with unexpected error:', error);
-                onFailed(provider, { error }, { raiseAuthFailure: authMode === 'signin' });
-                return;
-            }
-            if (error === 'user-cancelled')
-                onFailed(provider, 'user-cancelled');
-            else {
-                handleError(provider, error.code, error.message, {
-                    raiseAuthFailure: authMode === 'signin',
-                });
-            }
-        }
-    });
-    const completeConnection = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ authMode, provider, state, authCode, captchaToken, verifier, telegramAuthToken, }) {
+    }), [handleError, initAuth, onSettled]);
+    const completeConnection = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authMode, provider, state, authCode, captchaToken, verifier, telegramAuthToken, }) {
         try {
             let sessionPublicKey = undefined;
             if (shouldRegisterSessionKeysOnSignin()) {
@@ -339,8 +243,15 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             logger.logger.error('Social connection failed with unexpected error:', error);
             onFailed(provider, { error }, { raiseAuthFailure: authMode === 'signin' });
         }
-    });
-    const connectWithFarcaster = (authMode_1, _e) => _tslib.__awaiter(void 0, [authMode_1, _e], void 0, function* (authMode, { captchaToken, redirectUrl }) {
+    }), [
+        environmentId,
+        generateSessionKey,
+        linkAccount,
+        onFailed,
+        shouldRegisterSessionKeysOnSignin,
+        signInAccount,
+    ]);
+    const connectWithFarcaster = React.useCallback((authMode_1, _b) => _tslib.__awaiter(void 0, [authMode_1, _b], void 0, function* (authMode, { captchaToken, redirectUrl }) {
         const dynamicNonce = consumeNonce();
         const domain = utils.PlatformService.getHost();
         const data = yield farcaster.connect({
@@ -412,8 +323,124 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             setShowAuthFlow(false, { clearErrors: false });
         }
         setIsProcessing(false);
-    });
-    return {
+    }), [
+        consumeNonce,
+        defaultRedirectUrl,
+        environmentId,
+        generateSessionKey,
+        handleError,
+        linkAccount,
+        onFarcasterUrl,
+        setShowAuthFlow,
+        shouldRegisterSessionKeysOnSignin,
+        signInAccount,
+    ]);
+    const connectSocialAccount = React.useCallback((_c) => _tslib.__awaiter(void 0, [_c], void 0, function* ({ authMode, provider, validator, captchaToken, redirectUrl, telegramAuthToken, }) {
+        var _d, _e;
+        clearError();
+        setIsProcessing(true);
+        if (!authMode) {
+            logger.logger.error('Auth mode is required. Please use either "link" or "signin"');
+            return;
+        }
+        if (!checkValidProvider(provider, authMode)) {
+            return;
+        }
+        // invalid connect request
+        if (validator && !validator(provider)) {
+            return;
+        }
+        dynamicEvents.dynamicEvents.emit('authInit', {
+            option: provider,
+            provider,
+            type: 'social',
+        });
+        if (provider === sdkApiCore.ProviderEnum.Farcaster) {
+            return connectWithFarcaster(authMode, {
+                captchaToken,
+                redirectUrl,
+            });
+        }
+        const state = randomString.randomString(32);
+        const verifier = randomString.randomString(43);
+        // Whether we will use PKCE (code verifier/challenge) for this provider
+        const usingPkce = providersRequiringPkce.includes(provider);
+        socialStorage.setSocialStorageFor(provider, {
+            captchaToken,
+            codeVerifier: usingPkce ? verifier : undefined,
+            state,
+        });
+        const loginUrlString = getOauthLoginUrl.getOauthLoginUrl((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _d !== void 0 ? _d : [], provider);
+        if (!loginUrlString) {
+            handleError(provider, types.SocialOAuthErrorCode.NO_OAUTH_URL, `Failed to get login url to connect social account: ${provider}`, { raiseAuthFailure: authMode === 'signin' });
+            return;
+        }
+        const oauthLoginUrl = new URL(loginUrlString);
+        oauthLoginUrl.searchParams.set('state', state);
+        // only add pkce params for providers that support/require it
+        if (usingPkce) {
+            const digest = yield digestSHA256.digestSHA256(verifier);
+            oauthLoginUrl.searchParams.set('code_challenge', encodeBase64URL.encodeBase64URL(digest));
+            oauthLoginUrl.searchParams.set('code_challenge_method', 'S256');
+        }
+        const isMobile = utils.isMobile();
+        try {
+            const authCode = yield utils.Oauth2Service.getOauthCode({
+                apiProvider: getProviderByType.getProviderByType((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _e !== void 0 ? _e : [], provider),
+                getOAuthResultFromApi: () => oauth.getOAuthResult(environmentId, provider, {
+                    state,
+                }),
+                initWebAuth: ({ redirectUrl } = {}) => oauth.initAuth(environmentId, provider, {
+                    redirectUrl: redirectUrl
+                        ? removeDynamicOauthParamsFromUrl(redirectUrl)
+                        : undefined,
+                    state,
+                }),
+                isMobile,
+                oauthLoginUrl,
+                onSettled,
+                provider,
+                redirectUrl: redirectUrl !== null && redirectUrl !== void 0 ? redirectUrl : defaultRedirectUrl,
+                sessionTimeout,
+                setIsProcessing,
+                state,
+                strategy,
+            });
+            yield completeConnection({
+                authCode,
+                authMode,
+                captchaToken,
+                provider,
+                state,
+                telegramAuthToken,
+                verifier,
+            });
+        }
+        catch (error) {
+            if (utils.Oauth2Service.isGetOauthCodeError(error)) {
+                handleError(provider, error.code, error.message, {
+                    raiseAuthFailure: authMode === 'signin',
+                });
+                return;
+            }
+            logger.logger.error('Social connection failed with unexpected error:', error);
+            onFailed(provider, { error }, { raiseAuthFailure: authMode === 'signin' });
+        }
+    }), [
+        checkValidProvider,
+        clearError,
+        completeConnection,
+        connectWithFarcaster,
+        defaultRedirectUrl,
+        environmentId,
+        handleError,
+        onFailed,
+        onSettled,
+        projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers,
+        sessionTimeout,
+        strategy,
+    ]);
+    return React.useMemo(() => ({
         checkValidProvider,
         completeConnection,
         connectSocialAccount,
@@ -422,7 +449,14 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         isProcessing,
         setError,
         setIsProcessing,
-    };
+    }), [
+        checkValidProvider,
+        completeConnection,
+        connectSocialAccount,
+        error,
+        handleError,
+        isProcessing,
+    ]);
 };
 const removeDynamicOauthParamsFromUrl = (url) => {
     const urlObject = new URL(url);