@flopay/react 1.1.0 → 1.1.3

package/dist/index.mjs

@@ -457,15 +457,37 @@ function mergeInlineSessionPatch(params, patch) {
   };
 }
 function buildSyntheticSession(params, checkoutModeOverride) {
-  const totalAmount = [
-    ...(params.items ?? []).map((item) => item.overrideAmount ?? item.totalAmount ?? 0),
-    ...(params.subscriptions ?? []).map((subscription) => subscription.overrideAmount ?? subscription.totalAmount ?? 0)
-  ].reduce((sum, value) => sum + value, 0);
-  const currency = params.currency ?? params.items?.find((i) => i.currency)?.currency ?? params.subscriptions?.find((s) => s.currency)?.currency ?? "USD";
+  const inputProducts = params.products ?? [
+    ...(params.subscriptions ?? []).map((s) => ({
+      type: "subscription",
+      code: s.code ?? s.providerPlanId,
+      name: s.subscriptionName ?? s.providerPlanName ?? s.code ?? s.providerPlanId ?? null,
+      quantity: s.quantity ?? 1,
+      totalAmount: s.totalAmount,
+      overrideAmount: s.overrideAmount,
+      currency: s.currency,
+      metadata: s.metadata
+    })),
+    ...(params.items ?? []).map((i) => ({
+      type: "item",
+      code: i.code ?? i.providerItemId,
+      name: i.itemName ?? i.providerItemName ?? i.code ?? i.providerItemId ?? null,
+      quantity: i.quantity ?? 1,
+      totalAmount: i.totalAmount,
+      overrideAmount: i.overrideAmount,
+      currency: i.currency,
+      metadata: i.metadata
+    }))
+  ];
+  const totalAmount = inputProducts.reduce(
+    (sum, p) => sum + (p.overrideAmount ?? p.totalAmount ?? 0),
+    0
+  );
+  const currency = params.currency ?? inputProducts.find((p) => p.currency)?.currency ?? "USD";
   return {
     id: "",
     clientSecret: "",
-    mode: "payment",
+    mode: inputProducts.some((p) => p.type === "subscription") ? "subscription" : "payment",
     amount: Math.round(totalAmount * 100),
     currency,
     status: "open",
@@ -483,40 +505,18 @@ function buildSyntheticSession(params, checkoutModeOverride) {
     successUrl: params.successUrl,
     cancelUrl: params.cancelUrl,
     checkoutMode: checkoutModeOverride ?? params.checkoutMode ?? "full",
-    items: (params.items ?? []).map((item, idx) => {
-      const code = item.code ?? item.providerItemId;
-      const itemName = item.itemName ?? item.providerItemName ?? code;
-      return {
-        uuid: `synthetic-item-${idx}`,
-        checkoutSessionId: "",
-        code,
-        providerItemId: code,
-        itemName,
-        providerItemName: itemName,
-        quantity: item.quantity ?? 1,
-        totalAmount: item.totalAmount,
-        overrideAmount: item.overrideAmount ?? null,
-        currency: item.currency ?? currency,
-        metadata: item.metadata ?? null
-      };
-    }),
-    subscriptions: (params.subscriptions ?? []).map((subscription, idx) => {
-      const code = subscription.code ?? subscription.providerPlanId;
-      const subscriptionName = subscription.subscriptionName ?? subscription.providerPlanName ?? code;
-      return {
-        uuid: `synthetic-sub-${idx}`,
-        checkoutSessionId: "",
-        code,
-        providerPlanId: code,
-        subscriptionName,
-        providerPlanName: subscriptionName,
-        quantity: subscription.quantity ?? 1,
-        totalAmount: subscription.totalAmount,
-        overrideAmount: subscription.overrideAmount ?? null,
-        currency: subscription.currency ?? currency,
-        metadata: subscription.metadata ?? null
-      };
-    })
+    products: inputProducts.map((p, idx) => ({
+      uuid: `synthetic-${p.type}-${idx}`,
+      checkoutSessionId: "",
+      type: p.type,
+      code: p.code,
+      name: p.name ?? null,
+      quantity: p.quantity ?? 1,
+      totalAmount: p.totalAmount,
+      overrideAmount: p.overrideAmount ?? null,
+      currency: p.currency ?? currency,
+      metadata: p.metadata ?? null
+    }))
   };
 }
 function mergeAccountPatch(base, patch) {
@@ -544,9 +544,25 @@ function readString(payload, key) {
   const value = payload?.[key];
   return typeof value === "string" && value.trim() ? value : void 0;
 }
+var FRIENDLY_MESSAGE_OVERRIDES = [
+  {
+    match: /^paypal authorization required\.?$/i,
+    replacement: "For your additional security, please re-authenticate this payment via PayPal."
+  }
+];
+function applyFriendlyMessageOverride(message) {
+  if (typeof message !== "string") return message ?? void 0;
+  const trimmed = message.trim();
+  if (!trimmed) return message;
+  for (const { match, replacement } of FRIENDLY_MESSAGE_OVERRIDES) {
+    if (match.test(trimmed)) return replacement;
+  }
+  return message;
+}
 function buildFloPayApiError(payload, fallbackMessage) {
   const nestedError = isRecord(payload?.error) ? payload.error : null;
-  const message = readString(payload, "message") ?? readString(nestedError, "message") ?? fallbackMessage;
+  const rawMessage = readString(payload, "message") ?? readString(nestedError, "message") ?? fallbackMessage;
+  const message = applyFriendlyMessageOverride(rawMessage) ?? rawMessage;
   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 FloPayError(message, "api_error", {
@@ -848,7 +864,8 @@ function DirectPayPalButton({
     const forwardError = (message) => {
       if (cancelled) return;
       if (isZoidLifecycleMessage(message)) return;
-      onErrorChangeRef.current?.(message);
+      const friendly = applyFriendlyMessageOverride(message) ?? message;
+      onErrorChangeRef.current?.(friendly);
     };
     const markRenderFailed = (message) => {
       if (cancelled) return;
@@ -895,14 +912,16 @@ function DirectPayPalButton({
           return;
         }
         const json = await response.json().catch(() => null);
-        const message = json?.["message"] ?? "PayPal payment failed.";
+        const rawMessage = json?.["message"] ?? "PayPal payment failed.";
+        const message = applyFriendlyMessageOverride(rawMessage) ?? rawMessage;
         forwardError(message);
         onDeclineRef.current?.(buildDeclineEvent("paypal", message, {
           code: json?.["code"],
           declineCode: json?.["declineCode"]
         }));
       } catch (err) {
-        const message = err instanceof Error ? err.message : "PayPal payment failed.";
+        const rawMessage = err instanceof Error ? err.message : "PayPal payment failed.";
+        const message = applyFriendlyMessageOverride(rawMessage) ?? rawMessage;
         forwardError(message);
         onDeclineRef.current?.(buildDeclineEvent("paypal", message));
       }
@@ -3052,9 +3071,11 @@ function getRedirectResultFromCheckoutProcessError(error) {
 }
 function checkoutProcessErrorToFloPayError(error, fallbackMessage = "Payment failed. Please try again.", options) {
   const checkoutMethod = options?.checkoutMethod ?? error?.checkoutMethod ?? (error?.type === "paypal_redirect_required" ? "paypal" : "card");
+  const rawMessage = error?.message ?? fallbackMessage;
+  const message = applyFriendlyMessageOverride(rawMessage) ?? rawMessage;
   return Object.assign(
     new FloPayError4(
-      error?.message ?? fallbackMessage,
+      message,
       "api_error",
       {
         code: error?.gatewayErrorCode
@@ -3511,21 +3532,36 @@ async function handleSavedPaymentRedirectResult(redirectResult, {
 }
 function normalizeSavedPaymentError(err) {
   if (err instanceof FloPayError4) {
+    const friendly = applyFriendlyMessageOverride(err.message);
+    if (friendly && friendly !== err.message) {
+      return Object.assign(
+        new FloPayError4(friendly, err.type, {
+          code: err.code,
+          declineCode: err.declineCode,
+          param: err.param,
+          statusCode: err.statusCode
+        }),
+        { checkoutMethod: err.checkoutMethod }
+      );
+    }
     return err;
   }
-  return new FloPayError4(
-    err instanceof Error ? err.message : "Payment failed. Please try again.",
-    "api_error"
-  );
+  const rawMessage = err instanceof Error ? err.message : "Payment failed. Please try again.";
+  const message = applyFriendlyMessageOverride(rawMessage) ?? rawMessage;
+  return new FloPayError4(message, "api_error");
 }
 function resolveSavedPaymentPublishableKeys(unified) {
   const publishableKey = unified.data.stripe?.publishableKey;
-  if (!publishableKey) {
+  const hasDirectPaypal = Boolean(unified.data.paypal?.publishableKey);
+  if (!publishableKey && !hasDirectPaypal) {
     throw new FloPayError4(
-      "No publishable key found in the checkout session. Ensure the session advertises gateways.stripe.",
+      "Session advertises no supported gateways (expected `gateways.stripe` and/or `gateways.paypal`).",
       "validation_error"
     );
   }
+  if (!publishableKey) {
+    return {};
+  }
   return {
     publishableKey,
     // Direct-PayPal sessions can still use Stripe's PayPal Element for the
@@ -3542,6 +3578,9 @@ async function loadSavedPaymentProviders({
   billingApiUrl,
   locale
 }) {
+  if (!publishableKey) {
+    return { flopay: null, paypalFlopay: null };
+  }
   const needsSeparatePaypal = Boolean(paypalPublishableKey) && paypalPublishableKey !== publishableKey;
   const [instance, paypalInstanceOrError] = await Promise.all([
     loadFloPay(publishableKey, {
@@ -3578,6 +3617,11 @@ function resolveDirectPaypalConfig(unified) {
     environment: unified?.data.paypal?.environment
   };
 }
+function isPayPalOnlyUnified(unified) {
+  if (!unified) return false;
+  if (unified.data.stripe?.publishableKey) return false;
+  return Boolean(resolveDirectPaypalConfig(unified)?.clientId);
+}
 function canUseStorage() {
   return typeof window !== "undefined" && typeof window.sessionStorage !== "undefined";
 }
@@ -3756,7 +3800,7 @@ function FloPayCheckout({
         const redirectResult = getRedirectResultFromCheckoutProcessError(options?.initialAutoProcessingError);
         let paymentResult;
         if (redirectResult) {
-          if (redirectResult.type === "paypal_redirect_required" && savedPaymentKeysRef.current) {
+          if (redirectResult.type === "paypal_redirect_required" && savedPaymentKeysRef.current?.publishableKey) {
             persistPayPalResumeState({
               sessionId: activeSessionId2,
               publishableKey: savedPaymentKeysRef.current.publishableKey,
@@ -3808,7 +3852,7 @@ function FloPayCheckout({
           if (result.type === "success") {
             paymentResult = result.result;
           } else {
-            if (result.type === "paypal_redirect_required" && savedPaymentKeysRef.current) {
+            if (result.type === "paypal_redirect_required" && savedPaymentKeysRef.current?.publishableKey) {
               persistPayPalResumeState({
                 sessionId: activeSessionId2,
                 publishableKey: savedPaymentKeysRef.current.publishableKey,
@@ -3899,7 +3943,7 @@ function FloPayCheckout({
           billingApiUrl: resolvedBillingUrl,
           locale
         });
-        const paypalStripe = (resumePaypalFlopay ?? resumeFlopay).getRawProvider();
+        const paypalStripe = (resumePaypalFlopay ?? resumeFlopay)?.getRawProvider();
         if (!paypalStripe) {
           throw Object.assign(
             new FloPayError5("PayPal is not available.", "api_error"),
@@ -4167,7 +4211,8 @@ function FloPayCheckout({
           const resolved = await bootstrapInlineSession();
           const resolvedSession = resolved.result.data.session ?? null;
           savedPaymentKeysRef.current = resolveSavedPaymentPublishableKeys(resolved.result);
-          if (!cancelled && shouldAutoProcessInlineSession && resolvedSession) {
+          const resolvedPaypalOnly = isPayPalOnlyUnified(resolved.result);
+          if (!cancelled && shouldAutoProcessInlineSession && resolvedSession && !resolvedPaypalOnly) {
             autoCheckoutAttempted.current = true;
             await runSavedPaymentFlow(resolvedSession, {
               attempt3DS: true,
@@ -4181,6 +4226,9 @@ function FloPayCheckout({
             return;
           }
           if (!cancelled && shouldAutoProcessInlineSession) {
+            if (resolvedPaypalOnly) {
+              autoCheckoutAttempted.current = true;
+            }
             setModeOverlayStatus(null);
             setModeOverlayError(null);
           }
@@ -4235,7 +4283,8 @@ function FloPayCheckout({
         const effectiveMode = checkoutModeProp ?? sess.checkoutMode ?? "full";
         setCurrentMode(effectiveMode);
         const hasPayPalRedirectParams = typeof window !== "undefined" && new URLSearchParams(window.location.search).has("payment_intent");
-        if (effectiveMode === "auto" && !autoCheckoutAttempted.current && !hasPayPalRedirectParams) {
+        const paypalOnly = isPayPalOnlyUnified(result);
+        if (effectiveMode === "auto" && !autoCheckoutAttempted.current && !hasPayPalRedirectParams && !paypalOnly) {
           autoCheckoutAttempted.current = true;
           const stripeInitPromise = initStripe(result);
           try {
@@ -4315,8 +4364,10 @@ function FloPayCheckout({
       setConfirmProcessing(false);
     }
   }, [activeSessionId, confirmProcessing, runSavedPaymentFlow, session]);
+  const directPaypalConfig = resolveDirectPaypalConfig(unified);
+  const isPaypalOnlySession = isPayPalOnlyUnified(unified);
   const providerOptions = useMemo4(() => {
-    if (!unified || !session) return void 0;
+    if (!unified || !session || !unified.data.stripe?.publishableKey) return void 0;
     const opts = {
       appearance,
       paymentMethodCreation: "manual",
@@ -4355,7 +4406,7 @@ function FloPayCheckout({
       cardBootstrapPending
     ]
   );
-  const shouldShowInterimButtons = Boolean(createSessionParams) && layout === "buttons" && (!flopay || !providerOptions);
+  const shouldShowInterimButtons = Boolean(createSessionParams) && layout === "buttons" && !isPaypalOnlySession && (!flopay || !providerOptions);
   const modeOverlay = modeOverlayStatus ? /* @__PURE__ */ jsx7(
     ProcessingOverlay,
     {
@@ -4438,6 +4489,48 @@ function FloPayCheckout({
       modeOverlay
     ] });
   }
+  if (isPaypalOnlySession && session && directPaypalConfig) {
+    return /* @__PURE__ */ jsxs5(Fragment3, { children: [
+      /* @__PURE__ */ jsx7(CheckoutContext.Provider, { value: checkoutValue, children: /* @__PURE__ */ jsxs5("div", { className, style: { display: "flex", flexDirection: "column", gap: "0.5rem" }, children: [
+        modeError && /* @__PURE__ */ jsx7(
+          "div",
+          {
+            role: "alert",
+            "data-testid": "flopay-error",
+            style: {
+              padding: "0.625rem 0.875rem",
+              background: "#FEF2F2",
+              border: "1px solid #FECACA",
+              borderRadius: "8px",
+              color: "#991B1B",
+              fontSize: "0.85rem",
+              fontWeight: 600
+            },
+            children: modeError
+          }
+        ),
+        /* @__PURE__ */ jsx7(
+          DirectPayPalButton,
+          {
+            sessionId: activeSessionId,
+            billingApiUrl: resolvedBillingUrl,
+            email: session.customer?.email,
+            clientId: directPaypalConfig.clientId,
+            environment: directPaypalConfig.environment,
+            currency: (session.currency ?? "usd").toUpperCase(),
+            isSubscription: session.mode === "subscription",
+            onComplete,
+            onErrorChange: setModeError,
+            onDecline,
+            onButtonClick,
+            session,
+            debug
+          }
+        )
+      ] }) }),
+      modeOverlay
+    ] });
+  }
   if (!flopay || !providerOptions) {
     return /* @__PURE__ */ jsx7(Fragment3, { children: modeOverlay });
   }
@@ -5592,7 +5685,7 @@ function FloPayAutomaticPaymentButton({
           publishableKey,
           paypalPublishableKey
         } = resolveSavedPaymentPublishableKeys(apiResult);
-        if (redirectResult.type === "paypal_redirect_required") {
+        if (redirectResult.type === "paypal_redirect_required" && publishableKey) {
           persistPayPalResumeState2({
             sessionId: session.id || resolvedSessionId,
             publishableKey,
@@ -5648,7 +5741,7 @@ function FloPayAutomaticPaymentButton({
             publishableKey,
             paypalPublishableKey
           } = resolveSavedPaymentPublishableKeys(apiResult);
-          if (result.type === "paypal_redirect_required") {
+          if (result.type === "paypal_redirect_required" && publishableKey) {
             persistPayPalResumeState2({
               sessionId: session.id || resolvedSessionId,
               publishableKey,
@@ -5709,6 +5802,13 @@ function FloPayAutomaticPaymentButton({
             billingApiUrl: resolvedBillingUrl,
             locale
           });
+          if (!flopay) {
+            throw new FloPayError8(
+              "Stripe is not available for 3DS authentication.",
+              "api_error",
+              { code: "authentication_required" }
+            );
+          }
           const paymentResult = await processSavedPaymentWithIntent({
             billingApiUrl: resolvedBillingUrl,
             sessionId: fallbackSessionId,
@@ -5895,7 +5995,7 @@ function FloPayAutomaticPaymentButton({
           billingApiUrl: resolvedBillingUrl,
           locale
         });
-        const paypalStripe = (paypalFlopay ?? flopay).getRawProvider();
+        const paypalStripe = (paypalFlopay ?? flopay)?.getRawProvider();
         if (!paypalStripe) {
           throw Object.assign(
             new FloPayError8("PayPal is not available.", "api_error"),