@turnkey/react-wallet-kit 1.10.0 → 1.11.1

package/dist/providers/client/Provider.js

@@ -4,7 +4,12 @@
 var jsxRuntime = require('react/jsx-runtime');
 var sha2 = require('@noble/hashes/sha2');
 var utils$1 = require('@noble/hashes/utils');
-var oauth = require('../../utils/oauth.js');
+var storage = require('../../utils/oauth/storage.js');
+require('../../utils/oauth/config.js');
+var url = require('../../utils/oauth/url.js');
+var completion = require('../../utils/oauth/completion.js');
+var pkce = require('../../utils/oauth/pkce.js');
+var helpers = require('../../utils/oauth/helpers.js');
 var utils = require('../../utils/utils.js');
 var timers = require('../../utils/timers.js');
 var core = require('@turnkey/core');
@@ -33,7 +38,7 @@ var Verify = require('../../components/verify/Verify.js');
 var OnRamp = require('../../components/onramp/OnRamp.js');
 var Svg = require('../../components/design/Svg.js');
 var SendTransaction = require('../../components/send-transaction/SendTransaction.js');
-var helpers = require('../../components/send-transaction/helpers.js');
+var helpers$1 = require('../../components/send-transaction/helpers.js');
 
 /**
  * Provides Turnkey client authentication, session management, wallet operations, and user profile management
@@ -89,275 +94,267 @@ const ClientProvider = ({
     closeModal
   } = Hook.useModal();
   const completeRedirectOauth = async () => {
-    // Check for either hash or search parameters that could indicate an OAuth redirect
-    if (!window.location.hash && !window.location.search) {
-      // No OAuth redirect parameters found, nothing to do
-      return;
-    }
-    /**
-     * Wraps an OAuth completion action with optional modal UI.
-     * This is the key difference between redirect and popup flows:
-     * - Popup: No modal needed (the popup window itself is the UI)
-     * - Redirect: Optional modal to show loading/success states on return
-     */
-    const withModalWrapper = async params => {
-      const {
-        provider,
-        isAddProvider,
-        metadata,
-        openModal,
-        action
-      } = params;
-      const providerDisplayName = oauth.capitalizeProviderName(provider);
-      const icon = oauth.getProviderIcon(provider);
-      if (openModal === "true") {
-        // Show modal UI for the completion
-        await new Promise((resolve, reject) => {
-          pushPage({
-            key: `${providerDisplayName} OAuth`,
-            content: jsxRuntime.jsx(Action.ActionPage, {
-              closeOnComplete: isAddProvider ? false : true,
-              title: isAddProvider ? `Adding ${providerDisplayName} provider...` : `Authenticating with ${providerDisplayName}...`,
-              action: async () => {
-                try {
-                  await action();
-                  if (isAddProvider && metadata) {
-                    // Don't show success for auth. Not needed
-                    pushPage({
-                      key: "OAuth Provider Added",
-                      content: jsxRuntime.jsx(Success.SuccessPage, {
-                        text: `Successfully added ${providerDisplayName} OAuth provider!`,
-                        duration: metadata.successPageDuration ?? 2000,
-                        onComplete: () => {
-                          closeModal();
-                        }
-                      }),
-                      preventBack: true,
-                      showTitle: false
-                    });
-                  }
-                  resolve();
-                } catch (err) {
-                  if (isAddProvider) {
-                    oauth.clearOAuthAddProviderMetadata();
-                  }
-                  reject(err);
-                  popPage();
-                }
-              },
-              icon: jsxRuntime.jsx(reactFontawesome.FontAwesomeIcon, {
-                icon: icon,
-                size: "3x"
-              })
-            }),
-            showTitle: false,
-            onClose: () => {
-              if (isAddProvider) {
-                oauth.clearOAuthAddProviderMetadata();
-              }
-              reject(new sdkTypes.TurnkeyError(isAddProvider ? `User canceled the ${providerDisplayName} add provider process.` : `User canceled the ${providerDisplayName} authentication process.`, sdkTypes.TurnkeyErrorCodes.USER_CANCELED));
-            }
-          });
-        });
-      } else {
-        // No modal - execute directly
-        try {
-          await action();
-        } catch (err) {
-          if (isAddProvider) {
-            oauth.clearOAuthAddProviderMetadata();
-          }
-          throw err;
-        }
-      }
-    };
-    // Handle PKCE-based OAuth redirects (Facebook, Discord, X) with code in search parameters
-    if (window.location.search && window.location.search.includes("code=") && window.location.search.includes("state=")) {
-      // Parse the URL using our unified helper
-      const result = oauth.parseOAuthResponse(window.location.href);
-      if (!result || !result.authCode || !result.publicKey) {
-        return;
-      }
-      if (result.flow !== "redirect") {
-        // To complete OAuth we need redirect flow
+    // Since we use localStorage (see storage.ts), we always clean up OAuth data
+    // when this runs — even if there are no OAuth params in the URL (e.g. the
+    // user canceled at the provider and came back manually)
+    try {
+      // Check for either hash or search parameters that could indicate an OAuth redirect
+      if (!window.location.hash && !window.location.search) {
+        // No OAuth redirect parameters found, nothing to do
         return;
       }
-      const {
-        authCode: code,
-        provider,
-        publicKey,
-        oauthIntent,
-        sessionKey,
-        nonce,
-        openModal
-      } = result;
-      const isAddProvider = oauthIntent === oauth.OAUTH_INTENT_ADD_PROVIDER;
-      const metadata = isAddProvider ? oauth.getOAuthAddProviderMetadata() : null;
       /**
-       * Helper to complete PKCE redirect flow with optional modal wrapper.
-       * Uses handlePKCEFlow from oauth utils for the core logic.
-       * We put this in a separate function to avoid duplicating for each provider.
+       * Wraps an OAuth completion action with optional modal UI.
+       * This is the key difference between redirect and popup flows:
+       * - Popup: No modal needed (the popup window itself is the UI)
+       * - Redirect: Optional modal to show loading/success states on return
        */
-      const completePKCERedirect = async (providerName, exchangeCodeFn) => {
-        const action = async () => {
-          try {
-            await oauth.handlePKCEFlow({
-              publicKey,
-              providerName,
-              sessionKey: sessionKey ?? undefined,
-              callbacks,
-              completeOauth,
-              onAddProvider:
-              // Only set onAddProvider if we are adding a provider and have metadata
-              isAddProvider && metadata ? async oidcToken => {
-                await addOauthProvider({
-                  providerName: provider,
-                  oidcToken,
-                  organizationId: metadata.organizationId,
-                  userId: metadata.userId,
-                  ...(metadata.stampWith && {
-                    stampWith: metadata.stampWith
-                  })
-                });
-                oauth.clearOAuthAddProviderMetadata();
-              } : undefined,
-              exchangeCodeForToken: exchangeCodeFn
-            });
-          } catch (err) {
-            if (callbacks?.onError) {
-              const providerDisplayName = oauth.capitalizeProviderName(providerName);
-              callbacks.onError(err instanceof sdkTypes.TurnkeyError ? err : new sdkTypes.TurnkeyError(`${providerDisplayName} authentication failed`, sdkTypes.TurnkeyErrorCodes.OAUTH_SIGNUP_ERROR, err));
-            }
-            throw err;
-          }
-        };
-        await withModalWrapper({
-          provider: providerName,
+      const withModalWrapper = async params => {
+        const {
+          provider,
           isAddProvider,
           metadata,
           openModal,
           action
-        });
-        // Clean up URL after successful completion
-        oauth.cleanupOAuthUrl();
+        } = params;
+        const providerDisplayName = helpers.capitalizeProviderName(provider);
+        const icon = helpers.getProviderIcon(provider);
+        if (openModal === "true") {
+          // Show modal UI for the completion
+          await new Promise((resolve, reject) => {
+            pushPage({
+              key: `${providerDisplayName} OAuth`,
+              content: jsxRuntime.jsx(Action.ActionPage, {
+                closeOnComplete: isAddProvider ? false : true,
+                title: isAddProvider ? `Adding ${providerDisplayName} provider...` : `Authenticating with ${providerDisplayName}...`,
+                action: async () => {
+                  try {
+                    await action();
+                    if (isAddProvider && metadata) {
+                      // Don't show success for auth. Not needed
+                      pushPage({
+                        key: "OAuth Provider Added",
+                        content: jsxRuntime.jsx(Success.SuccessPage, {
+                          text: `Successfully added ${providerDisplayName} OAuth provider!`,
+                          duration: metadata.successPageDuration ?? 2000,
+                          onComplete: () => {
+                            closeModal();
+                          }
+                        }),
+                        preventBack: true,
+                        showTitle: false
+                      });
+                    }
+                    resolve();
+                  } catch (err) {
+                    reject(err);
+                    popPage();
+                  }
+                },
+                icon: jsxRuntime.jsx(reactFontawesome.FontAwesomeIcon, {
+                  icon: icon,
+                  size: "3x"
+                })
+              }),
+              showTitle: false,
+              onClose: () => {
+                reject(new sdkTypes.TurnkeyError(isAddProvider ? `User canceled the ${providerDisplayName} add provider process.` : `User canceled the ${providerDisplayName} authentication process.`, sdkTypes.TurnkeyErrorCodes.USER_CANCELED));
+              }
+            });
+          });
+        } else {
+          // No modal - execute directly
+          await action();
+        }
       };
-      // FACEBOOK
-      if (provider === sdkTypes.OAuthProviders.FACEBOOK) {
-        const clientId = masterConfig?.auth?.oauthConfig?.facebookClientId;
-        const redirectURI = masterConfig?.auth?.oauthConfig?.oauthRedirectUri;
-        const hasVerifier = oauth.hasPKCEVerifier(sdkTypes.OAuthProviders.FACEBOOK);
-        if (clientId && redirectURI && hasVerifier) {
-          await completePKCERedirect(sdkTypes.OAuthProviders.FACEBOOK, async codeVerifier => {
-            const tokenResponse = await oauth.exchangeFacebookCodeForToken(clientId, redirectURI, code, codeVerifier);
-            const oidcToken = tokenResponse?.id_token;
-            if (!oidcToken) {
-              throw new sdkTypes.TurnkeyError("Missing OIDC token", sdkTypes.TurnkeyErrorCodes.OAUTH_LOGIN_ERROR);
+      // Handle PKCE-based OAuth redirects (Facebook, Discord, X) with code in search parameters
+      if (window.location.search && window.location.search.includes("code=") && window.location.search.includes("state=")) {
+        // Parse the URL using our unified helper
+        const result = url.parseOAuthResponse(window.location.href);
+        if (!result || !result.authCode || !result.publicKey) {
+          return;
+        }
+        if (result.flow !== "redirect") {
+          // To complete OAuth we need redirect flow
+          return;
+        }
+        const {
+          authCode: code,
+          provider,
+          publicKey,
+          oauthIntent,
+          sessionKey,
+          nonce,
+          openModal
+        } = result;
+        const isAddProvider = oauthIntent === storage.OAUTH_INTENT_ADD_PROVIDER;
+        const metadata = isAddProvider ? storage.getOAuthAddProviderMetadata() : null;
+        /**
+         * Helper to complete PKCE redirect flow with optional modal wrapper.
+         * Uses completePKCEFlow from oauth utils for the core logic.
+         * We put this in a separate function to avoid duplicating for each provider.
+         */
+        const completePKCERedirect = async (providerName, exchangeCodeFn) => {
+          const action = async () => {
+            try {
+              await completion.completePKCEFlow({
+                publicKey,
+                providerName,
+                sessionKey: sessionKey ?? undefined,
+                callbacks,
+                completeOauth,
+                onAddProvider:
+                // Only set onAddProvider if we are adding a provider and have metadata
+                isAddProvider && metadata ? async oidcToken => {
+                  await addOauthProvider({
+                    providerName: provider,
+                    oidcToken,
+                    organizationId: metadata.organizationId,
+                    userId: metadata.userId,
+                    ...(metadata.stampWith && {
+                      stampWith: metadata.stampWith
+                    })
+                  });
+                } : undefined,
+                exchangeCodeForToken: exchangeCodeFn
+              });
+            } catch (err) {
+              if (callbacks?.onError) {
+                const providerDisplayName = helpers.capitalizeProviderName(providerName);
+                callbacks.onError(err instanceof sdkTypes.TurnkeyError ? err : new sdkTypes.TurnkeyError(`${providerDisplayName} authentication failed`, sdkTypes.TurnkeyErrorCodes.OAUTH_SIGNUP_ERROR, err));
+              }
+              throw err;
             }
-            return oidcToken;
+          };
+          await withModalWrapper({
+            provider: providerName,
+            isAddProvider,
+            metadata,
+            openModal,
+            action
           });
+          // Clean up URL after successful completion
+          url.cleanupOAuthUrl();
+        };
+        // FACEBOOK
+        if (provider === sdkTypes.OAuthProviders.FACEBOOK) {
+          const clientId = masterConfig?.auth?.oauthConfig?.facebookClientId;
+          const redirectURI = masterConfig?.auth?.oauthConfig?.oauthRedirectUri;
+          const hasVerifier = storage.hasPKCEVerifier(sdkTypes.OAuthProviders.FACEBOOK);
+          if (clientId && redirectURI && hasVerifier) {
+            await completePKCERedirect(sdkTypes.OAuthProviders.FACEBOOK, async codeVerifier => {
+              const tokenResponse = await pkce.exchangeFacebookCodeForToken(clientId, redirectURI, code, codeVerifier);
+              const oidcToken = tokenResponse?.id_token;
+              if (!oidcToken) {
+                throw new sdkTypes.TurnkeyError("Missing OIDC token", sdkTypes.TurnkeyErrorCodes.OAUTH_LOGIN_ERROR);
+              }
+              return oidcToken;
+            });
+          }
+          return;
         }
-        return;
-      }
-      // DISCORD
-      if (provider === sdkTypes.OAuthProviders.DISCORD) {
-        const clientId = masterConfig?.auth?.oauthConfig?.discordClientId;
-        const redirectURI = masterConfig?.auth?.oauthConfig?.oauthRedirectUri;
-        const hasVerifier = oauth.hasPKCEVerifier(sdkTypes.OAuthProviders.DISCORD);
-        if (clientId && redirectURI && hasVerifier && nonce) {
-          await completePKCERedirect(sdkTypes.OAuthProviders.DISCORD, async codeVerifier => {
-            const resp = await client?.httpClient.proxyOAuth2Authenticate({
-              provider: "OAUTH2_PROVIDER_DISCORD",
-              authCode: code,
-              redirectUri: redirectURI,
-              codeVerifier,
-              clientId,
-              nonce
+        // DISCORD
+        if (provider === sdkTypes.OAuthProviders.DISCORD) {
+          const clientId = masterConfig?.auth?.oauthConfig?.discordClientId;
+          const redirectURI = masterConfig?.auth?.oauthConfig?.oauthRedirectUri;
+          const hasVerifier = storage.hasPKCEVerifier(sdkTypes.OAuthProviders.DISCORD);
+          if (clientId && redirectURI && hasVerifier && nonce) {
+            await completePKCERedirect(sdkTypes.OAuthProviders.DISCORD, async codeVerifier => {
+              const resp = await client?.httpClient.proxyOAuth2Authenticate({
+                provider: "OAUTH2_PROVIDER_DISCORD",
+                authCode: code,
+                redirectUri: redirectURI,
+                codeVerifier,
+                clientId,
+                nonce
+              });
+              const oidcToken = resp?.oidcToken;
+              if (!oidcToken) {
+                throw new sdkTypes.TurnkeyError("Missing OIDC token", sdkTypes.TurnkeyErrorCodes.OAUTH_LOGIN_ERROR);
+              }
+              return oidcToken;
             });
-            const oidcToken = resp?.oidcToken;
-            if (!oidcToken) {
-              throw new sdkTypes.TurnkeyError("Missing OIDC token", sdkTypes.TurnkeyErrorCodes.OAUTH_LOGIN_ERROR);
-            }
-            return oidcToken;
-          });
+          }
+          return;
         }
-        return;
-      }
-      // X (Twitter)
-      if (provider === sdkTypes.OAuthProviders.X) {
-        const clientId = masterConfig?.auth?.oauthConfig?.xClientId;
-        const redirectURI = masterConfig?.auth?.oauthConfig?.oauthRedirectUri;
-        const hasVerifier = oauth.hasPKCEVerifier(sdkTypes.OAuthProviders.X);
-        if (clientId && redirectURI && hasVerifier && nonce) {
-          await completePKCERedirect(sdkTypes.OAuthProviders.X, async codeVerifier => {
-            const resp = await client?.httpClient.proxyOAuth2Authenticate({
-              provider: "OAUTH2_PROVIDER_X",
-              authCode: code,
-              redirectUri: redirectURI,
-              codeVerifier,
-              clientId,
-              nonce
+        // X (Twitter)
+        if (provider === sdkTypes.OAuthProviders.X) {
+          const clientId = masterConfig?.auth?.oauthConfig?.xClientId;
+          const redirectURI = masterConfig?.auth?.oauthConfig?.oauthRedirectUri;
+          const hasVerifier = storage.hasPKCEVerifier(sdkTypes.OAuthProviders.X);
+          if (clientId && redirectURI && hasVerifier && nonce) {
+            await completePKCERedirect(sdkTypes.OAuthProviders.X, async codeVerifier => {
+              const resp = await client?.httpClient.proxyOAuth2Authenticate({
+                provider: "OAUTH2_PROVIDER_X",
+                authCode: code,
+                redirectUri: redirectURI,
+                codeVerifier,
+                clientId,
+                nonce
+              });
+              const oidcToken = resp?.oidcToken;
+              if (!oidcToken) {
+                throw new sdkTypes.TurnkeyError("Missing OIDC token", sdkTypes.TurnkeyErrorCodes.OAUTH_LOGIN_ERROR);
+              }
+              return oidcToken;
             });
-            const oidcToken = resp?.oidcToken;
-            if (!oidcToken) {
-              throw new sdkTypes.TurnkeyError("Missing OIDC token", sdkTypes.TurnkeyErrorCodes.OAUTH_LOGIN_ERROR);
-            }
-            return oidcToken;
-          });
+          }
+          return;
         }
-        return;
       }
-    }
-    // Handle Google/Apple redirects (uses hash with idToken - non-PKCE)
-    if (window.location.hash) {
-      // Parse the URL using our unified helper
-      const result = oauth.parseOAuthResponse(window.location.href);
-      if (!result || !result.idToken || result.flow !== "redirect" || !result.publicKey) {
-        // idToken and publicKey are required to complete OAuth. These are both in the hash for non-PKCE providers
-        return;
-      }
-      const {
-        idToken,
-        provider,
-        publicKey,
-        openModal,
-        sessionKey,
-        oauthIntent
-      } = result;
-      const isAddProvider = oauthIntent === oauth.OAUTH_INTENT_ADD_PROVIDER;
-      const metadata = isAddProvider ? oauth.getOAuthAddProviderMetadata() : null;
-      const resolvedProvider = provider || sdkTypes.OAuthProviders.GOOGLE;
-      // Use completeOAuthFlow from utils for the core completion logic
-      const action = async () => {
-        await oauth.completeOAuthFlow({
-          provider: resolvedProvider,
+      // Handle Google/Apple redirects (uses hash with idToken - non-PKCE)
+      if (window.location.hash) {
+        // Parse the URL using our unified helper
+        const result = url.parseOAuthResponse(window.location.href);
+        if (!result || !result.idToken || result.flow !== "redirect" || !result.publicKey) {
+          // idToken and publicKey are required to complete OAuth. These are both in the hash for non-PKCE providers
+          return;
+        }
+        const {
+          idToken,
+          provider,
           publicKey,
-          oidcToken: idToken,
-          sessionKey: sessionKey ?? undefined,
-          callbacks,
-          completeOauth,
-          onAddProvider: isAddProvider && metadata ? async oidcToken => {
-            await addOauthProvider({
-              providerName: resolvedProvider,
-              oidcToken,
-              organizationId: metadata.organizationId,
-              userId: metadata.userId,
-              ...(metadata.stampWith && {
-                stampWith: metadata.stampWith
-              })
-            });
-            oauth.clearOAuthAddProviderMetadata();
-          } : undefined
+          openModal,
+          sessionKey,
+          oauthIntent
+        } = result;
+        const isAddProvider = oauthIntent === storage.OAUTH_INTENT_ADD_PROVIDER;
+        const metadata = isAddProvider ? storage.getOAuthAddProviderMetadata() : null;
+        const resolvedProvider = provider || sdkTypes.OAuthProviders.GOOGLE;
+        // Use completeOAuthFlow from utils for the core completion logic
+        const action = async () => {
+          await completion.completeOAuthFlow({
+            provider: resolvedProvider,
+            publicKey,
+            oidcToken: idToken,
+            sessionKey: sessionKey ?? undefined,
+            callbacks,
+            completeOauth,
+            onAddProvider: isAddProvider && metadata ? async oidcToken => {
+              await addOauthProvider({
+                providerName: resolvedProvider,
+                oidcToken,
+                organizationId: metadata.organizationId,
+                userId: metadata.userId,
+                ...(metadata.stampWith && {
+                  stampWith: metadata.stampWith
+                })
+              });
+            } : undefined
+          });
+        };
+        await withModalWrapper({
+          provider: resolvedProvider,
+          isAddProvider,
+          metadata,
+          openModal: openModal ?? undefined,
+          action
         });
-      };
-      await withModalWrapper({
-        provider: resolvedProvider,
-        isAddProvider,
-        metadata,
-        openModal: openModal ?? undefined,
-        action
-      });
-      // Clean up the URL after processing
-      oauth.cleanupOAuthUrlPreserveSearch();
+        // Clean up the URL after processing
+        url.cleanupOAuthUrlPreserveSearch();
+      }
+    } finally {
+      storage.clearAllOAuthData();
     }
   };
   const buildConfig = proxyAuthConfig => {
@@ -1800,10 +1797,10 @@ const ClientProvider = ({
     const {
       verifier,
       codeChallenge
-    } = await oauth.generateChallengePair();
-    oauth.storePKCEVerifier(provider, verifier);
+    } = await pkce.generateChallengePair();
+    storage.storePKCEVerifier(provider, verifier);
     // Build OAuth URL
-    const authUrl = oauth.buildOAuthUrl({
+    const authUrl = url.buildOAuthUrl({
       provider,
       clientId,
       redirectUri,
@@ -1815,12 +1812,12 @@ const ClientProvider = ({
     });
     if (openInPage) {
       // Remainder of logic will occur in completeRedirectOauth
-      return oauth.redirectToOAuthProvider(authUrl);
+      return url.redirectToOAuthProvider(authUrl);
     }
     // Popup flow
-    const authWindow = oauth.openOAuthPopup();
+    const authWindow = url.openOAuthPopup();
     if (!authWindow) {
-      throw new Error(`Failed to open ${oauth.capitalizeProviderName(provider)} login window.`);
+      throw new Error(`Failed to open ${helpers.capitalizeProviderName(provider)} login window.`);
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
@@ -1831,13 +1828,13 @@ const ClientProvider = ({
             reject(new Error("Authentication window was closed."));
             return;
           }
-          const url = authWindow.location.href || "";
-          if (url.startsWith(window.location.origin)) {
-            const result = oauth.parseOAuthResponse(url, provider);
+          const url$1 = authWindow.location.href || "";
+          if (url$1.startsWith(window.location.origin)) {
+            const result = url.parseOAuthResponse(url$1, provider);
             if (result) {
               authWindow.close();
               clearInterval(interval);
-              oauth.completeOAuthPopup({
+              completion.completeOAuthPopup({
                 provider,
                 publicKey,
                 result,
@@ -1895,10 +1892,10 @@ const ClientProvider = ({
     const {
       verifier,
       codeChallenge
-    } = await oauth.generateChallengePair();
-    oauth.storePKCEVerifier(provider, verifier);
+    } = await pkce.generateChallengePair();
+    storage.storePKCEVerifier(provider, verifier);
     // Build OAuth URL
-    const authUrl = oauth.buildOAuthUrl({
+    const authUrl = url.buildOAuthUrl({
       provider,
       clientId,
       redirectUri,
@@ -1910,12 +1907,12 @@ const ClientProvider = ({
     });
     if (openInPage) {
       // Remainder of logic will occur in completeRedirectOauth
-      return oauth.redirectToOAuthProvider(authUrl);
+      return url.redirectToOAuthProvider(authUrl);
     }
     // Popup flow
-    const authWindow = oauth.openOAuthPopup();
+    const authWindow = url.openOAuthPopup();
     if (!authWindow) {
-      throw new Error(`Failed to open ${oauth.capitalizeProviderName(provider)} login window.`);
+      throw new Error(`Failed to open ${helpers.capitalizeProviderName(provider)} login window.`);
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
@@ -1926,13 +1923,13 @@ const ClientProvider = ({
             reject(new Error("Authentication window was closed."));
             return;
           }
-          const url = authWindow.location.href || "";
-          if (url.startsWith(window.location.origin)) {
-            const result = oauth.parseOAuthResponse(url, provider);
+          const url$1 = authWindow.location.href || "";
+          if (url$1.startsWith(window.location.origin)) {
+            const result = url.parseOAuthResponse(url$1, provider);
             if (result) {
               authWindow.close();
               clearInterval(interval);
-              oauth.completeOAuthPopup({
+              completion.completeOAuthPopup({
                 provider,
                 publicKey,
                 result,
@@ -1988,7 +1985,7 @@ const ClientProvider = ({
     }
     const nonce = utils$1.bytesToHex(sha2.sha256(publicKey));
     // Build OAuth URL
-    const authUrl = oauth.buildOAuthUrl({
+    const authUrl = url.buildOAuthUrl({
       provider,
       clientId,
       redirectUri,
@@ -1999,12 +1996,12 @@ const ClientProvider = ({
     });
     if (openInPage) {
       // Remainder of logic will occur in completeRedirectOauth
-      return oauth.redirectToOAuthProvider(authUrl);
+      return url.redirectToOAuthProvider(authUrl);
     }
     // Popup flow
-    const authWindow = oauth.openOAuthPopup();
+    const authWindow = url.openOAuthPopup();
     if (!authWindow) {
-      throw new Error(`Failed to open ${oauth.capitalizeProviderName(provider)} login window.`);
+      throw new Error(`Failed to open ${helpers.capitalizeProviderName(provider)} login window.`);
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
@@ -2015,13 +2012,13 @@ const ClientProvider = ({
             reject(new Error("Authentication window was closed."));
             return;
           }
-          const url = authWindow.location.href || "";
-          if (url.startsWith(window.location.origin)) {
-            const result = oauth.parseOAuthResponse(url, provider);
+          const url$1 = authWindow.location.href || "";
+          if (url$1.startsWith(window.location.origin)) {
+            const result = url.parseOAuthResponse(url$1, provider);
             if (result) {
               authWindow.close();
               clearInterval(interval);
-              oauth.completeOAuthPopup({
+              completion.completeOAuthPopup({
                 provider,
                 publicKey,
                 result,
@@ -2066,7 +2063,7 @@ const ClientProvider = ({
     }
     const nonce = utils$1.bytesToHex(sha2.sha256(publicKey));
     // Build OAuth URL
-    const authUrl = oauth.buildOAuthUrl({
+    const authUrl = url.buildOAuthUrl({
       provider,
       clientId,
       redirectUri,
@@ -2077,12 +2074,12 @@ const ClientProvider = ({
     });
     if (openInPage) {
       // Remainder of logic will occur in completeRedirectOauth
-      return oauth.redirectToOAuthProvider(authUrl);
+      return url.redirectToOAuthProvider(authUrl);
     }
     // Popup flow
-    const authWindow = oauth.openOAuthPopup();
+    const authWindow = url.openOAuthPopup();
     if (!authWindow) {
-      throw new Error(`Failed to open ${oauth.capitalizeProviderName(provider)} login window.`);
+      throw new Error(`Failed to open ${helpers.capitalizeProviderName(provider)} login window.`);
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
@@ -2093,13 +2090,13 @@ const ClientProvider = ({
             reject(new Error("Authentication window was closed."));
             return;
           }
-          const url = authWindow.location.href || "";
-          if (url.startsWith(window.location.origin)) {
-            const result = oauth.parseOAuthResponse(url, provider);
+          const url$1 = authWindow.location.href || "";
+          if (url$1.startsWith(window.location.origin)) {
+            const result = url.parseOAuthResponse(url$1, provider);
             if (result) {
               authWindow.close();
               clearInterval(interval);
-              oauth.completeOAuthPopup({
+              completion.completeOAuthPopup({
                 provider,
                 publicKey,
                 result,
@@ -2146,10 +2143,10 @@ const ClientProvider = ({
     const {
       verifier,
       codeChallenge
-    } = await oauth.generateChallengePair();
-    oauth.storePKCEVerifier(provider, verifier);
+    } = await pkce.generateChallengePair();
+    storage.storePKCEVerifier(provider, verifier);
     // Build OAuth URL
-    const authUrl = oauth.buildOAuthUrl({
+    const authUrl = url.buildOAuthUrl({
       provider,
       clientId,
       redirectUri,
@@ -2161,12 +2158,12 @@ const ClientProvider = ({
     });
     if (openInPage) {
       // Remainder of logic will occur in completeRedirectOauth
-      return oauth.redirectToOAuthProvider(authUrl);
+      return url.redirectToOAuthProvider(authUrl);
     }
     // Popup flow
-    const authWindow = oauth.openOAuthPopup();
+    const authWindow = url.openOAuthPopup();
     if (!authWindow) {
-      throw new Error(`Failed to open ${oauth.capitalizeProviderName(provider)} login window.`);
+      throw new Error(`Failed to open ${helpers.capitalizeProviderName(provider)} login window.`);
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
@@ -2177,13 +2174,13 @@ const ClientProvider = ({
             reject(new Error("Authentication window was closed."));
             return;
           }
-          const url = authWindow.location.href || "";
-          if (url.startsWith(window.location.origin)) {
-            const result = oauth.parseOAuthResponse(url, provider);
+          const url$1 = authWindow.location.href || "";
+          if (url$1.startsWith(window.location.origin)) {
+            const result = url.parseOAuthResponse(url$1, provider);
             if (result) {
               authWindow.close();
               clearInterval(interval);
-              oauth.completeOAuthPopup({
+              completion.completeOAuthPopup({
                 provider,
                 publicKey,
                 result,
@@ -2191,7 +2188,7 @@ const ClientProvider = ({
                 completeOauth,
                 onOauthSuccess: params?.onOauthSuccess,
                 exchangeCodeForToken: async codeVerifier => {
-                  const tokenData = await oauth.exchangeFacebookCodeForToken(clientId, redirectUri, result.authCode, codeVerifier);
+                  const tokenData = await pkce.exchangeFacebookCodeForToken(clientId, redirectUri, result.authCode, codeVerifier);
                   return tokenData.id_token;
                 }
               }).then(() => resolve()).catch(reject);
@@ -3144,7 +3141,7 @@ const ClientProvider = ({
           });
         };
         if (openInPage) {
-          oauth.storeOAuthAddProviderMetadata({
+          storage.storeOAuthAddProviderMetadata({
             organizationId,
             userId,
             ...(stampWith && {
@@ -3154,7 +3151,7 @@ const ClientProvider = ({
           });
         }
         const additionalState = openInPage ? {
-          oauthIntent: oauth.OAUTH_INTENT_ADD_PROVIDER,
+          oauthIntent: storage.OAUTH_INTENT_ADD_PROVIDER,
           ...(successPageDuration > 0 && {
             openModal: "true"
           })
@@ -3416,7 +3413,8 @@ const ClientProvider = ({
           organizationId,
           sendTransactionStatusId
         });
-        const txHash = pollResult?.eth?.txHash ?? pollResult?.txHash;
+        const txDetails = pollResult;
+        const txHash = txDetails.eth?.txHash ?? txDetails.solana?.signature ?? txDetails.txHash;
         return txHash ? {
           txHash
         } : {};
@@ -3427,7 +3425,7 @@ const ClientProvider = ({
         preventBack: true,
         onClose: () => reject(new sdkTypes.TurnkeyError("User canceled the transaction.", sdkTypes.TurnkeyErrorCodes.USER_CANCELED)),
         content: jsxRuntime.jsx(SendTransaction.SendTransactionPage, {
-          icon: icon ?? helpers.getChainLogo(caip2),
+          icon: icon ?? helpers$1.getChainLogo(caip2),
           action: action,
           caip2: caip2,
           successPageDuration: successPageDuration,
@@ -3477,7 +3475,7 @@ const ClientProvider = ({
         preventBack: true,
         onClose: () => reject(new sdkTypes.TurnkeyError("User canceled the transaction.", sdkTypes.TurnkeyErrorCodes.USER_CANCELED)),
         content: jsxRuntime.jsx(SendTransaction.SendTransactionPage, {
-          icon: icon ?? helpers.getChainLogo(caip2),
+          icon: icon ?? helpers$1.getChainLogo(caip2),
           action: action,
           caip2: caip2,
           successPageDuration: successPageDuration,