@dynamic-labs/sdk-react-core 3.0.0-alpha.4 → 3.0.0-alpha.40

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

@@ -29,14 +29,13 @@ import '@dynamic-labs/store';
 import { unlinkOAuth } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialKycEnabled.js';
-import 'viem';
-import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useSocialAuth } from '../useSocialAuth/useSocialAuth.js';
@@ -72,18 +71,29 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '@dynamic-labs/viem-utils';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers and used internally to handle social account linking
 const useSocialAccounts = ({ sessionTimeout } = {
-    sessionTimeout: 10000,
+    sessionTimeout: 20000,
 }) => {
     var _a;
     const { environmentId, user, projectSettings } = useInternalDynamicContext();
@@ -121,10 +131,11 @@ const useSocialAccounts = ({ sessionTimeout } = {
         }
         return true;
     }, [handleError, projectSettings, verifiedOAuthCredentialsMap]);
-    const linkSocialAccount = useCallback((provider) => __awaiter(void 0, void 0, void 0, function* () {
+    const linkSocialAccount = useCallback((provider_1, ...args_1) => __awaiter(void 0, [provider_1, ...args_1], void 0, function* (provider, { redirectUrl } = { redirectUrl: undefined }) {
         connectSocialAccount({
             authMode: 'link',
             provider,
+            redirectUrl,
             validator: checkValidOAuthLinking,
         });
     }), [checkValidOAuthLinking, connectSocialAccount]);
@@ -172,9 +183,9 @@ const useSocialAccounts = ({ sessionTimeout } = {
         }
         const { id, oauthAccountId, oauthAccountPhotos, oauthDisplayName, oauthEmails, oauthProvider, oauthUsername, publicIdentifier, } = verifiedCredential;
         return {
-            accountId: oauthAccountId,
+            accountId: oauthAccountId !== null && oauthAccountId !== void 0 ? oauthAccountId : undefined,
             avatar: oauthAccountPhotos === null || oauthAccountPhotos === void 0 ? void 0 : oauthAccountPhotos[0],
-            displayName: oauthDisplayName,
+            displayName: oauthDisplayName !== null && oauthDisplayName !== void 0 ? oauthDisplayName : undefined,
             email: oauthEmails === null || oauthEmails === void 0 ? void 0 : oauthEmails[0],
             id,
             provider: oauthProvider,
@@ -191,10 +202,11 @@ const useSocialAccounts = ({ sessionTimeout } = {
         }
         return true;
     }, [handleError, (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.providers]);
-    const signInWithSocialAccount = useCallback((provider) => __awaiter(void 0, void 0, void 0, function* () {
+    const signInWithSocialAccount = useCallback((provider_2, ...args_2) => __awaiter(void 0, [provider_2, ...args_2], void 0, function* (provider, { redirectUrl } = { redirectUrl: undefined }) {
         return connectSocialAccount({
             authMode: 'signin',
             provider,
+            redirectUrl,
             validator: checkValidOAuthSignIn,
         });
     }), [checkValidOAuthSignIn, connectSocialAccount]);

package/src/lib/utils/hooks/useSocialAuth/{farcaster.cjs → farcaster/farcaster.cjs}

@@ -3,22 +3,22 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
-var dynamicEvents = require('../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../../events/dynamicEvents.cjs');
 require('@dynamic-labs/sdk-api-core');
-var logger = require('../../../shared/logger.cjs');
+var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
-require('../../../context/ViewContext/ViewContext.cjs');
+require('../../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('../../constants/colors.cjs');
-require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../shared/utils/classes/storage/sessionStorage.cjs');
-require('../../../shared/consts/index.cjs');
+require('../../../constants/colors.cjs');
+require('../../../constants/values.cjs');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('../../../../shared/consts/index.cjs');
 
 const CONNECT_URL = 'https://relay.farcaster.xyz/v1/channel';
 const STATUS_URL = 'https://relay.farcaster.xyz/v1/channel/status';

package/src/lib/utils/hooks/useSocialAuth/{farcaster.js → farcaster/farcaster.js}

@@ -1,20 +1,20 @@
 'use client'
-import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { FetchService } from '@dynamic-labs/utils';
-import { dynamicEvents } from '../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../../events/dynamicEvents.js';
 import '@dynamic-labs/sdk-api-core';
-import { logger } from '../../../shared/logger.js';
+import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
-import '../../../context/ViewContext/ViewContext.js';
+import '../../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '../../constants/colors.js';
-import '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
-import '../../../shared/utils/classes/storage/sessionStorage.js';
-import '../../../shared/consts/index.js';
+import '../../../constants/colors.js';
+import '../../../constants/values.js';
+import '../../../../shared/utils/classes/storage/localStorage.js';
+import '../../../../shared/utils/classes/storage/sessionStorage.js';
+import '../../../../shared/consts/index.js';
 
 const CONNECT_URL = 'https://relay.farcaster.xyz/v1/channel';
 const STATUS_URL = 'https://relay.farcaster.xyz/v1/channel/status';

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

@@ -0,0 +1 @@
+export * from './farcaster';

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

@@ -1 +1 @@
-export { useSocialAuth } from './useSocialAuth';
+export { useSocialAuth, type SocialAuthMode } from './useSocialAuth';

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

@@ -28,25 +28,24 @@ var encodeBase64URL = require('../../functions/encodeBase64URL/encodeBase64URL.c
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var getOauthLoginUrl = require('../../functions/getOauthLoginUrl/getOauthLoginUrl.cjs');
+var socialStorage = require('../../functions/socialStorage/socialStorage.cjs');
 var getProviderByType = require('../../functions/getProviderByType/getProviderByType.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 var oauth = require('../../../data/api/oauth/oauth.cjs');
 require('../../../locale/locale.cjs');
 var randomString = require('../../functions/randomString/randomString.cjs');
-var stringifyURIQuery = require('../../functions/stringifyURIQuery/stringifyURIQuery.cjs');
-require('viem');
-require('viem/chains');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useUserAuth = require('../useUserAuth/useUserAuth.cjs');
-var farcaster = require('./farcaster.cjs');
+var farcaster = require('./farcaster/farcaster.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
@@ -79,13 +78,24 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('@dynamic-labs/viem-utils');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const socialProviders = [
@@ -97,30 +107,28 @@ const socialProviders = [
     'github',
     'google',
     'instagram',
+    'telegram',
     'twitch',
     'twitter',
 ];
 // pkce params are only required for twitter and break if added for other providers, like google
 // so we should only add provider that support pkce to this list
 const providersRequiringPkce = ['twitter', 'github'];
-const providersWithoutWindowOpenerRefence = ['twitter'];
 // Hook to handle common social auth logic (for social linking and social sign in)
 const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, }) => {
-    const { environmentId, setShowAuthFlow, projectSettings, consumeNonce, redirectUrl, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, setShowAuthFlow, projectSettings, consumeNonce, redirectUrl: defaultRedirectUrl, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setErrorMessage, setError: setContextError } = ErrorContext.useErrorContext();
     const { initAuth } = useUserAuth.useUserAuth({
         authMethod: 'social',
     });
     const [isProcessing, setIsProcessing] = React.useState(false);
     const [error, setError] = React.useState();
-    const providersWaitingOauthMessage = React.useRef({});
-    const authWindowInterval = React.useRef();
-    const shouldPool = React.useRef(false);
     const clearError = () => {
         setError(undefined);
         setContextError(undefined);
     };
     const onFailed = (provider, reason, options) => {
+        setIsProcessing(false);
         onError === null || onError === void 0 ? void 0 : onError();
         onSettled === null || onSettled === void 0 ? void 0 : onSettled();
         if (provider && (options === null || options === void 0 ? void 0 : options.raiseAuthFailure))
@@ -133,31 +141,10 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     const handleError = (provider, code, message, options) => {
         const error = { code, message };
         logger.logger.error(message);
-        setIsProcessing(false);
         setError(error);
         setErrorMessage(code);
         onFailed(provider, { error }, options);
     };
-    const poolOauthResult = (provider, state) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!shouldPool.current) {
-            return;
-        }
-        const result = yield oauth.getOAuthResult(environmentId, provider, {
-            state,
-        });
-        if ((result === null || result === void 0 ? void 0 : result.status) !== sdkApiCore.OauthResultStatus.Completed) {
-            setTimeout(() => poolOauthResult(provider, state), 1000);
-            return;
-        }
-        shouldPool.current = false;
-        const authMessage = {
-            code: result === null || result === void 0 ? void 0 : result.code,
-            error: result === null || result === void 0 ? void 0 : result.error,
-            provider,
-            type: 'authorization_response',
-        };
-        window.postMessage(authMessage, '*');
-    });
     const checkValidProvider = (provider, authMode) => {
         if (!provider) {
             handleError(provider, types.SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required', { raiseAuthFailure: authMode === 'signin' });
@@ -192,9 +179,8 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             verifyFunction: () => apiCall(),
         });
     });
-    const connectSocialAccount = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authMode, provider, validator, captchaToken, }) {
+    const connectSocialAccount = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authMode, provider, validator, captchaToken, redirectUrl, }) {
         var _b, _c;
-        clearInterval(authWindowInterval.current);
         clearError();
         setIsProcessing(true);
         if (!authMode) {
@@ -213,169 +199,130 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             provider,
             type: 'social',
         });
-        if (provider === sdkApiCore.ProviderEnum.Farcaster)
-            return connectWithFarcaster(authMode, { captchaToken });
-        const authWindow = window.open('', '_blank', 'width=500,height=600');
-        const state = randomString.randomString(8);
+        if (provider === sdkApiCore.ProviderEnum.Farcaster) {
+            return connectWithFarcaster(authMode, {
+                captchaToken,
+                redirectUrl,
+            });
+        }
+        const state = randomString.randomString(32);
         const verifier = randomString.randomString(43);
-        const clearListeners = () => {
-            window.removeEventListener('message', handleAuthWindowMessage);
-            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
-        };
-        const handleAuthWindowMessage = (event) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            var _d, _e;
-            const message = event.data;
-            const apiProvider = getProviderByType.getProviderByType((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _d !== void 0 ? _d : [], provider);
-            if (!(apiProvider === null || apiProvider === void 0 ? void 0 : apiProvider.redirectUrl)) {
-                return;
-            }
-            let expectedOrigin = window.location.origin;
-            if (!providersWithoutWindowOpenerRefence.includes(provider)) {
-                try {
-                    const redirectUri = new URL(apiProvider.redirectUrl);
-                    expectedOrigin = redirectUri.origin;
-                }
-                catch (e) {
-                    logger.logger.error('Failed to parse social provider redirect url', {
-                        error: e,
-                    });
-                    return;
-                }
-            }
-            if ((message === null || message === void 0 ? void 0 : message.type) === 'origin_check' && authWindow) {
-                logger.logger.debug('Origin check message received. Sending response now.', {
-                    data: message,
-                    expectedOrigin,
-                });
-                authWindow.postMessage('origin_check_response', expectedOrigin);
-                return;
-            }
-            const isAuthorizationMessage = (message === null || message === void 0 ? void 0 : message.type) === 'authorization_response';
-            if (isAuthorizationMessage) {
-                logger.logger.debug('Message received', { data: message });
-            }
-            const isExpectedOrigin = event.origin === expectedOrigin;
-            const isValidMessage = isAuthorizationMessage &&
-                (message === null || message === void 0 ? void 0 : message.provider) === provider &&
-                isExpectedOrigin;
-            // don't process invalid messages for provider
-            if (!isValidMessage) {
-                return;
-            }
-            setIsProcessing(true);
-            if (!((_e = providersWaitingOauthMessage.current) === null || _e === void 0 ? void 0 : _e[provider])) {
-                handleError(provider, types.SocialOAuthErrorCode.SESSION_TIMEOUT, `Connecting ${provider} account session timeout.`, { raiseAuthFailure: authMode === 'signin' });
-                return;
-            }
-            clearListeners();
-            const { code, error, state: authState } = message;
-            if (error && error !== 'undefined') {
-                handleError(provider, types.SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: ${error}`, { raiseAuthFailure: authMode === 'signin' });
-                return;
-            }
-            // check that the state we receive from message is the same state we calculated earlier
-            // this could be an attack
-            // this state check is used only by providers with an open window opener reference (eg, not twitter)
-            if (!providersWithoutWindowOpenerRefence.includes(provider) &&
-                state !== authState) {
-                handleError(provider, types.SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: Invalid random state`, { raiseAuthFailure: authMode === 'signin' });
-                return;
-            }
-            if (!code) {
-                handleError(provider, types.SocialOAuthErrorCode.NO_AUTH_CODE, `Failed to connect ${provider} social account: no authorization code`, { raiseAuthFailure: authMode === 'signin' });
-                return;
-            }
-            if (authMode === 'signin') {
-                const apiCall = () => oauth.signInOAuth(environmentId, provider, {
-                    captchaToken,
-                    code,
-                    codeVerifier: verifier,
-                    state,
-                });
-                yield signInAccount(provider, apiCall);
-            }
-            else {
-                const apiCall = () => oauth.verifyOAuth(environmentId, provider, {
-                    code,
-                    codeVerifier: verifier,
-                    state,
-                });
-                yield linkAccount(provider, apiCall);
-            }
-            setIsProcessing(false);
+        // 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 loginUrl = getOauthLoginUrl.getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider);
-        if (!loginUrl) {
+        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;
         }
-        if (!((_c = providersWaitingOauthMessage.current) === null || _c === void 0 ? void 0 : _c[provider])) {
-            window.addEventListener('message', handleAuthWindowMessage);
-            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: true });
-        }
-        // add state param for all providers
-        const stateParam = stringifyURIQuery.stringifyURIQuery({
-            state,
-        });
-        let oauthLoginUrl = `${loginUrl}&${stateParam}`;
+        const oauthLoginUrl = new URL(loginUrlString);
+        oauthLoginUrl.searchParams.set('state', state);
         // only add pkce params for providers that support/require it
-        if (providersRequiringPkce.includes(provider)) {
+        if (usingPkce) {
             const digest = yield digestSHA256.digestSHA256(verifier);
-            const pkceParams = stringifyURIQuery.stringifyURIQuery({
-                code_challenge: encodeBase64URL.encodeBase64URL(digest),
-                code_challenge_method: 'S256',
+            oauthLoginUrl.searchParams.set('code_challenge', encodeBase64URL.encodeBase64URL(digest));
+            oauthLoginUrl.searchParams.set('code_challenge_method', 'S256');
+        }
+        const isMobile = utils.isMobile();
+        const effectiveRedirectUrl = redirectUrl !== null && redirectUrl !== void 0 ? redirectUrl : defaultRedirectUrl;
+        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: () => {
+                    // When we set the redirectUrl, the backend gives preference to a redirect
+                    // experience, which is only desired for mobile
+                    const mobileRedirectUrl = effectiveRedirectUrl || window.location.href;
+                    return oauth.initAuth(environmentId, provider, {
+                        redirectUrl: isMobile
+                            ? removeDynamicOauthStateFromUrl(mobileRedirectUrl)
+                            : undefined,
+                        state,
+                    });
+                },
+                isMobile,
+                oauthLoginUrl,
+                onSettled,
+                provider,
+                redirectUrl: effectiveRedirectUrl,
+                sessionTimeout,
+                setIsProcessing,
+                state,
             });
-            oauthLoginUrl = `${oauthLoginUrl}&${pkceParams}`;
+            yield completeConnection({
+                authCode,
+                authMode,
+                captchaToken,
+                provider,
+                state,
+                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',
+                });
+            }
         }
-        authWindow === null || authWindow === void 0 ? void 0 : authWindow.location.assign(oauthLoginUrl);
-        if (!providersWithoutWindowOpenerRefence.includes(provider)) {
-            // For provider that support window.opener, we need to clear all states/listeners when the window is closed
-            authWindowInterval.current = setInterval(() => {
-                var _a;
-                if (!(authWindow === null || authWindow === void 0 ? void 0 : authWindow.closed)) {
-                    return;
+    });
+    const completeConnection = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ authMode, provider, state, authCode, captchaToken, verifier, }) {
+        try {
+            if (authMode === 'signin') {
+                if (provider === sdkApiCore.ProviderEnum.Telegram) {
+                    const apiCall = () => oauth.telegramSignIn(environmentId, { state });
+                    yield signInAccount(provider, apiCall);
                 }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                // user didn't complete oauth
-                if ((_a = providersWaitingOauthMessage.current) === null || _a === void 0 ? void 0 : _a[provider]) {
-                    onFailed(provider, 'user-cancelled');
+                else {
+                    const apiCall = () => oauth.signInOAuth(environmentId, provider, {
+                        captchaToken,
+                        code: authCode,
+                        codeVerifier: verifier,
+                        state,
+                    });
+                    yield signInAccount(provider, apiCall);
                 }
-            }, 2000);
-        }
-        else {
-            // For provider that don't support window.opener, we need to use a timeout to pool the oauth result
-            // If we don't get a valid result in {async sessionTimeout} ms, we'll assume the user closed the window
-            // and we'll clear all states/listeners
-            // start pooling oauth result
-            shouldPool.current = true;
-            poolOauthResult(provider, state);
-            // if this is mobile, set a longer timeout to allow the user to login to the provider in the browser
-            let authWindowTimeout = sessionTimeout;
-            if (utils.isMobile()) {
-                authWindowTimeout = authWindowTimeout * 3;
             }
-            authWindowInterval.current = setInterval(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                var _f;
-                shouldPool.current = false;
-                // clear all states/listeners, assuming user closed the window before completing oauth
-                if ((_f = providersWaitingOauthMessage.current) === null || _f === void 0 ? void 0 : _f[provider]) {
-                    clearListeners();
-                    handleError(provider, types.SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`, { raiseAuthFailure: authMode === 'signin' });
+            else {
+                if (provider === sdkApiCore.ProviderEnum.Telegram) {
+                    const apiCall = () => oauth.telegramVerify(environmentId, { state });
+                    yield linkAccount(provider, apiCall);
+                }
+                else {
+                    const apiCall = () => oauth.verifyOAuth(environmentId, provider, {
+                        code: authCode,
+                        codeVerifier: verifier,
+                        state,
+                    });
+                    yield linkAccount(provider, apiCall);
                 }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-            }), authWindowTimeout);
+            }
+        }
+        catch (error) {
+            logger.logger.error('Social connection failed with unexpected error:', error);
+            onFailed(provider, { error }, { raiseAuthFailure: authMode === 'signin' });
         }
     });
-    const connectWithFarcaster = (authMode_1, _g) => _tslib.__awaiter(void 0, [authMode_1, _g], void 0, function* (authMode, { captchaToken }) {
+    const connectWithFarcaster = (authMode_1, _e) => _tslib.__awaiter(void 0, [authMode_1, _e], void 0, function* (authMode, { captchaToken, redirectUrl }) {
         const dynamicNonce = consumeNonce();
         const domain = utils.PlatformService.getHost();
         const data = yield farcaster.connect({
             domain,
             nonce: dynamicNonce,
-            redirectUrl,
+            redirectUrl: redirectUrl || defaultRedirectUrl,
             siweUri: utils.PlatformService.getOrigin(),
         });
         if (!(data === null || data === void 0 ? void 0 : data.url) || !(data === null || data === void 0 ? void 0 : data.channelToken)) {
@@ -438,6 +385,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     });
     return {
         checkValidProvider,
+        completeConnection,
         connectSocialAccount,
         error,
         handleError,
@@ -446,5 +394,10 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         setIsProcessing,
     };
 };
+const removeDynamicOauthStateFromUrl = (url) => {
+    const urlObject = new URL(url);
+    urlObject.searchParams.delete('dynamicOauthState');
+    return urlObject.toString();
+};
 
 exports.useSocialAuth = useSocialAuth;

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { SocialOAuthError, SocialOAuthErrorCode } from '@dynamic-labs/types';
-type SocialAuthMode = 'link' | 'signin' | 'unlink';
+export type SocialAuthMode = 'link' | 'signin' | 'unlink';
 type UseSocialAuthProps = {
     sessionTimeout: number;
     onSettled?: () => void;
@@ -13,10 +13,19 @@ export type ConnectSocialAccountProps = {
     provider: ProviderEnum;
     validator?: (provider: ProviderEnum) => boolean;
     captchaToken?: string;
+    redirectUrl?: string;
 };
 export declare const useSocialAuth: ({ sessionTimeout, onSettled, onError, onFarcasterUrl, }: UseSocialAuthProps) => {
     readonly checkValidProvider: (provider: ProviderEnum, authMode: SocialAuthMode) => boolean;
-    readonly connectSocialAccount: ({ authMode, provider, validator, captchaToken, }: ConnectSocialAccountProps) => Promise<void>;
+    readonly completeConnection: ({ authMode, provider, state, authCode, captchaToken, verifier, }: {
+        authMode: SocialAuthMode;
+        provider: ProviderEnum;
+        state: string;
+        captchaToken?: string | undefined;
+        authCode?: string | undefined;
+        verifier?: string | undefined;
+    }) => Promise<void>;
+    readonly connectSocialAccount: ({ authMode, provider, validator, captchaToken, redirectUrl, }: ConnectSocialAccountProps) => Promise<void>;
     readonly error: SocialOAuthError | undefined;
     readonly handleError: (provider: ProviderEnum | undefined, code: SocialOAuthErrorCode, message: string, options?: {
         raiseAuthFailure?: boolean | undefined;