@dynamic-labs/sdk-react-core 4.0.0-alpha.2 → 4.0.0-alpha.3

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

@@ -1,9 +1,9 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useMemo, useState } from 'react';
+import { useMemo, useState, useCallback } from 'react';
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { SocialOAuthErrorCode } from '@dynamic-labs/types';
-import { isMobile, Oauth2Service, PlatformService, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
+import { SocialAccountAlreadyExistsError, PlatformService, isMobile, Oauth2Service } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -28,7 +28,7 @@ import { getProviderByType } from '../../functions/getProviderByType/getProvider
 import { randomString } from '../../functions/randomString/randomString.js';
 import '../../../config/ApiEndpoint.js';
 import '../../../store/state/user/user.js';
-import { getOAuthResult, initAuth, telegramSignIn, signInOAuth, telegramVerify, verifyOAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
+import { telegramSignIn, signInOAuth, telegramVerify, verifyOAuth, getOAuthResult, initAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -130,11 +130,11 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     });
     const [isProcessing, setIsProcessing] = useState(false);
     const [error, setError] = useState();
-    const clearError = () => {
+    const clearError = useCallback(() => {
         setError(undefined);
         setContextError(undefined);
-    };
-    const onFailed = (provider, reason, options) => {
+    }, [setContextError]);
+    const onFailed = useCallback((provider, reason, options) => {
         setIsProcessing(false);
         onError === null || onError === void 0 ? void 0 : onError();
         onSettled === null || onSettled === void 0 ? void 0 : onSettled();
@@ -144,15 +144,15 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                 provider,
                 type: 'social',
             }, reason);
-    };
-    const handleError = (provider, code, message, options) => {
+    }, [onError, onSettled]);
+    const handleError = useCallback((provider, code, message, options) => {
         const error = { code, message };
         logger.error(message);
         setError(error);
         setErrorMessage(code);
         onFailed(provider, { error }, options);
-    };
-    const checkValidProvider = (provider, authMode) => {
+    }, [onFailed, setErrorMessage]);
+    const checkValidProvider = useCallback((provider, authMode) => {
         if (!provider) {
             handleError(provider, SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required', { raiseAuthFailure: authMode === 'signin' });
             return false;
@@ -162,8 +162,8 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             return false;
         }
         return true;
-    };
-    const linkAccount = (provider, apiCall) => __awaiter(void 0, void 0, void 0, function* () {
+    }, [handleError]);
+    const linkAccount = useCallback((provider, apiCall) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             const response = yield apiCall();
             if (!response) {
@@ -177,112 +177,16 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                 handleError(provider, SocialOAuthErrorCode.ACCOUNT_ALREADY_LINKED_TO_DIFFERENT_PROFILE, `Social account already linked to a different profile: ${provider}`, { raiseAuthFailure: false });
             }
         }
-    });
-    const signInAccount = (provider, apiCall) => __awaiter(void 0, void 0, void 0, function* () {
+    }), [handleError, onSettled]);
+    const signInAccount = useCallback((provider, apiCall) => __awaiter(void 0, void 0, void 0, function* () {
         yield initAuth$1({
             onError: () => handleError(provider, SocialOAuthErrorCode.SIGNIN_ERROR, `Failed to sign-in with social account: ${provider}`, { raiseAuthFailure: true }),
             onSettled,
             options: { provider },
             verifyFunction: () => apiCall(),
         });
-    });
-    const connectSocialAccount = (_a) => __awaiter(void 0, [_a], void 0, function* ({ authMode, provider, validator, captchaToken, redirectUrl, telegramAuthToken, }) {
-        var _b, _c;
-        clearError();
-        setIsProcessing(true);
-        if (!authMode) {
-            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.emit('authInit', {
-            option: provider,
-            provider,
-            type: 'social',
-        });
-        if (provider === ProviderEnum.Farcaster) {
-            return connectWithFarcaster(authMode, {
-                captchaToken,
-                redirectUrl,
-            });
-        }
-        const state = randomString(32);
-        const verifier = randomString(43);
-        // Whether we will use PKCE (code verifier/challenge) for this provider
-        const usingPkce = providersRequiringPkce.includes(provider);
-        setSocialStorageFor(provider, {
-            captchaToken,
-            codeVerifier: usingPkce ? verifier : undefined,
-            state,
-        });
-        const loginUrlString = getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider);
-        if (!loginUrlString) {
-            handleError(provider, 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(verifier);
-            oauthLoginUrl.searchParams.set('code_challenge', encodeBase64URL(digest));
-            oauthLoginUrl.searchParams.set('code_challenge_method', 'S256');
-        }
-        const isMobile$1 = isMobile();
-        try {
-            const authCode = yield Oauth2Service.getOauthCode({
-                apiProvider: getProviderByType((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _c !== void 0 ? _c : [], provider),
-                getOAuthResultFromApi: () => getOAuthResult(environmentId, provider, {
-                    state,
-                }),
-                initWebAuth: ({ redirectUrl } = {}) => initAuth(environmentId, provider, {
-                    redirectUrl: redirectUrl
-                        ? removeDynamicOauthParamsFromUrl(redirectUrl)
-                        : undefined,
-                    state,
-                }),
-                isMobile: isMobile$1,
-                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 (!Oauth2Service.isGetOauthCodeError(error)) {
-                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) => __awaiter(void 0, [_d], void 0, function* ({ authMode, provider, state, authCode, captchaToken, verifier, telegramAuthToken, forceCreateUser = false, }) {
+    }), [handleError, initAuth$1, onSettled]);
+    const completeConnection = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ authMode, provider, state, authCode, captchaToken, verifier, telegramAuthToken, forceCreateUser = false, }) {
         try {
             let sessionPublicKey = undefined;
             if (shouldRegisterSessionKeysOnSignin()) {
@@ -339,8 +243,15 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             logger.error('Social connection failed with unexpected error:', error);
             onFailed(provider, { error }, { raiseAuthFailure: authMode === 'signin' });
         }
-    });
-    const connectWithFarcaster = (authMode_1, _e) => __awaiter(void 0, [authMode_1, _e], void 0, function* (authMode, { captchaToken, redirectUrl }) {
+    }), [
+        environmentId,
+        generateSessionKey,
+        linkAccount,
+        onFailed,
+        shouldRegisterSessionKeysOnSignin,
+        signInAccount,
+    ]);
+    const connectWithFarcaster = useCallback((authMode_1, _b) => __awaiter(void 0, [authMode_1, _b], void 0, function* (authMode, { captchaToken, redirectUrl }) {
         const dynamicNonce = consumeNonce();
         const domain = PlatformService.getHost();
         const data = yield 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 = useCallback((_c) => __awaiter(void 0, [_c], void 0, function* ({ authMode, provider, validator, captchaToken, redirectUrl, telegramAuthToken, }) {
+        var _d, _e;
+        clearError();
+        setIsProcessing(true);
+        if (!authMode) {
+            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.emit('authInit', {
+            option: provider,
+            provider,
+            type: 'social',
+        });
+        if (provider === ProviderEnum.Farcaster) {
+            return connectWithFarcaster(authMode, {
+                captchaToken,
+                redirectUrl,
+            });
+        }
+        const state = randomString(32);
+        const verifier = randomString(43);
+        // Whether we will use PKCE (code verifier/challenge) for this provider
+        const usingPkce = providersRequiringPkce.includes(provider);
+        setSocialStorageFor(provider, {
+            captchaToken,
+            codeVerifier: usingPkce ? verifier : undefined,
+            state,
+        });
+        const loginUrlString = getOauthLoginUrl((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _d !== void 0 ? _d : [], provider);
+        if (!loginUrlString) {
+            handleError(provider, 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(verifier);
+            oauthLoginUrl.searchParams.set('code_challenge', encodeBase64URL(digest));
+            oauthLoginUrl.searchParams.set('code_challenge_method', 'S256');
+        }
+        const isMobile$1 = isMobile();
+        try {
+            const authCode = yield Oauth2Service.getOauthCode({
+                apiProvider: getProviderByType((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _e !== void 0 ? _e : [], provider),
+                getOAuthResultFromApi: () => getOAuthResult(environmentId, provider, {
+                    state,
+                }),
+                initWebAuth: ({ redirectUrl } = {}) => initAuth(environmentId, provider, {
+                    redirectUrl: redirectUrl
+                        ? removeDynamicOauthParamsFromUrl(redirectUrl)
+                        : undefined,
+                    state,
+                }),
+                isMobile: isMobile$1,
+                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 (Oauth2Service.isGetOauthCodeError(error)) {
+                handleError(provider, error.code, error.message, {
+                    raiseAuthFailure: authMode === 'signin',
+                });
+                return;
+            }
+            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 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);

package/src/lib/views/MfaChooseDeviceView/MfaChooseDeviceView.cjs

@@ -126,7 +126,7 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, }) => {
                             ? t('dyn_mfa.choose_device_view.title')
                             : t('dyn_mfa.choose_device_view.choose_another_method') }) }) }), jsxRuntime.jsxs("div", { className: 'mfa-choose-device-view__body', "data-testid": 'mfa-choose-device-view', children: [jsxRuntime.jsx(secureAccount.ReactComponent, {}), jsxRuntime.jsx(Typography.Typography, { className: 'mfa-choose-device-view__copy', variant: 'body_normal', weight: 'regular', color: 'secondary', children: isInitialSetup
                             ? t('dyn_mfa.choose_device_view.select_options')
-                            : t('dyn_mfa.choose_device_view.choose_another_method_description') }), mfaOptions.map((option) => (jsxRuntime.jsxs(Button.Button, { buttonClassName: 'mfa-choose-device-view__button', expanded: true, onClick: () => handleClick(option), children: [jsxRuntime.jsxs("div", { className: 'mfa-choose-device-view__button__header', children: [jsxRuntime.jsx(Typography.Typography, { copykey: option.labelKey, children: t(option.labelKey) }), jsxRuntime.jsx(chevronLeft.ReactComponent, { className: 'mfa-choose-device-view__icon--rotate' })] }), jsxRuntime.jsx(Typography.Typography, { className: 'mfa-choose-device-view__button__description', color: 'secondary', copykey: option.descriptionKey, children: t(option.descriptionKey) })] }, option.type))), jsxRuntime.jsx(TextButton.TextButton, { className: 'mfa-choose-device-view__logout', onClick: handleLogOut, copykey: 'dyn_mfa.choose_device_view.logout', children: t('dyn_mfa.choose_device_view.logout') })] })] }));
+                            : t('dyn_mfa.choose_device_view.choose_another_method_description') }), mfaOptions.map((option) => (jsxRuntime.jsxs(Button.Button, { buttonClassName: 'mfa-choose-device-view__button', expanded: true, onClick: () => handleClick(option), children: [jsxRuntime.jsxs("div", { className: 'mfa-choose-device-view__button__header', children: [jsxRuntime.jsx(Typography.Typography, { copykey: option.labelKey, color: 'primary', children: t(option.labelKey) }), jsxRuntime.jsx(chevronLeft.ReactComponent, { className: 'mfa-choose-device-view__icon--rotate' })] }), jsxRuntime.jsx(Typography.Typography, { className: 'mfa-choose-device-view__button__description', color: 'secondary', copykey: option.descriptionKey, children: t(option.descriptionKey) })] }, option.type))), jsxRuntime.jsx(TextButton.TextButton, { className: 'mfa-choose-device-view__logout', onClick: handleLogOut, copykey: 'dyn_mfa.choose_device_view.logout', children: t('dyn_mfa.choose_device_view.logout') })] })] }));
 };
 
 exports.MfaChooseDeviceView = MfaChooseDeviceView;

package/src/lib/views/MfaChooseDeviceView/MfaChooseDeviceView.js

@@ -122,7 +122,7 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, }) => {
                             ? t('dyn_mfa.choose_device_view.title')
                             : t('dyn_mfa.choose_device_view.choose_another_method') }) }) }), jsxs("div", { className: 'mfa-choose-device-view__body', "data-testid": 'mfa-choose-device-view', children: [jsx(SvgSecureAccount, {}), jsx(Typography, { className: 'mfa-choose-device-view__copy', variant: 'body_normal', weight: 'regular', color: 'secondary', children: isInitialSetup
                             ? t('dyn_mfa.choose_device_view.select_options')
-                            : t('dyn_mfa.choose_device_view.choose_another_method_description') }), mfaOptions.map((option) => (jsxs(Button, { buttonClassName: 'mfa-choose-device-view__button', expanded: true, onClick: () => handleClick(option), children: [jsxs("div", { className: 'mfa-choose-device-view__button__header', children: [jsx(Typography, { copykey: option.labelKey, children: t(option.labelKey) }), jsx(SvgChevronLeft, { className: 'mfa-choose-device-view__icon--rotate' })] }), jsx(Typography, { className: 'mfa-choose-device-view__button__description', color: 'secondary', copykey: option.descriptionKey, children: t(option.descriptionKey) })] }, option.type))), jsx(TextButton, { className: 'mfa-choose-device-view__logout', onClick: handleLogOut, copykey: 'dyn_mfa.choose_device_view.logout', children: t('dyn_mfa.choose_device_view.logout') })] })] }));
+                            : t('dyn_mfa.choose_device_view.choose_another_method_description') }), mfaOptions.map((option) => (jsxs(Button, { buttonClassName: 'mfa-choose-device-view__button', expanded: true, onClick: () => handleClick(option), children: [jsxs("div", { className: 'mfa-choose-device-view__button__header', children: [jsx(Typography, { copykey: option.labelKey, color: 'primary', children: t(option.labelKey) }), jsx(SvgChevronLeft, { className: 'mfa-choose-device-view__icon--rotate' })] }), jsx(Typography, { className: 'mfa-choose-device-view__button__description', color: 'secondary', copykey: option.descriptionKey, children: t(option.descriptionKey) })] }, option.type))), jsx(TextButton, { className: 'mfa-choose-device-view__logout', onClick: handleLogOut, copykey: 'dyn_mfa.choose_device_view.logout', children: t('dyn_mfa.choose_device_view.logout') })] })] }));
 };
 
 export { MfaChooseDeviceView };

package/src/lib/views/WalletList/data.cjs

@@ -37,7 +37,12 @@ const getWallets = (props) => {
         getSupportedWalletOpts: Object.assign(Object.assign({}, props.getSupportedWalletOpts), { chainRpcProviders: rpcProviders.ChainRpcProviders, walletConnectProjectId: (_a = props.getSupportedWalletOpts.settings.sdk.walletConnect) === null || _a === void 0 ? void 0 : _a.projectId }),
     }).map((wallet) => {
         var _a;
-        (_a = props.walletConnectorExtensions) === null || _a === void 0 ? void 0 : _a.forEach((extension) => wallet.extend(extension));
+        (_a = props.walletConnectorExtensions) === null || _a === void 0 ? void 0 : _a.forEach((extension) => {
+            var _a;
+            return wallet.extend(extension, {
+                walletConnectDappProjectId: (_a = props.getSupportedWalletOpts.settings.sdk.walletConnect) === null || _a === void 0 ? void 0 : _a.walletProjectId,
+            });
+        });
         return createWallet.createWallet(props.getSupportedWalletOpts.walletBook, wallet);
     });
 };

package/src/lib/views/WalletList/data.js

@@ -33,7 +33,12 @@ const getWallets = (props) => {
         getSupportedWalletOpts: Object.assign(Object.assign({}, props.getSupportedWalletOpts), { chainRpcProviders: ChainRpcProviders, walletConnectProjectId: (_a = props.getSupportedWalletOpts.settings.sdk.walletConnect) === null || _a === void 0 ? void 0 : _a.projectId }),
     }).map((wallet) => {
         var _a;
-        (_a = props.walletConnectorExtensions) === null || _a === void 0 ? void 0 : _a.forEach((extension) => wallet.extend(extension));
+        (_a = props.walletConnectorExtensions) === null || _a === void 0 ? void 0 : _a.forEach((extension) => {
+            var _a;
+            return wallet.extend(extension, {
+                walletConnectDappProjectId: (_a = props.getSupportedWalletOpts.settings.sdk.walletConnect) === null || _a === void 0 ? void 0 : _a.walletProjectId,
+            });
+        });
         return createWallet(props.getSupportedWalletOpts.walletBook, wallet);
     });
 };