@dynamic-labs/sdk-react-core 3.0.0-alpha.43 → 3.0.0-alpha.45

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## [3.0.0-alpha.45](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.44...v3.0.0-alpha.45) (2024-08-16)
+
+
+### Bug Fixes
+
+* always check for dynamicOauthCode and use during signin or verify ([#6618](https://github.com/dynamic-labs/DynamicAuth/issues/6618)) ([dd33231](https://github.com/dynamic-labs/DynamicAuth/commit/dd332310c9fdfa7bb593b7f567751133a93c6938))
+* display qr code when no primary is selected ([#6605](https://github.com/dynamic-labs/DynamicAuth/issues/6605)) ([406afa3](https://github.com/dynamic-labs/DynamicAuth/commit/406afa32b38a29a2d8ce96803ae45ab35adb5ce3))
+
+## [3.0.0-alpha.44](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.43...v3.0.0-alpha.44) (2024-08-15)
+
+
+### Bug Fixes
+
+* populate wallet new isPrimary flag ([#6597](https://github.com/dynamic-labs/DynamicAuth/issues/6597)) ([7809f81](https://github.com/dynamic-labs/DynamicAuth/commit/7809f81c9743b8bf7bc27dc34cf45923cf9baf99))
+* twitter should no longer rely polling for oauth flow ([#6603](https://github.com/dynamic-labs/DynamicAuth/issues/6603)) ([09aea8b](https://github.com/dynamic-labs/DynamicAuth/commit/09aea8b3f197c25dcfb5bc72049b90859df246f3))
+
 ## [3.0.0-alpha.43](https://github.com/dynamic-labs/DynamicAuth/compare/v3.0.0-alpha.42...v3.0.0-alpha.43) (2024-08-15)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "3.0.0-alpha.43";
+var version = "3.0.0-alpha.45";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.516",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "3.0.0-alpha.43";
+var version = "3.0.0-alpha.45";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.516",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "3.0.0-alpha.43",
+  "version": "3.0.0-alpha.45",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/dynamic-labs/dynamic-auth.git",
@@ -17,17 +17,17 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/iconic": "3.0.0-alpha.43",
-    "@dynamic-labs/logger": "3.0.0-alpha.43",
-    "@dynamic-labs/message-transport": "3.0.0-alpha.43",
-    "@dynamic-labs/multi-wallet": "3.0.0-alpha.43",
-    "@dynamic-labs/rpc-providers": "3.0.0-alpha.43",
-    "@dynamic-labs/store": "3.0.0-alpha.43",
-    "@dynamic-labs/types": "3.0.0-alpha.43",
-    "@dynamic-labs/utils": "3.0.0-alpha.43",
-    "@dynamic-labs/viem-utils": "3.0.0-alpha.43",
-    "@dynamic-labs/wallet-book": "3.0.0-alpha.43",
-    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.43",
+    "@dynamic-labs/iconic": "3.0.0-alpha.45",
+    "@dynamic-labs/logger": "3.0.0-alpha.45",
+    "@dynamic-labs/message-transport": "3.0.0-alpha.45",
+    "@dynamic-labs/multi-wallet": "3.0.0-alpha.45",
+    "@dynamic-labs/rpc-providers": "3.0.0-alpha.45",
+    "@dynamic-labs/store": "3.0.0-alpha.45",
+    "@dynamic-labs/types": "3.0.0-alpha.45",
+    "@dynamic-labs/utils": "3.0.0-alpha.45",
+    "@dynamic-labs/viem-utils": "3.0.0-alpha.45",
+    "@dynamic-labs/wallet-book": "3.0.0-alpha.45",
+    "@dynamic-labs/wallet-connector-core": "3.0.0-alpha.45",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/SocialRedirectContext/hooks/useRedirectSocialHandler/useRedirectSocialHandler.cjs

@@ -122,12 +122,15 @@ const useRedirectSocialHandler = ({ setSocialProvider, }) => {
             return;
         const url = new URL(window.location.href);
         const dynamicOauthState = url.searchParams.get('dynamicOauthState');
-        if (!dynamicOauthState) {
+        const dynamicOauthCode = url.searchParams.get('dynamicOauthCode');
+        if (!dynamicOauthState || !dynamicOauthCode) {
             return;
         }
         const socialStorageItem = socialStorage.searchSocialStorageByState(dynamicOauthState);
         if (!socialStorageItem)
             return;
+        // we got back the dynamicOauthCode from the oauth provider, set it here so we can use it to sign in
+        socialStorageItem.code = dynamicOauthCode;
         setSocialStorageItem(socialStorageItem);
         // Clear the state from local storage
         socialStorage.deleteSocialStorage(socialStorageItem.provider);
@@ -144,6 +147,7 @@ const useRedirectSocialHandler = ({ setSocialProvider, }) => {
             updateInterfaceStateForLink();
         }
         yield completeConnection({
+            authCode: socialStorageItem.code,
             authMode,
             captchaToken: socialStorageItem.captchaToken,
             provider: socialStorageItem.provider,

package/src/lib/context/SocialRedirectContext/hooks/useRedirectSocialHandler/useRedirectSocialHandler.js

@@ -118,12 +118,15 @@ const useRedirectSocialHandler = ({ setSocialProvider, }) => {
             return;
         const url = new URL(window.location.href);
         const dynamicOauthState = url.searchParams.get('dynamicOauthState');
-        if (!dynamicOauthState) {
+        const dynamicOauthCode = url.searchParams.get('dynamicOauthCode');
+        if (!dynamicOauthState || !dynamicOauthCode) {
             return;
         }
         const socialStorageItem = searchSocialStorageByState(dynamicOauthState);
         if (!socialStorageItem)
             return;
+        // we got back the dynamicOauthCode from the oauth provider, set it here so we can use it to sign in
+        socialStorageItem.code = dynamicOauthCode;
         setSocialStorageItem(socialStorageItem);
         // Clear the state from local storage
         deleteSocialStorage(socialStorageItem.provider);
@@ -140,6 +143,7 @@ const useRedirectSocialHandler = ({ setSocialProvider, }) => {
             updateInterfaceStateForLink();
         }
         yield completeConnection({
+            authCode: socialStorageItem.code,
             authMode,
             captchaToken: socialStorageItem.captchaToken,
             provider: socialStorageItem.provider,

package/src/lib/utils/functions/socialStorage/socialStorage.d.ts

@@ -8,6 +8,8 @@ export type SocialStorageItem = {
     codeVerifier: string | undefined;
     /** Captcha token used to verify the user is not a bot */
     captchaToken?: string;
+    /** Oauth code from redirect from oauth provider, this will be provided on response from redirect endpoint **/
+    code?: string;
 };
 export type SocialStorage = Partial<Record<ProviderEnum, SocialStorageItem>>;
 export declare const searchSocialStorageByState: (targetState: string) => SocialStorageItem | undefined;

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

@@ -165,6 +165,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
                 isAuthenticated: false,
+                isPrimary: primaryWalletId === storedConnectedWalletInfo.id,
                 key: walletConnector.key,
                 network: walletNetwork,
             });
@@ -176,6 +177,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         disconnectWallet,
         setConnectedWallets,
         walletConnectorOptions,
+        primaryWalletId,
     ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     React.useEffect(() => {

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

@@ -161,6 +161,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                 connector: walletConnector,
                 id: storedConnectedWalletInfo.id,
                 isAuthenticated: false,
+                isPrimary: primaryWalletId === storedConnectedWalletInfo.id,
                 key: walletConnector.key,
                 network: walletNetwork,
             });
@@ -172,6 +173,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         disconnectWallet,
         setConnectedWallets,
         walletConnectorOptions,
+        primaryWalletId,
     ]);
     // Generate the connectedWallets list when connectedWalletsInfo (localStorage) or memoized wallet connector updates
     useEffect(() => {

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.cjs

@@ -112,6 +112,7 @@ const useCoinbaseMPC = () => {
             connector,
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated: true,
+            isPrimary: true,
             key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         });
         return coinbaseMPCWallet;
@@ -178,6 +179,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: newSelectedCredentialWallet.id,
                 isAuthenticated: true,
+                isPrimary: true,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             });
             dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.js

@@ -108,6 +108,7 @@ const useCoinbaseMPC = () => {
             connector,
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated: true,
+            isPrimary: true,
             key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
         });
         return coinbaseMPCWallet;
@@ -174,6 +175,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: newSelectedCredentialWallet.id,
                 isAuthenticated: true,
+                isPrimary: true,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
             });
             dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -148,6 +148,7 @@ const useTurnkey = () => {
         var _a, _b, _c, _d;
         const { chain } = embeddedWalletVerifiedCredential;
         const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByChain(walletConnectorOptions, chain);
+        let newPrimaryWalletId = null;
         // if user already has embedded wallet, set it as primary wallet
         if (user) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
@@ -158,12 +159,14 @@ const useTurnkey = () => {
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
-                setPrimaryWalletId(smartWallet$1.id);
+                newPrimaryWalletId = smartWallet$1.id;
             }
             else {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                newPrimaryWalletId = embeddedWalletVerifiedCredential.id;
             }
         }
+        if (newPrimaryWalletId)
+            setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
         const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
         const passkeyWallet = new walletConnectorCore.Wallet({
@@ -172,6 +175,7 @@ const useTurnkey = () => {
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated,
+            isPrimary: newPrimaryWalletId === embeddedWalletVerifiedCredential.id,
             key: embeddedWalletVerifiedCredential.walletName ||
                 (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
                 '',
@@ -224,6 +228,7 @@ const useTurnkey = () => {
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    isPrimary: true,
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -144,6 +144,7 @@ const useTurnkey = () => {
         var _a, _b, _c, _d;
         const { chain } = embeddedWalletVerifiedCredential;
         const turnkeyWallet = findTurnkeyWalletByChain(walletConnectorOptions, chain);
+        let newPrimaryWalletId = null;
         // if user already has embedded wallet, set it as primary wallet
         if (user) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
@@ -154,12 +155,14 @@ const useTurnkey = () => {
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
-                setPrimaryWalletId(smartWallet.id);
+                newPrimaryWalletId = smartWallet.id;
             }
             else {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                newPrimaryWalletId = embeddedWalletVerifiedCredential.id;
             }
         }
+        if (newPrimaryWalletId)
+            setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
         const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
         const passkeyWallet = new Wallet({
@@ -168,6 +171,7 @@ const useTurnkey = () => {
             connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
             id: embeddedWalletVerifiedCredential.id,
             isAuthenticated,
+            isPrimary: newPrimaryWalletId === embeddedWalletVerifiedCredential.id,
             key: embeddedWalletVerifiedCredential.walletName ||
                 (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
                 '',
@@ -220,6 +224,7 @@ const useTurnkey = () => {
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
+                    isPrimary: true,
                     key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

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

@@ -241,7 +241,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                     const mobileRedirectUrl = effectiveRedirectUrl || window.location.href;
                     return oauth.initAuth(environmentId, provider, {
                         redirectUrl: isMobile
-                            ? removeDynamicOauthStateFromUrl(mobileRedirectUrl)
+                            ? removeDynamicOauthParamsFromUrl(mobileRedirectUrl)
                             : undefined,
                         state,
                     });
@@ -394,9 +394,10 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         setIsProcessing,
     };
 };
-const removeDynamicOauthStateFromUrl = (url) => {
+const removeDynamicOauthParamsFromUrl = (url) => {
     const urlObject = new URL(url);
     urlObject.searchParams.delete('dynamicOauthState');
+    urlObject.searchParams.delete('dynamicOauthCode');
     return urlObject.toString();
 };
 

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

@@ -237,7 +237,7 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
                     const mobileRedirectUrl = effectiveRedirectUrl || window.location.href;
                     return initAuth(environmentId, provider, {
                         redirectUrl: isMobile$1
-                            ? removeDynamicOauthStateFromUrl(mobileRedirectUrl)
+                            ? removeDynamicOauthParamsFromUrl(mobileRedirectUrl)
                             : undefined,
                         state,
                     });
@@ -390,9 +390,10 @@ const useSocialAuth = ({ sessionTimeout, onSettled, onError, onFarcasterUrl, })
         setIsProcessing,
     };
 };
-const removeDynamicOauthStateFromUrl = (url) => {
+const removeDynamicOauthParamsFromUrl = (url) => {
     const urlObject = new URL(url);
     urlObject.searchParams.delete('dynamicOauthState');
+    urlObject.searchParams.delete('dynamicOauthCode');
     return urlObject.toString();
 };
 

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

@@ -177,7 +177,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     const setPrimaryWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const { newWallet: newPrimaryWallet, connectedAccounts } = yield getSelectedWallet(walletId);
         newPrimaryWallet.isPrimary = true;
-        if (!primaryWalletId) {
+        if (!primaryWalletId && !checkIfShowQrCodeModal(newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
             return;

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

@@ -173,7 +173,7 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     const setPrimaryWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const { newWallet: newPrimaryWallet, connectedAccounts } = yield getSelectedWallet(walletId);
         newPrimaryWallet.isPrimary = true;
-        if (!primaryWalletId) {
+        if (!primaryWalletId && !checkIfShowQrCodeModal(newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
             return;

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -131,6 +131,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
+                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -127,6 +127,7 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
                 connector: wallet.walletConnector,
                 id: account.id,
                 isAuthenticated: true,
+                isPrimary: account.id === primaryWalletId,
                 key: (_a = account.walletName) !== null && _a !== void 0 ? _a : wallet.walletConnector.key,
             });
         }

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -204,6 +204,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
+                    isPrimary: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -200,6 +200,7 @@ const EmailVerification = ({ isEmailRecoveryFlow = false, showRetryButton: _show
                     connector: walletOption.walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
                     isAuthenticated: false,
+                    isPrimary: true,
                     key: (_k = embeddedWalletVerifiedCredential.walletName) !== null && _k !== void 0 ? _k : '',
                 });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);