@dynamic-labs/sdk-react-core 3.0.0-alpha.13 → 3.0.0-alpha.14

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

@@ -19,6 +19,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('@dynamic-labs/logger');
 require('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -34,7 +35,6 @@ 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('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -44,7 +44,7 @@ require('../../../context/WalletContext/WalletContext.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');
@@ -84,6 +84,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 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 = [
@@ -101,7 +112,6 @@ const socialProviders = [
 // 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();
@@ -111,14 +121,12 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     });
     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))
@@ -131,31 +139,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,7 +179,6 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     });
     const connectSocialAccount = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ authMode, provider, validator, captchaToken, }) {
         var _b, _c;
-        clearInterval(authWindowInterval.current);
         clearError();
         setIsProcessing(true);
         if (!authMode) {
@@ -213,80 +199,39 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         });
         if (provider === sdkApiCore.ProviderEnum.Farcaster)
             return connectWithFarcaster(authMode, { captchaToken });
-        const authWindow = window.open('', '_blank', 'width=500,height=600');
         const state = randomString.randomString(8);
         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;
-            }
+        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 (providersRequiringPkce.includes(provider)) {
+            const digest = yield digestSHA256.digestSHA256(verifier);
+            oauthLoginUrl.searchParams.set('code_challenge', encodeBase64URL.encodeBase64URL(digest));
+            oauthLoginUrl.searchParams.set('code_challenge_method', 'S256');
+        }
+        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,
+                }),
+                isMobile: utils.isMobile(),
+                oauthLoginUrl,
+                onSettled,
+                provider,
+                sessionTimeout,
+                setIsProcessing,
+                state,
+            });
             if (authMode === 'signin') {
                 const apiCall = () => oauth.signInOAuth(environmentId, provider, {
                     captchaToken,
-                    code,
+                    code: authCode,
                     codeVerifier: verifier,
                     state,
                 });
@@ -294,80 +239,29 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             }
             else {
                 const apiCall = () => oauth.verifyOAuth(environmentId, provider, {
-                    code,
+                    code: authCode,
                     codeVerifier: verifier,
                     state,
                 });
                 yield linkAccount(provider, apiCall);
             }
-            setIsProcessing(false);
-        });
-        const loginUrl = getOauthLoginUrl.getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider);
-        if (!loginUrl) {
-            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}`;
-        // only add pkce params for providers that support/require it
-        if (providersRequiringPkce.includes(provider)) {
-            const digest = yield digestSHA256.digestSHA256(verifier);
-            const pkceParams = stringifyURIQuery.stringifyURIQuery({
-                code_challenge: encodeBase64URL.encodeBase64URL(digest),
-                code_challenge_method: 'S256',
-            });
-            oauthLoginUrl = `${oauthLoginUrl}&${pkceParams}`;
-        }
-        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;
-                }
-                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');
-                }
-            }, 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;
+        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',
+                });
             }
-            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' });
-                }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-            }), authWindowTimeout);
         }
     });
-    const connectWithFarcaster = (authMode_1, _g) => _tslib.__awaiter(void 0, [authMode_1, _g], void 0, function* (authMode, { captchaToken }) {
+    const connectWithFarcaster = (authMode_1, _d) => _tslib.__awaiter(void 0, [authMode_1, _d], void 0, function* (authMode, { captchaToken }) {
         const dynamicNonce = consumeNonce();
         const domain = utils.PlatformService.getHost();
         const data = yield farcaster.connect({

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

@@ -1,9 +1,9 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useRef } from 'react';
-import { ProviderEnum, OauthResultStatus } from '@dynamic-labs/sdk-api-core';
+import { useState } from 'react';
+import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { SocialOAuthErrorCode } from '@dynamic-labs/types';
-import { isMobile, PlatformService, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
+import { Oauth2Service, isMobile, PlatformService, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -15,6 +15,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '@dynamic-labs/logger';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -30,7 +31,6 @@ import '@dynamic-labs/store';
 import { getOAuthResult, signInOAuth, verifyOAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import { randomString } from '../../functions/randomString/randomString.js';
-import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyURIQuery.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -40,7 +40,7 @@ import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useUserAuth } from '../useUserAuth/useUserAuth.js';
-import { connect, watchStatus } from './farcaster.js';
+import { connect, watchStatus } from './farcaster/farcaster.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
@@ -80,6 +80,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 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';
 
 const socialProviders = [
@@ -97,7 +108,6 @@ const socialProviders = [
 // 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();
@@ -107,14 +117,12 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     });
     const [isProcessing, setIsProcessing] = useState(false);
     const [error, setError] = useState();
-    const providersWaitingOauthMessage = useRef({});
-    const authWindowInterval = useRef();
-    const shouldPool = 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))
@@ -127,31 +135,10 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     const handleError = (provider, code, message, options) => {
         const error = { code, message };
         logger.error(message);
-        setIsProcessing(false);
         setError(error);
         setErrorMessage(code);
         onFailed(provider, { error }, options);
     };
-    const poolOauthResult = (provider, state) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!shouldPool.current) {
-            return;
-        }
-        const result = yield getOAuthResult(environmentId, provider, {
-            state,
-        });
-        if ((result === null || result === void 0 ? void 0 : result.status) !== 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, SocialOAuthErrorCode.NO_PROVIDER, 'Provider is required', { raiseAuthFailure: authMode === 'signin' });
@@ -188,7 +175,6 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
     });
     const connectSocialAccount = (_a) => __awaiter(void 0, [_a], void 0, function* ({ authMode, provider, validator, captchaToken, }) {
         var _b, _c;
-        clearInterval(authWindowInterval.current);
         clearError();
         setIsProcessing(true);
         if (!authMode) {
@@ -209,80 +195,39 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         });
         if (provider === ProviderEnum.Farcaster)
             return connectWithFarcaster(authMode, { captchaToken });
-        const authWindow = window.open('', '_blank', 'width=500,height=600');
         const state = randomString(8);
         const verifier = randomString(43);
-        const clearListeners = () => {
-            window.removeEventListener('message', handleAuthWindowMessage);
-            providersWaitingOauthMessage.current = Object.assign(Object.assign({}, providersWaitingOauthMessage.current), { [provider]: false });
-        };
-        const handleAuthWindowMessage = (event) => __awaiter(void 0, void 0, void 0, function* () {
-            var _d, _e;
-            const message = event.data;
-            const apiProvider = 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.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.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.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, 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, 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, SocialOAuthErrorCode.OAUTH_ERROR, `Failed to connect ${provider} social account: Invalid random state`, { raiseAuthFailure: authMode === 'signin' });
-                return;
-            }
-            if (!code) {
-                handleError(provider, SocialOAuthErrorCode.NO_AUTH_CODE, `Failed to connect ${provider} social account: no authorization code`, { raiseAuthFailure: authMode === 'signin' });
-                return;
-            }
+        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 (providersRequiringPkce.includes(provider)) {
+            const digest = yield digestSHA256(verifier);
+            oauthLoginUrl.searchParams.set('code_challenge', encodeBase64URL(digest));
+            oauthLoginUrl.searchParams.set('code_challenge_method', 'S256');
+        }
+        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,
+                }),
+                isMobile: isMobile(),
+                oauthLoginUrl,
+                onSettled,
+                provider,
+                sessionTimeout,
+                setIsProcessing,
+                state,
+            });
             if (authMode === 'signin') {
                 const apiCall = () => signInOAuth(environmentId, provider, {
                     captchaToken,
-                    code,
+                    code: authCode,
                     codeVerifier: verifier,
                     state,
                 });
@@ -290,80 +235,29 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             }
             else {
                 const apiCall = () => verifyOAuth(environmentId, provider, {
-                    code,
+                    code: authCode,
                     codeVerifier: verifier,
                     state,
                 });
                 yield linkAccount(provider, apiCall);
             }
-            setIsProcessing(false);
-        });
-        const loginUrl = getOauthLoginUrl((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) !== null && _b !== void 0 ? _b : [], provider);
-        if (!loginUrl) {
-            handleError(provider, 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({
-            state,
-        });
-        let oauthLoginUrl = `${loginUrl}&${stateParam}`;
-        // only add pkce params for providers that support/require it
-        if (providersRequiringPkce.includes(provider)) {
-            const digest = yield digestSHA256(verifier);
-            const pkceParams = stringifyURIQuery({
-                code_challenge: encodeBase64URL(digest),
-                code_challenge_method: 'S256',
-            });
-            oauthLoginUrl = `${oauthLoginUrl}&${pkceParams}`;
-        }
-        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;
-                }
-                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');
-                }
-            }, 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 (isMobile()) {
-                authWindowTimeout = authWindowTimeout * 3;
+        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',
+                });
             }
-            authWindowInterval.current = setInterval(() => __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, SocialOAuthErrorCode.OAUTH_WINDOW_TIMEOUT, `Connecting ${provider} account window timeout.`, { raiseAuthFailure: authMode === 'signin' });
-                }
-                clearInterval(authWindowInterval.current);
-                setIsProcessing(false);
-                onSettled === null || onSettled === void 0 ? void 0 : onSettled();
-            }), authWindowTimeout);
         }
     });
-    const connectWithFarcaster = (authMode_1, _g) => __awaiter(void 0, [authMode_1, _g], void 0, function* (authMode, { captchaToken }) {
+    const connectWithFarcaster = (authMode_1, _d) => __awaiter(void 0, [authMode_1, _d], void 0, function* (authMode, { captchaToken }) {
         const dynamicNonce = consumeNonce();
         const domain = PlatformService.getHost();
         const data = yield connect({