@flopay/react 0.5.3 → 0.5.6

package/dist/index.cjs

@@ -559,6 +559,27 @@ function buildDeclineEvent(method, input, overrides) {
     ...declineCode ? { declineCode } : {}
   };
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function readString(payload, key) {
+  const value = payload?.[key];
+  return typeof value === "string" && value.trim() ? value : void 0;
+}
+function buildFloPayApiError(payload, fallbackMessage) {
+  const nestedError = isRecord(payload?.error) ? payload.error : null;
+  const message = readString(payload, "message") ?? readString(nestedError, "message") ?? fallbackMessage;
+  const code = readString(payload, "code") ?? readString(payload, "gatewayErrorCode") ?? readString(nestedError, "code");
+  const declineCode = readString(payload, "declineCode") ?? readString(payload, "gatewayDeclineReason") ?? readString(payload, "decline_code") ?? readString(nestedError, "decline_code");
+  return new import_shared3.FloPayError(message, "api_error", {
+    ...code ? { code } : {},
+    ...declineCode ? { declineCode } : {}
+  });
+}
+async function buildFloPayApiErrorFromResponse(response, fallbackMessage) {
+  const payload = await response.json().catch(() => null);
+  return buildFloPayApiError(payload, fallbackMessage);
+}
 function mapPayPalIntentStatusToPaymentResult(status) {
   if (status === "succeeded") {
     return "succeeded";
@@ -568,6 +589,29 @@ function mapPayPalIntentStatusToPaymentResult(status) {
   }
   return "failed";
 }
+function resolvePaymentIntentPaymentMethodId(paymentIntent) {
+  const paymentMethod = paymentIntent?.payment_method;
+  if (typeof paymentMethod === "string" && paymentMethod.startsWith("pm_")) {
+    return paymentMethod;
+  }
+  if (paymentMethod && typeof paymentMethod === "object" && typeof paymentMethod.id === "string") {
+    return paymentMethod.id;
+  }
+  return void 0;
+}
+async function retrievePaymentIntentFromProvider(provider, clientSecret) {
+  const retriever = provider;
+  if (!retriever?.retrievePaymentIntent) {
+    return null;
+  }
+  const { paymentIntent, error } = await retriever.retrievePaymentIntent(clientSecret);
+  if (error) {
+    throw new import_shared3.FloPayError(error.message ?? "Failed to retrieve payment intent.", "api_error", {
+      ...error.code ? { code: error.code } : {}
+    });
+  }
+  return paymentIntent ?? null;
+}
 function resolveTokenizedPaymentMethodId(tokenizedBody) {
   const candidates = [
     tokenizedBody?.id,
@@ -766,8 +810,9 @@ function PayPalButtonInner({
       accountPatch: beforeClick.accountPatch,
       sessionId: beforeClick.sessionId
     };
+    onButtonClick?.("paypal");
     event.resolve();
-  }, [isProcessing, runBeforeButtonClick, submitting]);
+  }, [isProcessing, onButtonClick, runBeforeButtonClick, submitting]);
   const handlePayPalConfirm = (0, import_react7.useCallback)(async (event) => {
     if (!stripe || !elements) return;
     let prepared = beforeClickRef.current;
@@ -785,7 +830,6 @@ function PayPalButtonInner({
     }
     const effectiveSessionId = prepared?.sessionId ?? sessionId;
     const effectiveEmail = prepared?.accountPatch?.email ?? email;
-    onButtonClick?.("paypal");
     try {
       setSubmitting(true);
       onErrorChange?.(null);
@@ -812,7 +856,16 @@ function PayPalButtonInner({
           setup_future_usage: "off_session"
         })
       });
-      if (!intentResponse.ok) throw new Error("Failed to create payment intent");
+      if (!intentResponse.ok) {
+        const intentError = await buildFloPayApiErrorFromResponse(
+          intentResponse,
+          "Failed to create payment intent"
+        );
+        onErrorChange?.(intentError.message);
+        onDecline?.(buildDeclineEvent("paypal", intentError));
+        event.paymentFailed({ reason: "fail", message: intentError.message });
+        return;
+      }
       const intentJson = await intentResponse.json();
       const intentClientSecret = intentJson.data?.id;
       if (!intentClientSecret) throw new Error("No client_secret in payment intent response");
@@ -851,7 +904,7 @@ function PayPalButtonInner({
     } finally {
       setSubmitting(false);
     }
-  }, [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, onButtonClick, runBeforeButtonClick]);
+  }, [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, runBeforeButtonClick]);
   return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_jsx_runtime5.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(ExpressCheckoutReadySwap, { state: loadState, placeholderTestId: "flopay-paypal-placeholder", children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
       import_react_stripe_js.ExpressCheckoutElement,
@@ -922,7 +975,6 @@ function WalletButtonInner({
       const method = walletType === "apple_pay" ? "apple_pay" : "google_pay";
       const effectiveSessionId = prepared?.sessionId ?? sessionId;
       const effectiveEmail = prepared?.accountPatch?.email ?? email;
-      onButtonClick?.(walletType === "apple_pay" ? "apple_pay" : "google_pay");
       try {
         setSubmitting(true);
         onErrorChange?.(null);
@@ -949,7 +1001,16 @@ function WalletButtonInner({
             isPaypal: false
           })
         });
-        if (!intentResponse.ok) throw new Error("Failed to create payment intent");
+        if (!intentResponse.ok) {
+          const intentError = await buildFloPayApiErrorFromResponse(
+            intentResponse,
+            "Failed to create payment intent"
+          );
+          onErrorChange?.(intentError.message);
+          onDecline?.(buildDeclineEvent(method, intentError));
+          event.paymentFailed({ reason: "fail", message: intentError.message });
+          return;
+        }
         const intentJson = await intentResponse.json();
         const intentClientSecret = intentJson.data?.id;
         if (!intentClientSecret) throw new Error("No client_secret in payment intent response");
@@ -979,7 +1040,7 @@ function WalletButtonInner({
         setSubmitting(false);
       }
     },
-    [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, onButtonClick, runBeforeButtonClick]
+    [stripe, elements, sessionId, email, baseUrl, onTokenizedBody, onErrorChange, onDecline, runBeforeButtonClick]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime5.jsxs)(import_jsx_runtime5.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(ExpressCheckoutReadySwap, { state: loadState, placeholderTestId: "flopay-wallet-placeholder", children: /* @__PURE__ */ (0, import_jsx_runtime5.jsx)(
@@ -999,6 +1060,7 @@ function WalletButtonInner({
             accountPatch: beforeClick.accountPatch,
             sessionId: beforeClick.sessionId
           };
+          onButtonClick?.(lastWalletMethodRef.current);
           event.resolve();
         },
         onConfirm: handleWalletConfirm,
@@ -1564,7 +1626,18 @@ function SplitCardFormInner({
             isPaypal: false
           })
         });
-        if (!intentResponse.ok) throw new import_shared5.FloPayError("Failed to create payment intent", "api_error");
+        if (!intentResponse.ok) {
+          const intentError = await buildFloPayApiErrorFromResponse(
+            intentResponse,
+            "Failed to create payment intent"
+          );
+          setOverlayStatus("error");
+          updateError(intentError.message);
+          onError?.(intentError);
+          emitDecline("card", intentError);
+          await new Promise((r) => setTimeout(r, PROCESSING_OVERLAY_ERROR_DELAY_MS));
+          return;
+        }
         const intentJson = await intentResponse.json();
         const intentClientSecret = intentJson.data?.id;
         if (!intentClientSecret) throw new import_shared5.FloPayError("No client_secret in payment intent response", "api_error");
@@ -1580,11 +1653,26 @@ function SplitCardFormInner({
           await new Promise((r) => setTimeout(r, PROCESSING_OVERLAY_ERROR_DELAY_MS));
           return;
         }
+        const rawProvider = typeof flopay.getRawProvider === "function" ? flopay.getRawProvider() : null;
+        const confirmedPaymentIntent = await retrievePaymentIntentFromProvider(
+          rawProvider,
+          intentClientSecret
+        );
+        const paymentIntentId = confirmResult.paymentIntentId ?? confirmedPaymentIntent?.id;
+        const paymentMethodId = confirmResult.paymentMethodId ?? resolvePaymentIntentPaymentMethodId(confirmedPaymentIntent) ?? pmResult.paymentMethodId;
+        if (!paymentIntentId) {
+          const error2 = new import_shared5.FloPayError("No payment intent returned after confirmation.", "api_error");
+          setOverlayStatus("error");
+          updateError(error2.message);
+          onError?.(error2);
+          await new Promise((r) => setTimeout(r, PROCESSING_OVERLAY_ERROR_DELAY_MS));
+          return;
+        }
         handedOff = isSelfContained;
         dispatchTokenizedBody({
-          id: pmResult.paymentMethodId,
+          id: paymentMethodId,
           type: "card",
-          threeDSecureActionResultTokenId: confirmResult.paymentIntentId,
+          threeDSecureActionResultTokenId: paymentIntentId,
           originalPaymentMethodId: pmResult.paymentMethodId
         });
       } catch (err) {
@@ -2405,12 +2493,12 @@ async function processSavedPaymentWithIntent({
   ));
   const intentJson = await intentResponse.json().catch(() => null);
   if (!intentResponse.ok) {
+    const intentError = buildFloPayApiError(
+      intentJson,
+      "Failed to create payment intent."
+    );
     throw Object.assign(
-      new import_shared6.FloPayError(
-        intentJson?.message ?? "Failed to create payment intent.",
-        "api_error",
-        { code: intentJson?.code ?? intentJson?.gatewayErrorCode }
-      ),
+      intentError,
       { checkoutMethod: "card" }
     );
   }
@@ -2433,7 +2521,14 @@ async function processSavedPaymentWithIntent({
       { checkoutMethod: "card" }
     );
   }
-  if (!confirmResult.paymentIntentId || confirmResult.status !== "succeeded" && confirmResult.status !== "processing" && confirmResult.status !== "requires_capture") {
+  const rawProvider = typeof flopay.getRawProvider === "function" ? flopay.getRawProvider() : null;
+  const confirmedPaymentIntent = await retrievePaymentIntentFromProvider(
+    rawProvider,
+    intentClientSecret
+  );
+  const confirmedPaymentIntentId = confirmResult.paymentIntentId ?? confirmedPaymentIntent?.id;
+  const confirmedPaymentMethodId = confirmResult.paymentMethodId ?? resolvePaymentIntentPaymentMethodId(confirmedPaymentIntent) ?? paymentMethodId;
+  if (!confirmedPaymentIntentId || confirmResult.status !== "succeeded" && confirmResult.status !== "processing" && confirmResult.status !== "requires_capture") {
     throw Object.assign(
       new import_shared6.FloPayError(
         `Unfortunately, your payment could not be processed. Please try again using a different payment method or contact your bank for assistance. If the issue persists, feel free to reach out to us for support.`,
@@ -2450,9 +2545,9 @@ async function processSavedPaymentWithIntent({
     sessionId,
     session,
     tokenizedData: {
-      id: paymentMethodId,
+      id: confirmedPaymentMethodId,
       type: "card",
-      threeDSecureActionResultTokenId: confirmResult.paymentIntentId
+      threeDSecureActionResultTokenId: confirmedPaymentIntentId
     },
     returnUrl
   });
@@ -2467,8 +2562,8 @@ async function processSavedPaymentWithIntent({
   });
   return {
     ...finalResult,
-    paymentIntentId: finalResult.paymentIntentId ?? confirmResult.paymentIntentId,
-    paymentMethodId: finalResult.paymentMethodId ?? paymentMethodId,
+    paymentIntentId: finalResult.paymentIntentId ?? confirmedPaymentIntentId,
+    paymentMethodId: finalResult.paymentMethodId ?? confirmedPaymentMethodId,
     checkoutMethod: finalResult.checkoutMethod ?? "card"
   };
 }
@@ -2682,6 +2777,7 @@ async function loadSavedPaymentProviders({
 var import_jsx_runtime6 = require("react/jsx-runtime");
 var DEFAULT_BUTTONS_LAYOUT_BUTTON_HEIGHT2 = 44;
 var PAYPAL_RESUME_STORAGE_KEY = "flopay_checkout_saved_payment_resume";
+var sessionInflightMap = /* @__PURE__ */ new Map();
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -3048,11 +3144,15 @@ function FloPayCheckout({
       }
     })();
   }, [emitDecline, locale, normalizeSavedPaymentError, resolvedBillingUrl]);
-  const inflightRef = (0, import_react8.useRef)(/* @__PURE__ */ new Map());
   const initializedHashRef = (0, import_react8.useRef)(null);
   function hashCreateParams(params) {
     const key = JSON.stringify({
       c: params?.clientId,
+      a: {
+        u: params?.account?.userId ?? "",
+        e: params?.account?.email?.trim().toLowerCase() ?? "",
+        country: params?.account?.country ?? ""
+      },
       successUrl: params?.successUrl,
       cancelUrl: params?.cancelUrl,
       i: params?.items?.map((x) => `${x.providerItemId}:${x.totalAmount}:${x.overrideAmount ?? ""}:${x.quantity ?? 1}`).sort(),
@@ -3060,6 +3160,7 @@ function FloPayCheckout({
       couponCodes: params?.couponCodes,
       tagsData: params?.tagsData,
       utmMetadata: params?.utmMetadata,
+      tokenizedData: params?.tokenizedData,
       m: params?.checkoutMode ?? "full"
     });
     let h = 0;
@@ -3124,16 +3225,16 @@ function FloPayCheckout({
       }
       const mergedParams = mergeInlineSessionPatch(baseParams, patch);
       const cacheKey = hashCreateParams(mergedParams);
-      let promise = inflightRef.current.get(cacheKey);
+      let promise = sessionInflightMap.get(cacheKey);
       if (!promise) {
         promise = resolveInlineSession(mergedParams, cacheKey);
-        inflightRef.current.set(cacheKey, promise);
+        sessionInflightMap.set(cacheKey, promise);
       }
       let resolved;
       try {
         resolved = await promise;
       } finally {
-        inflightRef.current.delete(cacheKey);
+        sessionInflightMap.delete(cacheKey);
       }
       initializedHashRef.current = cacheKey;
       try {
@@ -4062,6 +4163,7 @@ function CheckoutFormInner({
       if (!flopay || !elements || isSubmitting) return;
       setProcessing(true);
       updateError(null);
+      let handedOff = false;
       try {
         const submitResult = await flopay.submitElements();
         if (submitResult.error) {
@@ -4091,7 +4193,16 @@ function CheckoutFormInner({
             isPaypal: false
           })
         });
-        if (!intentResponse.ok) throw new import_shared8.FloPayError("Failed to create payment intent", "api_error");
+        if (!intentResponse.ok) {
+          const intentError = await buildFloPayApiErrorFromResponse(
+            intentResponse,
+            "Failed to create payment intent"
+          );
+          updateError(intentError.message);
+          onError?.(intentError);
+          emitDecline(intentError);
+          return;
+        }
         const intentJson = await intentResponse.json();
         const intentClientSecret = intentJson.data?.id;
         if (!intentClientSecret) throw new import_shared8.FloPayError("No client_secret in payment intent response", "api_error");
@@ -4105,17 +4216,30 @@ function CheckoutFormInner({
           emitDecline(confirmResult.error);
           return;
         }
+        const rawProvider = typeof flopay.getRawProvider === "function" ? flopay.getRawProvider() : null;
+        const confirmedPaymentIntent = await retrievePaymentIntentFromProvider(
+          rawProvider,
+          intentClientSecret
+        );
+        const paymentIntentId = confirmResult.paymentIntentId ?? confirmedPaymentIntent?.id;
+        const paymentMethodId = confirmResult.paymentMethodId ?? resolvePaymentIntentPaymentMethodId(confirmedPaymentIntent) ?? pmResult.paymentMethodId;
+        if (!paymentIntentId) {
+          const error2 = new import_shared8.FloPayError("No payment intent returned after confirmation.", "api_error");
+          updateError(error2.message);
+          onError?.(error2);
+          return;
+        }
+        handedOff = isSelfContained;
         dispatchTokenizedBody({
-          id: pmResult.paymentMethodId,
+          id: paymentMethodId,
           type: "card",
-          threeDSecureActionResultTokenId: confirmResult.paymentIntentId,
+          threeDSecureActionResultTokenId: paymentIntentId,
           originalPaymentMethodId: pmResult.paymentMethodId
         });
       } catch (err) {
         updateError(err instanceof Error ? err.message : "An unexpected error occurred");
       } finally {
-        if (isSelfContained) {
-        } else {
+        if (!handedOff) {
           setProcessing(false);
         }
       }
@@ -4793,7 +4917,10 @@ function FloPayAutomaticPaymentButton({
         return;
       }
       try {
-        const result = await api.createAndFetchSession(createSessionDraft);
+        const result = await api.createAndFetchSession({
+          ...createSessionDraft,
+          ...automaticPaymentToken ? { tokenizedData: automaticPaymentToken } : {}
+        });
         await processResolvedSession(result, result.data.session?.id ?? null, {
           fromCreateSession: true
         });