@flopay/react 0.5.5 → 0.5.10

package/dist/index.cjs

@@ -625,6 +625,39 @@ function resolveTokenizedPaymentMethodId(tokenizedBody) {
   return void 0;
 }
 
+// src/recent-completion.ts
+var STORAGE_KEY_PREFIX = "flopay_recent_completion_";
+var RECENT_COMPLETION_TTL_MS = 60 * 1e3;
+function markSessionRecentlyCompleted(sessionId) {
+  if (!sessionId || typeof window === "undefined") return;
+  try {
+    const payload = {
+      expiresAt: Date.now() + RECENT_COMPLETION_TTL_MS
+    };
+    window.sessionStorage.setItem(STORAGE_KEY_PREFIX + sessionId, JSON.stringify(payload));
+  } catch {
+  }
+}
+function wasSessionRecentlyCompleted(sessionId) {
+  if (!sessionId || typeof window === "undefined") return false;
+  try {
+    const raw = window.sessionStorage.getItem(STORAGE_KEY_PREFIX + sessionId);
+    if (!raw) return false;
+    const parsed = JSON.parse(raw);
+    if (typeof parsed?.expiresAt !== "number") {
+      window.sessionStorage.removeItem(STORAGE_KEY_PREFIX + sessionId);
+      return false;
+    }
+    if (parsed.expiresAt <= Date.now()) {
+      window.sessionStorage.removeItem(STORAGE_KEY_PREFIX + sessionId);
+      return false;
+    }
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 // src/split-card-form.tsx
 var import_shared5 = require("@flopay/shared");
 var import_jsx_runtime5 = require("react/jsx-runtime");
@@ -756,6 +789,17 @@ function PayPalButtonInner({
     const redirectStatus = params.get("redirect_status");
     if (!paymentIntentId || !clientSecret) return;
     paypalResumeAttempted.current = true;
+    console.info("[FloPay debug] PayPal resume effect firing", {
+      paymentIntentId,
+      redirectStatus,
+      currentSessionId: sessionId,
+      url: window.location.href
+    });
+    const cleanedUrl = new URL(window.location.href);
+    cleanedUrl.searchParams.delete("payment_intent");
+    cleanedUrl.searchParams.delete("payment_intent_client_secret");
+    cleanedUrl.searchParams.delete("redirect_status");
+    window.history.replaceState({}, "", cleanedUrl.toString());
     (async () => {
       try {
         setSubmitting(true);
@@ -778,11 +822,6 @@ function PayPalButtonInner({
             threeDSecureActionResultTokenId: paymentIntent.id,
             isPaypal: true
           });
-          const url = new URL(window.location.href);
-          url.searchParams.delete("payment_intent");
-          url.searchParams.delete("payment_intent_client_secret");
-          url.searchParams.delete("redirect_status");
-          window.history.replaceState({}, "", url.toString());
         } else {
           const message = "PayPal payment was not completed. Please try again.";
           onErrorChange?.(message);
@@ -810,8 +849,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;
@@ -829,7 +869,6 @@ function PayPalButtonInner({
     }
     const effectiveSessionId = prepared?.sessionId ?? sessionId;
     const effectiveEmail = prepared?.accountPatch?.email ?? email;
-    onButtonClick?.("paypal");
     try {
       setSubmitting(true);
       onErrorChange?.(null);
@@ -904,7 +943,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,
@@ -975,7 +1014,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);
@@ -1041,7 +1079,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)(
@@ -1061,6 +1099,7 @@ function WalletButtonInner({
             accountPatch: beforeClick.accountPatch,
             sessionId: beforeClick.sessionId
           };
+          onButtonClick?.(lastWalletMethodRef.current);
           event.resolve();
         },
         onConfirm: handleWalletConfirm,
@@ -1315,6 +1354,11 @@ function SplitCardFormInner({
       const effectiveAccount = mergeAccountPatch(resolvedAccount, overrides?.accountPatch);
       const resolvedCompletionPaymentMethodId = overrides?.completionPaymentMethodId ?? resolveTokenizedPaymentMethodId(tokenizedBody);
       const requestTokenizedBody = tokenizedBody.originalPaymentMethodId ? { ...tokenizedBody, originalPaymentMethodId: void 0 } : tokenizedBody;
+      console.info("[FloPay debug] processPaymentInternal -> POST /process", {
+        sessionId: effectiveSessionId,
+        paymentIntentId: tokenizedBody.threeDSecureActionResultTokenId,
+        isPaypal: tokenizedBody.isPaypal
+      });
       try {
         const response = await fetch(`${baseUrl}/v1/checkouts/sessions/process`, {
           method: "POST",
@@ -1365,6 +1409,7 @@ function SplitCardFormInner({
           })
         });
         if (response.ok) {
+          markSessionRecentlyCompleted(effectiveSessionId);
           setOverlayStatus("success");
           await new Promise((r) => setTimeout(r, PROCESSING_OVERLAY_SUCCESS_DELAY_MS));
           onComplete?.({
@@ -2777,6 +2822,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));
 }
@@ -3018,6 +3064,7 @@ function FloPayCheckout({
             }
           }
         }
+        if (activeSessionId2) markSessionRecentlyCompleted(activeSessionId2);
         setModeOverlayStatus("success");
         await sleep(PROCESSING_OVERLAY_SUCCESS_DELAY_MS);
         onCompleteRef.current?.(paymentResult);
@@ -3114,6 +3161,7 @@ function FloPayCheckout({
           );
         }
         const paymentMethodId = typeof paymentIntent.payment_method === "string" ? paymentIntent.payment_method : paymentIntent.payment_method?.id;
+        if (resumeState.sessionId) markSessionRecentlyCompleted(resumeState.sessionId);
         setModeOverlayStatus("success");
         await sleep(PROCESSING_OVERLAY_SUCCESS_DELAY_MS);
         onCompleteRef.current?.({
@@ -3143,13 +3191,11 @@ 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 ?? ""
       },
@@ -3188,20 +3234,42 @@ function FloPayCheckout({
     const api = new import_js2.PaymentAPI(resolvedBillingUrl);
     let sid = typeof window !== "undefined" ? window.sessionStorage.getItem(cacheKey) : null;
     let realResult = null;
+    console.info("[FloPay debug] resolveInlineSession enter", {
+      cacheKey,
+      cachedSid: sid,
+      url: typeof window !== "undefined" ? window.location.href : null
+    });
     if (sid) {
       try {
         realResult = await api.getUnifiedCheckoutSession(sid);
-        if (realResult.data.session?.status === "complete") {
+        const status = realResult.data.session?.status;
+        console.info("[FloPay debug] resolveInlineSession cache hit", {
+          cacheKey,
+          sid,
+          status,
+          recentlyCompleted: wasSessionRecentlyCompleted(sid)
+        });
+        if (status === "complete") {
+          if (wasSessionRecentlyCompleted(sid)) {
+            console.info("[FloPay debug] resolveInlineSession reuse-completed", { sid });
+            return { sid, result: realResult };
+          }
+          console.warn("[FloPay debug] resolveInlineSession clearing stale complete cache", { sid });
           if (typeof window !== "undefined") window.sessionStorage.removeItem(cacheKey);
           sid = null;
           realResult = null;
         }
-      } catch {
+      } catch (err) {
+        console.warn("[FloPay debug] resolveInlineSession getUnifiedCheckoutSession threw", { sid, err });
         if (typeof window !== "undefined") window.sessionStorage.removeItem(cacheKey);
         sid = null;
       }
     }
     if (!sid) {
+      console.warn("[FloPay debug] resolveInlineSession POSTing /v1/checkouts/sessions", {
+        cacheKey,
+        url: typeof window !== "undefined" ? window.location.href : null
+      });
       const paramsWithAnalytics = {
         ...params,
         avsCheck: !!enableAVS,
@@ -3225,16 +3293,22 @@ function FloPayCheckout({
       }
       const mergedParams = mergeInlineSessionPatch(baseParams, patch);
       const cacheKey = hashCreateParams(mergedParams);
-      let promise = inflightRef.current.get(cacheKey);
+      let promise = sessionInflightMap.get(cacheKey);
+      const inflightHit = !!promise;
       if (!promise) {
         promise = resolveInlineSession(mergedParams, cacheKey);
-        inflightRef.current.set(cacheKey, promise);
+        sessionInflightMap.set(cacheKey, promise);
       }
+      console.info("[FloPay debug] bootstrapInlineSession", {
+        cacheKey,
+        inflightHit,
+        url: typeof window !== "undefined" ? window.location.href : null
+      });
       let resolved;
       try {
         resolved = await promise;
       } finally {
-        inflightRef.current.delete(cacheKey);
+        sessionInflightMap.delete(cacheKey);
       }
       initializedHashRef.current = cacheKey;
       try {