@flopay/react 1.2.6 → 1.2.8

package/dist/index.cjs

@@ -633,6 +633,18 @@ function resolvePaymentIntentPaymentMethodId(paymentIntent) {
 }
 async function retrievePaymentIntentFromProvider(provider, clientSecret) {
   const retriever = provider;
+  if ((0, import_shared3.isSetupIntentClientSecret)(clientSecret)) {
+    if (!retriever?.retrieveSetupIntent) {
+      return null;
+    }
+    const { setupIntent, error: error2 } = await retriever.retrieveSetupIntent(clientSecret);
+    if (error2) {
+      throw new import_shared3.FloPayError(error2.message ?? "Failed to retrieve setup intent.", "api_error", {
+        ...error2.code ? { code: error2.code } : {}
+      });
+    }
+    return setupIntent ?? null;
+  }
   if (!retriever?.retrievePaymentIntent) {
     return null;
   }
@@ -644,6 +656,12 @@ async function retrievePaymentIntentFromProvider(provider, clientSecret) {
   }
   return paymentIntent ?? null;
 }
+function resolveWalletElementsMode(amountInMinorUnits) {
+  if (typeof amountInMinorUnits !== "number" || !Number.isFinite(amountInMinorUnits) || amountInMinorUnits <= 0) {
+    return { mode: "setup" };
+  }
+  return { mode: "payment", amount: amountInMinorUnits };
+}
 function resolveTokenizedPaymentMethodId(tokenizedBody) {
   const candidates = [
     tokenizedBody?.id,
@@ -1761,10 +1779,7 @@ function WalletButtonInner({
         const intentJson = await intentResponse.json();
         const intentClientSecret = intentJson.data?.id;
         if (!intentClientSecret) throw new Error("No client_secret in payment intent response");
-        const { error: confirmError, paymentIntent } = await stripe.confirmCardPayment(
-          intentClientSecret,
-          { payment_method: paymentMethod.id }
-        );
+        const { error: confirmError, intentId } = (0, import_shared6.isSetupIntentClientSecret)(intentClientSecret) ? await stripe.confirmCardSetup(intentClientSecret, { payment_method: paymentMethod.id }).then((r) => ({ error: r.error, intentId: r.setupIntent?.id })) : await stripe.confirmCardPayment(intentClientSecret, { payment_method: paymentMethod.id }).then((r) => ({ error: r.error, intentId: r.paymentIntent?.id }));
         if (confirmError) {
           const message = confirmError.message ?? "Wallet payment failed.";
           onErrorChange?.(message);
@@ -1776,7 +1791,7 @@ function WalletButtonInner({
         onTokenizedBody({
           id: paymentMethod.id,
           type: "card",
-          threeDSecureActionResultTokenId: paymentIntent?.id
+          threeDSecureActionResultTokenId: intentId
         }, {
           accountPatch: prepared?.accountPatch,
           sessionId: effectiveSessionId,
@@ -2639,14 +2654,17 @@ function SplitCardFormInner({
       }
     };
   }, [appearance]);
-  const walletOptions = (0, import_react8.useMemo)(() => ({
-    mode: "payment",
-    amount: amountInCents,
-    currency: currency.toLowerCase(),
-    paymentMethodCreation: "manual",
-    captureMethod: "manual",
-    ...stripeAppearanceProp
-  }), [amountInCents, currency, stripeAppearanceProp]);
+  const walletOptions = (0, import_react8.useMemo)(() => {
+    const modeOptions = resolveWalletElementsMode(totalAmount);
+    return {
+      ...modeOptions,
+      currency: currency.toLowerCase(),
+      paymentMethodCreation: "manual",
+      // captureMethod only applies to payment mode; Stripe rejects it in setup.
+      ...modeOptions.mode === "payment" ? { captureMethod: "manual" } : {},
+      ...stripeAppearanceProp
+    };
+  }, [totalAmount, currency, stripeAppearanceProp]);
   const paypalOptions = (0, import_react8.useMemo)(() => ({
     mode: "payment",
     amount: amountInCents,
@@ -4318,6 +4336,26 @@ function SplitCardFormInner({
 var import_js3 = require("@flopay/js");
 var import_shared7 = require("@flopay/shared");
 var DEFAULT_SAVED_PAYMENT_DECLINE_METHOD = "card";
+async function retrieveResumeIntent(stripe, clientSecret, isSetupIntent) {
+  if (isSetupIntent) {
+    if (typeof stripe.retrieveSetupIntent !== "function") return null;
+    const { setupIntent, error: error2 } = await stripe.retrieveSetupIntent(clientSecret);
+    return { error: error2, intent: setupIntent ?? null };
+  }
+  if (typeof stripe.retrievePaymentIntent !== "function") return null;
+  const { paymentIntent, error } = await stripe.retrievePaymentIntent(clientSecret);
+  return { error, intent: paymentIntent ?? null };
+}
+async function confirmResumeIntent(stripe, clientSecret, data, isSetupIntent) {
+  if (isSetupIntent) {
+    if (typeof stripe.confirmCardSetup !== "function") return null;
+    const { setupIntent, error: error2 } = await stripe.confirmCardSetup(clientSecret, data);
+    return { error: error2, intent: setupIntent ?? null };
+  }
+  if (typeof stripe.confirmCardPayment !== "function") return null;
+  const { paymentIntent, error } = await stripe.confirmCardPayment(clientSecret, data);
+  return { error, intent: paymentIntent ?? null };
+}
 function getRedirectResultFromCheckoutProcessError(error) {
   if (!error?.type || !error.threeDSecureToken) {
     return null;
@@ -4446,11 +4484,13 @@ async function processSavedPaymentForMode({
   billingApiUrl,
   sessionId,
   session,
+  nonce,
   tokenizedData,
   returnUrl
 }) {
   const baseUrl = billingApiUrl.replace(/\/+$/, "");
   const resolvedSessionId = sessionId ?? session.id;
+  const resolvedNonce = nonce ?? session.clientSecret;
   const customerId = session.customer?.id ?? session.accountData?.userId ?? "";
   const customerEmail = session.customer?.email ?? session.accountData?.email ?? "";
   const firstName = session.customer?.firstName ?? session.accountData?.firstName ?? "";
@@ -4460,7 +4500,7 @@ async function processSavedPaymentForMode({
   const api = new import_js3.PaymentAPI(baseUrl);
   const response = await retryOnceOnFetchFailure(() => api.processPayment(customerId, {
     sessionId: resolvedSessionId,
-    nonce: session.clientSecret,
+    nonce: resolvedNonce,
     tokenizedData,
     accountData: {
       userId: customerId,
@@ -4503,7 +4543,7 @@ async function processSavedPaymentForMode({
     const recoveredRedirect = await recover3DSRedirectResult({
       billingApiUrl: baseUrl,
       sessionId: resolvedSessionId,
-      nonce: session.clientSecret,
+      nonce: resolvedNonce,
       responseJson: json
     });
     if (recoveredRedirect) {
@@ -4551,64 +4591,66 @@ async function handleSavedPaymentRedirectResult(redirectResult, {
         { checkoutMethod: "card" }
       );
     }
+    const isSetupIntent = (0, import_shared7.isSetupIntentClientSecret)(redirectResult.threeDSecureToken);
     let paymentIntent = null;
     let savedPaymentMethodId = redirectResult.paymentMethodId;
-    if (typeof stripe.retrievePaymentIntent === "function") {
-      const { paymentIntent: existingPaymentIntent, error: retrieveError } = await stripe.retrievePaymentIntent(
-        redirectResult.threeDSecureToken
-      );
-      if (retrieveError) {
+    const retrieved = await retrieveResumeIntent(stripe, redirectResult.threeDSecureToken, isSetupIntent);
+    if (retrieved) {
+      if (retrieved.error) {
         throw Object.assign(
           new import_shared7.FloPayError(
-            retrieveError.message ?? "Failed to retrieve 3DS payment status.",
+            retrieved.error.message ?? `Failed to retrieve 3DS ${isSetupIntent ? "setup" : "payment"} status.`,
             "api_error",
-            { code: retrieveError.code }
+            { code: retrieved.error.code }
           ),
           { checkoutMethod: "card" }
         );
       }
-      if (!savedPaymentMethodId && existingPaymentIntent?.payment_method) {
-        if (typeof existingPaymentIntent.payment_method === "string") {
-          savedPaymentMethodId = existingPaymentIntent.payment_method;
-        } else if ("id" in existingPaymentIntent.payment_method) {
-          savedPaymentMethodId = existingPaymentIntent.payment_method.id;
+      const existingIntent = retrieved.intent;
+      if (!savedPaymentMethodId && existingIntent?.payment_method) {
+        if (typeof existingIntent.payment_method === "string") {
+          savedPaymentMethodId = existingIntent.payment_method;
+        } else if ("id" in existingIntent.payment_method) {
+          savedPaymentMethodId = existingIntent.payment_method.id ?? void 0;
         }
       }
     }
-    if (savedPaymentMethodId && typeof stripe.confirmCardPayment === "function") {
-      const { error: confirmError, paymentIntent: confirmedPaymentIntent } = await stripe.confirmCardPayment(
-        redirectResult.threeDSecureToken,
-        {
-          payment_method: savedPaymentMethodId,
-          return_url: returnUrl ?? resolveSavedPaymentReturnUrl(session) ?? window.location.href
-        }
-      );
-      if (confirmError) {
+    const confirmed = savedPaymentMethodId ? await confirmResumeIntent(
+      stripe,
+      redirectResult.threeDSecureToken,
+      {
+        payment_method: savedPaymentMethodId,
+        return_url: returnUrl ?? resolveSavedPaymentReturnUrl(session) ?? window.location.href
+      },
+      isSetupIntent
+    ) : null;
+    if (confirmed) {
+      if (confirmed.error) {
         throw Object.assign(
           new import_shared7.FloPayError(
-            confirmError.message ?? "3DS authentication failed.",
+            confirmed.error.message ?? "3DS authentication failed.",
             "api_error",
-            { code: confirmError.code }
+            { code: confirmed.error.code }
           ),
           { checkoutMethod: "card" }
         );
       }
-      paymentIntent = confirmedPaymentIntent ?? null;
+      paymentIntent = confirmed.intent;
     } else {
-      const { error: nextActionError, paymentIntent: nextActionPaymentIntent } = await stripe.handleNextAction({
+      const nextAction = await stripe.handleNextAction({
         clientSecret: redirectResult.threeDSecureToken
       });
-      if (nextActionError) {
+      if (nextAction.error) {
         throw Object.assign(
           new import_shared7.FloPayError(
-            nextActionError.message ?? "3DS authentication failed.",
+            nextAction.error.message ?? "3DS authentication failed.",
             "api_error",
-            { code: nextActionError.code }
+            { code: nextAction.error.code }
           ),
           { checkoutMethod: "card" }
         );
       }
-      paymentIntent = nextActionPaymentIntent ?? null;
+      paymentIntent = (isSetupIntent ? nextAction.setupIntent : nextAction.paymentIntent) ?? null;
     }
     if (paymentIntent && (paymentIntent.status === "requires_capture" || paymentIntent.status === "succeeded" || paymentIntent.status === "processing")) {
       const followUp = await processSavedPaymentForMode({
@@ -6681,6 +6723,7 @@ function resolveCreateSessionDraft(props) {
 }
 function FloPayAutomaticPaymentButton({
   sessionId,
+  nonce,
   createSession,
   // Deprecated — accepted for back-compat and silently ignored. Backend
   // resolves the customer's latest payment method server-side.
@@ -6812,6 +6855,7 @@ function FloPayAutomaticPaymentButton({
     if (!session) {
       throw new import_shared11.FloPayError("No session data returned", "api_error");
     }
+    const effectiveNonce = session.clientSecret || nonce;
     if (session.status === "complete") {
       await showSuccess({
         result: { status: "succeeded" },
@@ -6867,7 +6911,8 @@ function FloPayAutomaticPaymentButton({
       const result = await processSavedPaymentForMode({
         billingApiUrl: resolvedBillingUrl,
         sessionId: resolvedSessionId ?? session.id,
-        session
+        session,
+        nonce: effectiveNonce
       });
       if (result.type !== "success") {
         throw checkoutProcessErrorToFloPayError(
@@ -6894,11 +6939,13 @@ function FloPayAutomaticPaymentButton({
       if (shouldShowFallbackCheckout(floPayErr, fallbackSessionId) && fallbackSessionId && isMountedRef.current) {
         setFallbackSession({
           sessionId: fallbackSessionId,
-          errorMessage: floPayErr.message
+          errorMessage: floPayErr.message,
+          nonce: effectiveNonce || void 0
         });
       }
     }
   }, [
+    nonce,
     resolvedBillingUrl,
     showError,
     showSuccess
@@ -6939,7 +6986,7 @@ function FloPayAutomaticPaymentButton({
     try {
       const api = new import_js7.PaymentAPI(resolvedBillingUrl);
       if (sessionId) {
-        const result = await api.getUnifiedCheckoutSession(sessionId);
+        const result = await api.getUnifiedCheckoutSession(sessionId, nonce);
         await processResolvedSession(result, sessionId);
         return;
       }
@@ -6978,6 +7025,7 @@ function FloPayAutomaticPaymentButton({
     createSessionDraft,
     disabled,
     isProcessing,
+    nonce,
     processResolvedSession,
     resolvedBillingUrl,
     sessionId,
@@ -7112,6 +7160,7 @@ function FloPayAutomaticPaymentButton({
               FloPayCheckout,
               {
                 sessionId: fallbackSession.sessionId,
+                nonce: fallbackSession.nonce,
                 checkoutMode: "full",
                 billingApiUrl: resolvedBillingUrl,
                 locale,