@turnkey/react-wallet-kit 2.3.2 → 2.4.1

package/dist/providers/client/Provider.js

@@ -95,6 +95,9 @@ const ClientProvider = ({
   const expiryTimeoutsRef = react.useRef({});
   const proxyAuthConfigRef = react.useRef(null);
   const clientParamsRef = react.useRef(null);
+  // Stores the developer's custom MFA handler set via setMfaHandler.
+  // When unset, the default httpClient MFA behavior is used (no onMfaRequired callback).
+  const mfaHandlerRef = react.useRef(undefined);
   const [allSessions, setAllSessions] = react.useState(undefined);
   const {
     isMobile,
@@ -883,6 +886,12 @@ const ClientProvider = ({
     }
     return client.overridePasskeyStamper(params);
   }, [client]);
+  const overrideAttestedStamper = react.useCallback(params => {
+    if (!client) {
+      throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
+    }
+    return client.overrideAttestedStamper(params);
+  }, [client]);
   const getActiveSessionKey = react.useCallback(async () => {
     if (!client) throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
     return utils.withTurnkeyErrorHandling(() => client.getActiveSessionKey(), undefined, callbacks, "Failed to get active session key");
@@ -1367,13 +1376,23 @@ const ClientProvider = ({
     if (!client) {
       throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
     }
-    return utils.withTurnkeyErrorHandling(() => client.verifyOtp(params), undefined, callbacks, "Failed to verify OTP");
+    const res = await utils.withTurnkeyErrorHandling(() => client.verifyOtp(params), undefined, callbacks, "Failed to verify OTP");
+    // Automatically override the attested stamper with the verification token
+    await client.overrideAttestedStamper({
+      verificationToken: res.verificationToken,
+      publicKey: res.publicKey
+    });
+    return res;
   }, [client, callbacks]);
   const loginWithOtp = react.useCallback(async params => {
     if (!client) {
       throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
     }
-    const res = await utils.withTurnkeyErrorHandling(() => client.loginWithOtp(params), undefined, callbacks, "Failed to login with OTP");
+    const expirationSeconds = params?.expirationSeconds ?? masterConfig?.auth?.sessionExpirationSeconds ?? core.DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
+    const res = await utils.withTurnkeyErrorHandling(() => client.loginWithOtp({
+      ...params,
+      expirationSeconds
+    }), undefined, callbacks, "Failed to login with OTP");
     if (res) {
       await handlePostAuth({
         method: base.AuthMethod.Otp,
@@ -1383,7 +1402,7 @@ const ClientProvider = ({
       });
     }
     return res;
-  }, [client, callbacks, handlePostAuth]);
+  }, [client, callbacks, masterConfig, handlePostAuth]);
   const signUpWithOtp = react.useCallback(async params => {
     if (!client) {
       throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
@@ -1454,7 +1473,11 @@ const ClientProvider = ({
     if (!client) {
       throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
     }
-    const res = await utils.withTurnkeyErrorHandling(() => client.loginWithOauth(params), undefined, callbacks, "Failed to login with OAuth");
+    const expirationSeconds = params?.expirationSeconds ?? masterConfig?.auth?.sessionExpirationSeconds ?? core.DEFAULT_SESSION_EXPIRATION_IN_SECONDS;
+    const res = await utils.withTurnkeyErrorHandling(() => client.loginWithOauth({
+      ...params,
+      expirationSeconds
+    }), undefined, callbacks, "Failed to login with OAuth");
     if (res) {
       await handlePostAuth({
         method: base.AuthMethod.Oauth,
@@ -1464,7 +1487,7 @@ const ClientProvider = ({
       });
     }
     return res;
-  }, [client, callbacks, handlePostAuth]);
+  }, [client, callbacks, masterConfig, handlePostAuth]);
   const signUpWithOauth = react.useCallback(async params => {
     if (!client) {
       throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
@@ -1840,10 +1863,9 @@ const ClientProvider = ({
   }, [client, callbacks, logout, clearSessionTimeouts, masterConfig?.passkeyConfig]);
   const setActiveSession = react.useCallback(async params => {
     if (!client) throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
-    const session = await utils.withTurnkeyErrorHandling(() => client.getSession({
+    const s = await getSession({
       sessionKey: params.sessionKey
-    }), () => logout(), callbacks, "Failed to get session");
-    const s = await getSession();
+    });
     if (!s) {
       throw new sdkTypes.TurnkeyError("Session not found.", sdkTypes.TurnkeyErrorCodes.NOT_FOUND);
     }
@@ -1884,6 +1906,17 @@ const ClientProvider = ({
     if (!client) throw new sdkTypes.TurnkeyError("Client is not initialized.", sdkTypes.TurnkeyErrorCodes.CLIENT_NOT_INITIALIZED);
     return utils.withTurnkeyErrorHandling(() => client.verifyAppProofs(params), () => logout(), callbacks, "Failed to verify app proofs");
   }, [client, callbacks, logout]);
+  const setMfaHandler = react.useCallback(handler => {
+    mfaHandlerRef.current = handler;
+    // Apply immediately if the client is ready.
+    // When a custom handler is set, route the httpClient's MFA callback to it.
+    // When cleared, restore the default httpClient behavior (no onMfaRequired callback).
+    if (client) {
+      client.httpClient.config.onMfaRequired = handler ? async ctx => {
+        await handler(ctx);
+      } : undefined;
+    }
+  }, [client]);
   const handleDiscordOauth = react.useCallback(async params => {
     const {
       primaryClientId = masterConfig?.auth?.oauthConfig?.discord?.primaryClientId,
@@ -1945,7 +1978,7 @@ const ClientProvider = ({
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
-      const interval = setInterval(() => {
+      const interval = setInterval(async () => {
         try {
           if (authWindow.closed) {
             clearInterval(interval);
@@ -1987,7 +2020,15 @@ const ClientProvider = ({
                     clientId,
                     nonce
                   });
-                  return resp?.oidcToken ?? "";
+                  const oidcToken = resp?.oidcToken ?? "";
+                  // Set the attested stamper with the oidcToken
+                  if (oidcToken) {
+                    await client?.overrideAttestedStamper({
+                      oidcToken,
+                      publicKey
+                    });
+                  }
+                  return oidcToken;
                 }
               }).then(() => resolve()).catch(reject);
             }
@@ -2062,7 +2103,7 @@ const ClientProvider = ({
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
-      const interval = setInterval(() => {
+      const interval = setInterval(async () => {
         try {
           if (authWindow.closed) {
             clearInterval(interval);
@@ -2104,7 +2145,15 @@ const ClientProvider = ({
                     clientId,
                     nonce
                   });
-                  return resp?.oidcToken ?? "";
+                  const oidcToken = resp?.oidcToken ?? "";
+                  // Set the attested stamper with the oidcToken
+                  if (oidcToken) {
+                    await client?.overrideAttestedStamper({
+                      oidcToken,
+                      publicKey
+                    });
+                  }
+                  return oidcToken;
                 }
               }).then(() => resolve()).catch(reject);
             }
@@ -2173,7 +2222,7 @@ const ClientProvider = ({
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
-      const interval = setInterval(() => {
+      const interval = setInterval(async () => {
         try {
           if (authWindow.closed) {
             clearInterval(interval);
@@ -2186,6 +2235,13 @@ const ClientProvider = ({
             if (result) {
               authWindow.close();
               clearInterval(interval);
+              // Set the attested stamper with the oidcToken
+              if (result.idToken) {
+                await client?.overrideAttestedStamper({
+                  oidcToken: result.idToken,
+                  publicKey
+                });
+              }
               completion.completeOAuthPopup({
                 provider,
                 publicKey,
@@ -2273,7 +2329,7 @@ const ClientProvider = ({
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
-      const interval = setInterval(() => {
+      const interval = setInterval(async () => {
         try {
           if (authWindow.closed) {
             clearInterval(interval);
@@ -2286,6 +2342,13 @@ const ClientProvider = ({
             if (result) {
               authWindow.close();
               clearInterval(interval);
+              // Set the attested stamper with the oidcToken
+              if (result.idToken) {
+                await client?.overrideAttestedStamper({
+                  oidcToken: result.idToken,
+                  publicKey
+                });
+              }
               completion.completeOAuthPopup({
                 provider,
                 publicKey,
@@ -2379,7 +2442,7 @@ const ClientProvider = ({
     }
     authWindow.location.href = authUrl;
     return new Promise((resolve, reject) => {
-      const interval = setInterval(() => {
+      const interval = setInterval(async () => {
         try {
           if (authWindow.closed) {
             clearInterval(interval);
@@ -2414,7 +2477,15 @@ const ClientProvider = ({
                 onOauthSuccess: params?.onOauthSuccess,
                 exchangeCodeForToken: async codeVerifier => {
                   const tokenData = await pkce.exchangeFacebookCodeForToken(clientId, redirectUri, result.authCode, codeVerifier);
-                  return tokenData.id_token;
+                  const oidcToken = tokenData.id_token;
+                  // Set the attested stamper with the oidcToken
+                  if (oidcToken) {
+                    await client?.overrideAttestedStamper({
+                      oidcToken,
+                      publicKey
+                    });
+                  }
+                  return oidcToken;
                 }
               }).then(() => resolve()).catch(reject);
             }
@@ -4059,8 +4130,8 @@ const ClientProvider = ({
     }
   }, [session]);
   react.useEffect(() => {
-    // This will handle any redirect based oAuth. It then initializes the session. This is the last step before client is considered "ready"
     if (!client || !masterConfig) return;
+    // This will handle any redirect based oAuth. It then initializes the session. This is the last step before client is considered "ready"
     completeRedirectOauth().finally(() => {
       clearSessionTimeouts();
       // if auth or wallet connecting features are enabled, we want to fetch
@@ -4073,6 +4144,13 @@ const ClientProvider = ({
         setClientState(base.ClientState.Ready);
       });
     });
+    // Only set the onMfaRequired handler if we have a mfaHandler set.
+    const mfaHandler = mfaHandlerRef.current;
+    if (mfaHandler) {
+      client.httpClient.config.onMfaRequired = async ctx => {
+        await mfaHandler(ctx);
+      };
+    }
     return () => {
       clearSessionTimeouts();
     };
@@ -4091,6 +4169,7 @@ const ClientProvider = ({
       createHttpClient,
       overrideApiKeyStamper,
       overridePasskeyStamper,
+      overrideAttestedStamper,
       createPasskey,
       logout,
       loginWithPasskey,
@@ -4186,6 +4265,7 @@ const ClientProvider = ({
       handleOnRamp,
       handleSendTransaction,
       handleSendErc20Transfer,
+      setMfaHandler,
       getTurnstileToken,
       setTurnstileToken
     },