@dynamic-labs/sdk-react-core 2.1.0-alpha.3 → 2.1.0-alpha.31

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useMemo } from 'react';
+import { useMemo, useCallback } from 'react';
 import { SocialOAuthErrorCode } from '@dynamic-labs/types';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
@@ -8,7 +8,7 @@ import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
-import '../../../context/ViewContext/ViewContext.js';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
@@ -20,31 +20,32 @@ import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
-import { getMinAuthToken } from '../../functions/getMinAuthToken/getMinAuthToken.js';
 import 'react-international-phone';
 import { getEnabledOAuthProviders } from '../../functions/getEnabledOAuthProviders/index.js';
+import { getEnabledSocialSignInProvidersAsProviderEnum } from '../../functions/getEnabledSocialSignInProvidersAsProviderEnum/getEnabledSocialSignInProvidersAsProviderEnum.js';
 import { isSocialKycEnabled } from '../../functions/isSocialKycEnabled/isSocialKycEnabled.js';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import { unlinkOAuth } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
-import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useSocialAuth } from '../useSocialAuth/useSocialAuth.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
-import 'react-i18next';
+import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
-import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../../components/Alert/Alert.js';
 import '../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../components/IconButton/IconButton.js';
@@ -70,6 +71,8 @@ import '../../../context/LoadingContext/LoadingContext.js';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -82,14 +85,12 @@ const useSocialAccounts = ({ sessionTimeout } = {
     sessionTimeout: 10000,
 }) => {
     var _a;
-    const { environmentId, user, projectSettings, onboardingOnlyJwt } = useInternalDynamicContext();
-    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
+    const { environmentId, user, projectSettings } = useInternalDynamicContext();
+    const { setView } = useViewContext();
     const { handleError, setError, setIsProcessing, checkValidProvider, error, isProcessing, connectSocialAccount, } = useSocialAuth({
-        authMode: 'link',
+        onFarcasterUrl: (url) => setView('farcaster-connect-view', { url }),
         sessionTimeout,
     });
-    const userJwt = (_a = getMinAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
-    const oauthProviders = getEnabledOAuthProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
     const verifiedOAuthCredentialsMap = useMemo(() => {
         var _a, _b;
         const verifiedOAuthCredential = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.filter((credential) => credential.format === 'oauth')) !== null && _b !== void 0 ? _b : [];
@@ -101,36 +102,41 @@ const useSocialAccounts = ({ sessionTimeout } = {
             ];
         })));
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials]);
-    const checkValidOAuthLinking = (provider) => {
+    const checkValidOAuthLinking = useCallback((provider) => {
         if (!isSocialKycEnabled(projectSettings)) {
-            handleError(SocialOAuthErrorCode.SOCIAL_LINKING_NOT_ENABLED, 'Social linking is not enabled on the dashboard');
+            handleError(provider, SocialOAuthErrorCode.SOCIAL_LINKING_NOT_ENABLED, 'Social linking is not enabled on the dashboard', { raiseAuthFailure: false });
             return false;
         }
         const verifiedCredential = verifiedOAuthCredentialsMap[provider];
         if (verifiedCredential) {
-            handleError(SocialOAuthErrorCode.ACCOUNT_ALREADY_LINKED, `Account already linked for provider: ${provider}`);
+            handleError(provider, SocialOAuthErrorCode.ACCOUNT_ALREADY_LINKED, `Account already linked for provider: ${provider}`, { raiseAuthFailure: false });
             return false;
         }
+        const oauthProviders = getEnabledOAuthProviders(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
         const oauthProvider = oauthProviders.find((p) => p.provider === provider);
         if (!oauthProvider) {
-            handleError(SocialOAuthErrorCode.PROVIDER_NOT_ENABLED, `Provider is not enabled on the dashboard: ${provider}`);
+            handleError(provider, SocialOAuthErrorCode.PROVIDER_NOT_ENABLED, `Provider is not enabled on the dashboard: ${provider}`, { raiseAuthFailure: false });
             return false;
         }
         return true;
-    };
-    const linkSocialAccount = (provider) => __awaiter(void 0, void 0, void 0, function* () {
-        connectSocialAccount({ provider, validator: checkValidOAuthLinking });
-    });
-    const unlinkSocialAccount = (provider) => __awaiter(void 0, void 0, void 0, function* () {
+    }, [handleError, projectSettings, verifiedOAuthCredentialsMap]);
+    const linkSocialAccount = useCallback((provider) => __awaiter(void 0, void 0, void 0, function* () {
+        connectSocialAccount({
+            authMode: 'link',
+            provider,
+            validator: checkValidOAuthLinking,
+        });
+    }), [checkValidOAuthLinking, connectSocialAccount]);
+    const unlinkSocialAccount = useCallback((provider) => __awaiter(void 0, void 0, void 0, function* () {
         var _b;
         setError(undefined);
         setIsProcessing(true);
-        if (!checkValidProvider(provider)) {
+        if (!checkValidProvider(provider, 'unlink')) {
             return;
         }
         const verifiedCredential = verifiedOAuthCredentialsMap[provider];
         if (!verifiedCredential) {
-            handleError(SocialOAuthErrorCode.NO_ACCOUNT_LINKED, `No account linked for provider: ${provider}`);
+            handleError(provider, SocialOAuthErrorCode.NO_ACCOUNT_LINKED, `No account linked for provider: ${provider}`, { raiseAuthFailure: false });
             return;
         }
         try {
@@ -139,20 +145,26 @@ const useSocialAccounts = ({ sessionTimeout } = {
                 environmentId,
                 primaryWalletId,
                 verifiedCrentialId: (_b = verifiedCredential.id) !== null && _b !== void 0 ? _b : '',
-            }, String(userJwt));
+            });
             if (!response) {
-                handleError(SocialOAuthErrorCode.UNLINK_ERROR, `Failed to unlink social account: ${provider} | ${verifiedCredential.id}`);
+                handleError(provider, SocialOAuthErrorCode.UNLINK_ERROR, `Failed to unlink social account: ${provider} | ${verifiedCredential.id}`, { raiseAuthFailure: false });
                 return;
             }
-            yield updateUserProfileByJWT(response.jwt, response.minifiedJwt);
             setIsProcessing(false);
         }
         catch (err) {
-            handleError(SocialOAuthErrorCode.GENERAL_ERROR, `Failed to unlink social account: ${provider} | ${verifiedCredential.id}`);
+            handleError(provider, SocialOAuthErrorCode.GENERAL_ERROR, `Failed to unlink social account: ${provider} | ${verifiedCredential.id}`, { raiseAuthFailure: false });
         }
-    });
-    const isLinked = (provider) => Boolean(verifiedOAuthCredentialsMap[provider]);
-    const getLinkedAccountInformation = (provider) => {
+    }), [
+        checkValidProvider,
+        environmentId,
+        handleError,
+        setError,
+        setIsProcessing,
+        verifiedOAuthCredentialsMap,
+    ]);
+    const isLinked = useCallback((provider) => Boolean(verifiedOAuthCredentialsMap[provider]), [verifiedOAuthCredentialsMap]);
+    const getLinkedAccountInformation = useCallback((provider) => {
         const verifiedCredential = verifiedOAuthCredentialsMap[provider];
         if (!verifiedCredential) {
             return;
@@ -168,15 +180,40 @@ const useSocialAccounts = ({ sessionTimeout } = {
             publicIdentifier,
             username: oauthUsername,
         };
-    };
-    return {
+    }, [verifiedOAuthCredentialsMap]);
+    const checkValidOAuthSignIn = useCallback((provider) => {
+        var _a;
+        const oauthProvider = getEnabledSocialSignInProvidersAsProviderEnum((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.socialSignIn) === null || _a === void 0 ? void 0 : _a.providers).find((socialProvider) => socialProvider === provider);
+        if (!oauthProvider) {
+            handleError(provider, SocialOAuthErrorCode.PROVIDER_NOT_ENABLED, `Provider is not enabled for sign-in on the dashboard: ${provider}`, { raiseAuthFailure: true });
+            return false;
+        }
+        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* () {
+        return connectSocialAccount({
+            authMode: 'signin',
+            provider,
+            validator: checkValidOAuthSignIn,
+        });
+    }), [checkValidOAuthSignIn, connectSocialAccount]);
+    return useMemo(() => ({
+        error,
+        getLinkedAccountInformation,
+        isLinked,
+        isProcessing,
+        linkSocialAccount,
+        signInWithSocialAccount,
+        unlinkSocialAccount,
+    }), [
         error,
         getLinkedAccountInformation,
         isLinked,
         isProcessing,
         linkSocialAccount,
+        signInWithSocialAccount,
         unlinkSocialAccount,
-    };
+    ]);
 };
 
 export { useSocialAccounts };

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

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var utils = require('@dynamic-labs/utils');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../shared/logger.cjs');
@@ -16,7 +17,6 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
 const CONNECT_URL = 'https://relay.farcaster.xyz/v1/channel';
@@ -25,7 +25,7 @@ const STATUS_TIMEOUT = 300000;
 const STATUS_INTERVAL = 1000;
 const connect = (connectRequest) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(CONNECT_URL, {
+        const response = yield utils.FetchService.fetch(CONNECT_URL, {
             body: JSON.stringify(connectRequest),
             headers: {
                 'Content-Type': 'application/json',
@@ -44,7 +44,7 @@ const connect = (connectRequest) => _tslib.__awaiter(void 0, void 0, void 0, fun
 });
 const status = (connectStatusRequest) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(STATUS_URL, {
+        const response = yield utils.FetchService.fetch(STATUS_URL, {
             headers: {
                 Authorization: `Bearer ${connectStatusRequest.channelToken}`,
                 'Content-Type': 'application/json',
@@ -64,9 +64,18 @@ const status = (connectStatusRequest) => _tslib.__awaiter(void 0, void 0, void 0
 const watchStatus = (connectStatusRequest_1, ...args_1) => _tslib.__awaiter(void 0, [connectStatusRequest_1, ...args_1], void 0, function* (connectStatusRequest, { timeout = STATUS_TIMEOUT, interval = STATUS_INTERVAL } = {}) {
     const deadline = Date.now() + timeout;
     let shouldPoll = true;
+    let storedResolve = undefined;
+    // When we cancel, immediately resolve the current timeout promise and abort status watch
     dynamicEvents.dynamicEvents.on('farcasterConnectCancelled', () => {
         shouldPoll = false;
+        storedResolve === null || storedResolve === void 0 ? void 0 : storedResolve();
+        storedResolve = undefined;
     });
+    // Declaring the promise callback outside of loop to avoid unnecessary garbage generation
+    const timeoutCallback = (resolve) => {
+        storedResolve = resolve;
+        setTimeout(resolve, interval);
+    };
     while (shouldPoll && Date.now() < deadline) {
         const response = yield status(connectStatusRequest);
         if (!response) {
@@ -75,7 +84,7 @@ const watchStatus = (connectStatusRequest_1, ...args_1) => _tslib.__awaiter(void
         if (response.state === 'completed') {
             return response;
         }
-        yield new Promise((resolve) => setTimeout(resolve, STATUS_INTERVAL));
+        yield new Promise(timeoutCallback);
     }
     if (!shouldPoll) {
         return 'cancelled';

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

@@ -8,7 +8,9 @@ interface FarcasterConnectRequest {
     redirectUrl?: string;
 }
 interface FarcasterConnectResponse {
+    /** Connect relay channel token UUID */
     channelToken: string;
+    /** Sign in With Farcaster URL to present to the user */
     url: string;
 }
 interface FarcasterConnectStatusRequest {

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

@@ -1,5 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { FetchService } from '@dynamic-labs/utils';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
@@ -12,7 +13,6 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
-import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
 const CONNECT_URL = 'https://relay.farcaster.xyz/v1/channel';
@@ -21,7 +21,7 @@ const STATUS_TIMEOUT = 300000;
 const STATUS_INTERVAL = 1000;
 const connect = (connectRequest) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(CONNECT_URL, {
+        const response = yield FetchService.fetch(CONNECT_URL, {
             body: JSON.stringify(connectRequest),
             headers: {
                 'Content-Type': 'application/json',
@@ -40,7 +40,7 @@ const connect = (connectRequest) => __awaiter(void 0, void 0, void 0, function*
 });
 const status = (connectStatusRequest) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const response = yield fetch(STATUS_URL, {
+        const response = yield FetchService.fetch(STATUS_URL, {
             headers: {
                 Authorization: `Bearer ${connectStatusRequest.channelToken}`,
                 'Content-Type': 'application/json',
@@ -60,9 +60,18 @@ const status = (connectStatusRequest) => __awaiter(void 0, void 0, void 0, funct
 const watchStatus = (connectStatusRequest_1, ...args_1) => __awaiter(void 0, [connectStatusRequest_1, ...args_1], void 0, function* (connectStatusRequest, { timeout = STATUS_TIMEOUT, interval = STATUS_INTERVAL } = {}) {
     const deadline = Date.now() + timeout;
     let shouldPoll = true;
+    let storedResolve = undefined;
+    // When we cancel, immediately resolve the current timeout promise and abort status watch
     dynamicEvents.on('farcasterConnectCancelled', () => {
         shouldPoll = false;
+        storedResolve === null || storedResolve === void 0 ? void 0 : storedResolve();
+        storedResolve = undefined;
     });
+    // Declaring the promise callback outside of loop to avoid unnecessary garbage generation
+    const timeoutCallback = (resolve) => {
+        storedResolve = resolve;
+        setTimeout(resolve, interval);
+    };
     while (shouldPoll && Date.now() < deadline) {
         const response = yield status(connectStatusRequest);
         if (!response) {
@@ -71,7 +80,7 @@ const watchStatus = (connectStatusRequest_1, ...args_1) => __awaiter(void 0, [co
         if (response.state === 'completed') {
             return response;
         }
-        yield new Promise((resolve) => setTimeout(resolve, STATUS_INTERVAL));
+        yield new Promise(timeoutCallback);
     }
     if (!shouldPoll) {
         return 'cancelled';