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

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+## [2.2.0-alpha.3](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.0-alpha.2...v2.2.0-alpha.3) (2024-06-05)
+
+
+### Features
+
+* farcaster linking ([#5869](https://github.com/dynamic-labs/DynamicAuth/issues/5869)) ([191d1d2](https://github.com/dynamic-labs/DynamicAuth/commit/191d1d29e436e7d453d533c9c330ac5cef2e2a1c))
+
+
+### Bug Fixes
+
+* phone number in kyc step ([#5875](https://github.com/dynamic-labs/DynamicAuth/issues/5875)) ([d73f3b1](https://github.com/dynamic-labs/DynamicAuth/commit/d73f3b158e794727e7bed5d558a43d937951ce56))
+
 ## [2.2.0-alpha.2](https://github.com/dynamic-labs/DynamicAuth/compare/v2.2.0-alpha.1...v2.2.0-alpha.2) (2024-06-05)
 
 

package/package.cjs

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "2.2.0-alpha.2";
+var version = "2.2.0-alpha.3";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.0.453",
+	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	formik: "2.2.9",

package/package.js

@@ -1,7 +1,7 @@
 'use client'
-var version = "2.2.0-alpha.2";
+var version = "2.2.0-alpha.3";
 var dependencies = {
-	"@dynamic-labs/sdk-api-core": "0.0.453",
+	"@dynamic-labs/sdk-api-core": "0.0.460",
 	"@hcaptcha/react-hcaptcha": "1.4.4",
 	"country-list": "2.3.0",
 	formik: "2.2.9",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "2.2.0-alpha.2",
+  "version": "2.2.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
     "directory": "packages/sdk-react-core"
   },
   "dependencies": {
-    "@dynamic-labs/sdk-api-core": "0.0.453",
+    "@dynamic-labs/sdk-api-core": "0.0.460",
     "@hcaptcha/react-hcaptcha": "1.4.4",
     "country-list": "2.3.0",
     "formik": "2.2.9",
@@ -17,18 +17,18 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "2.2.0-alpha.2",
-    "@dynamic-labs/logger": "2.2.0-alpha.2",
-    "@dynamic-labs/multi-wallet": "2.2.0-alpha.2",
-    "@dynamic-labs/rpc-provider-ethereum": "2.2.0-alpha.2",
-    "@dynamic-labs/rpc-provider-solana": "2.2.0-alpha.2",
-    "@dynamic-labs/rpc-providers": "2.2.0-alpha.2",
-    "@dynamic-labs/store": "2.2.0-alpha.2",
-    "@dynamic-labs/types": "2.2.0-alpha.2",
-    "@dynamic-labs/utils": "2.2.0-alpha.2",
-    "@dynamic-labs/viem-utils": "2.2.0-alpha.2",
-    "@dynamic-labs/wallet-book": "2.2.0-alpha.2",
-    "@dynamic-labs/wallet-connector-core": "2.2.0-alpha.2",
+    "@dynamic-labs/iconic": "2.2.0-alpha.3",
+    "@dynamic-labs/logger": "2.2.0-alpha.3",
+    "@dynamic-labs/multi-wallet": "2.2.0-alpha.3",
+    "@dynamic-labs/rpc-provider-ethereum": "2.2.0-alpha.3",
+    "@dynamic-labs/rpc-provider-solana": "2.2.0-alpha.3",
+    "@dynamic-labs/rpc-providers": "2.2.0-alpha.3",
+    "@dynamic-labs/store": "2.2.0-alpha.3",
+    "@dynamic-labs/types": "2.2.0-alpha.3",
+    "@dynamic-labs/utils": "2.2.0-alpha.3",
+    "@dynamic-labs/viem-utils": "2.2.0-alpha.3",
+    "@dynamic-labs/wallet-book": "2.2.0-alpha.3",
+    "@dynamic-labs/wallet-connector-core": "2.2.0-alpha.3",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/data/api/oauth/oauth.cjs

@@ -134,8 +134,22 @@ const farcasterSignIn = (environmentId, farcasterSignInRequest) => _tslib.__awai
         return undefined;
     }
 });
+const farcasterVerify = (farcasterVerifyRequest) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const response = yield api.sdkApi().farcasterVerify(farcasterVerifyRequest);
+        const user = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
+        return user;
+    }
+    catch (e) {
+        if (e.status === 422) {
+            throw new utils.SocialAccountAlreadyExistsError();
+        }
+        return undefined;
+    }
+});
 
 exports.farcasterSignIn = farcasterSignIn;
+exports.farcasterVerify = farcasterVerify;
 exports.getOAuthResult = getOAuthResult;
 exports.signInOAuth = signInOAuth;
 exports.unlinkOAuth = unlinkOAuth;

package/src/lib/data/api/oauth/oauth.d.ts

@@ -1,4 +1,4 @@
-import { FarcasterSignInRequest, OauthRequest, OauthResultRequest, OauthResultResponse, ProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { FarcasterSignInRequest, OauthRequest, OauthResultRequest, OauthResultResponse, ProviderEnum, FarcasterVerifyRequest } from '@dynamic-labs/sdk-api-core';
 import { UserProfile } from '../../../..';
 export declare const getOauthLoginUrl: (environmentId: string, providerType: ProviderEnum) => Promise<string | undefined>;
 export declare const verifyOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state }: OauthRequest) => Promise<UserProfile | undefined>;
@@ -10,3 +10,4 @@ export declare const unlinkOAuth: ({ environmentId, primaryWalletId, verifiedCre
 export declare const signInOAuth: (environmentId: string, providerType: ProviderEnum, { code, codeVerifier, state, captchaToken }: OauthRequest) => Promise<UserProfile | undefined>;
 export declare const getOAuthResult: (environmentId: string, providerType: ProviderEnum, { state }: OauthResultRequest) => Promise<OauthResultResponse | undefined>;
 export declare const farcasterSignIn: (environmentId: string, farcasterSignInRequest: FarcasterSignInRequest) => Promise<UserProfile | undefined>;
+export declare const farcasterVerify: (farcasterVerifyRequest: FarcasterVerifyRequest) => Promise<UserProfile | undefined>;

package/src/lib/data/api/oauth/oauth.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { GateBlockedError, NoAccessError, AccountExistsError, SocialAccountAlreadyExistsError } from '@dynamic-labs/utils';
+import { SocialAccountAlreadyExistsError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -130,5 +130,18 @@ const farcasterSignIn = (environmentId, farcasterSignInRequest) => __awaiter(voi
         return undefined;
     }
 });
+const farcasterVerify = (farcasterVerifyRequest) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const response = yield sdkApi().farcasterVerify(farcasterVerifyRequest);
+        const user = storeAuthTokenAndUser(response);
+        return user;
+    }
+    catch (e) {
+        if (e.status === 422) {
+            throw new SocialAccountAlreadyExistsError();
+        }
+        return undefined;
+    }
+});
 
-export { farcasterSignIn, getOAuthResult, signInOAuth, unlinkOAuth, verifyOAuth };
+export { farcasterSignIn, farcasterVerify, getOAuthResult, signInOAuth, unlinkOAuth, verifyOAuth };

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

@@ -419,7 +419,19 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             yield signInAccount(sdkApiCore.ProviderEnum.Farcaster, apiCall);
         }
         else {
-            handleError(sdkApiCore.ProviderEnum.Farcaster, types.SocialOAuthErrorCode.GENERAL_ERROR, 'Linking with Farcaster is not supported at the moment.', { raiseAuthFailure: true });
+            const apiCall = () => oauth.farcasterVerify({
+                environmentId,
+                farcasterSignInRequest: {
+                    address,
+                    captchaToken,
+                    domain,
+                    message,
+                    nonce,
+                    signature,
+                },
+            });
+            yield linkAccount(sdkApiCore.ProviderEnum.Farcaster, apiCall);
+            setShowAuthFlow(false, { clearErrors: false });
         }
         setIsProcessing(false);
     });

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

@@ -30,7 +30,7 @@ import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
-import { getOAuthResult, signInOAuth, farcasterSignIn, verifyOAuth } from '../../../data/api/oauth/oauth.js';
+import { getOAuthResult, signInOAuth, verifyOAuth, farcasterSignIn, farcasterVerify } from '../../../data/api/oauth/oauth.js';
 import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -415,7 +415,19 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
             yield signInAccount(ProviderEnum.Farcaster, apiCall);
         }
         else {
-            handleError(ProviderEnum.Farcaster, SocialOAuthErrorCode.GENERAL_ERROR, 'Linking with Farcaster is not supported at the moment.', { raiseAuthFailure: true });
+            const apiCall = () => farcasterVerify({
+                environmentId,
+                farcasterSignInRequest: {
+                    address,
+                    captchaToken,
+                    domain,
+                    message,
+                    nonce,
+                    signature,
+                },
+            });
+            yield linkAccount(ProviderEnum.Farcaster, apiCall);
+            setShowAuthFlow(false, { clearErrors: false });
         }
         setIsProcessing(false);
     });

package/src/lib/views/CollectUserDataView/UserDataFields/UserPhoneField/UserPhoneField.cjs

@@ -33,6 +33,7 @@ require('../../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
 var getSupportedCountriesForVerificationFromProjectSettings = require('../../../../utils/functions/getSupportedCountriesForVerificationFromProjectSettings/getSupportedCountriesForVerificationFromProjectSettings.cjs');
+var getDefaultCountriesIfEmpty = require('../../../../utils/functions/getDefaultCountriesIfEmpty/getDefaultCountriesIfEmpty.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -92,9 +93,10 @@ const UserPhoneField = ({ onChange, value: phone, onBlur, disabled, label, requi
                 target: { name, value: newPhone },
             });
     };
-    const countries = React.useMemo(() => getCustomCountries.getCustomCountries(verify
-        ? getSupportedCountriesForVerificationFromProjectSettings.getSupportedCountriesForVerificationFromProjectSettings(projectSettings)
-        : undefined), [verify, projectSettings]);
+    const countries = React.useMemo(() => {
+        const enabledCountries = getSupportedCountriesForVerificationFromProjectSettings.getSupportedCountriesForVerificationFromProjectSettings(projectSettings);
+        return getCustomCountries.getCustomCountries(verify ? getDefaultCountriesIfEmpty.getDefaultCountriesIfEmpty(enabledCountries) : undefined);
+    }, [verify, projectSettings]);
     return (jsxRuntime.jsx(PhoneNumberField.PhoneNumberField, { countries: countries, initialPhone: phone, disabled: disabled, onUpdate: handleUpdate, onBlur: onBlur, label: label, appendRight: !disabled && !required ? (jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'secondary', className: 'user-phone-field__optional-label', children: "Optional" })) : undefined, error: error }));
 };
 

package/src/lib/views/CollectUserDataView/UserDataFields/UserPhoneField/UserPhoneField.js

@@ -29,6 +29,7 @@ import '../../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
 import { getSupportedCountriesForVerificationFromProjectSettings } from '../../../../utils/functions/getSupportedCountriesForVerificationFromProjectSettings/getSupportedCountriesForVerificationFromProjectSettings.js';
+import { getDefaultCountriesIfEmpty } from '../../../../utils/functions/getDefaultCountriesIfEmpty/getDefaultCountriesIfEmpty.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -88,9 +89,10 @@ const UserPhoneField = ({ onChange, value: phone, onBlur, disabled, label, requi
                 target: { name, value: newPhone },
             });
     };
-    const countries = useMemo(() => getCustomCountries(verify
-        ? getSupportedCountriesForVerificationFromProjectSettings(projectSettings)
-        : undefined), [verify, projectSettings]);
+    const countries = useMemo(() => {
+        const enabledCountries = getSupportedCountriesForVerificationFromProjectSettings(projectSettings);
+        return getCustomCountries(verify ? getDefaultCountriesIfEmpty(enabledCountries) : undefined);
+    }, [verify, projectSettings]);
     return (jsx(PhoneNumberField, { countries: countries, initialPhone: phone, disabled: disabled, onUpdate: handleUpdate, onBlur: onBlur, label: label, appendRight: !disabled && !required ? (jsx(Typography, { variant: 'body_small', color: 'secondary', className: 'user-phone-field__optional-label', children: "Optional" })) : undefined, error: error }));
 };