@flopay/react 0.5.6 → 0.5.11

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,11 @@ function PayPalButtonInner({
     const redirectStatus = params.get("redirect_status");
     if (!paymentIntentId || !clientSecret) return;
     paypalResumeAttempted.current = true;
+    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 +816,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);
@@ -1365,6 +1398,7 @@ function SplitCardFormInner({
           })
         });
         if (response.ok) {
+          markSessionRecentlyCompleted(effectiveSessionId);
           setOverlayStatus("success");
           await new Promise((r) => setTimeout(r, PROCESSING_OVERLAY_SUCCESS_DELAY_MS));
           onComplete?.({
@@ -3019,6 +3053,7 @@ function FloPayCheckout({
             }
           }
         }
+        if (activeSessionId2) markSessionRecentlyCompleted(activeSessionId2);
         setModeOverlayStatus("success");
         await sleep(PROCESSING_OVERLAY_SUCCESS_DELAY_MS);
         onCompleteRef.current?.(paymentResult);
@@ -3115,6 +3150,31 @@ function FloPayCheckout({
           );
         }
         const paymentMethodId = typeof paymentIntent.payment_method === "string" ? paymentIntent.payment_method : paymentIntent.payment_method?.id;
+        if (resumeState.sessionId) {
+          const resumeApi = new import_js2.PaymentAPI(resolvedBillingUrl);
+          const resumeSessionResult = await resumeApi.getUnifiedCheckoutSession(resumeState.sessionId);
+          const resumeSession = resumeSessionResult.data.session;
+          if (resumeSession && resumeSession.status !== "complete") {
+            const processResult = await processSavedPaymentForMode({
+              billingApiUrl: resolvedBillingUrl,
+              sessionId: resumeState.sessionId,
+              session: resumeSession,
+              tokenizedData: {
+                id: paymentMethodId ?? paymentIntent.id,
+                type: "card",
+                threeDSecureActionResultTokenId: paymentIntent.id,
+                isPaypal: true
+              }
+            });
+            if (processResult.type !== "success") {
+              throw Object.assign(
+                new import_shared7.FloPayError("Failed to finalize PayPal payment.", "api_error"),
+                { checkoutMethod: "paypal" }
+              );
+            }
+          }
+        }
+        if (resumeState.sessionId) markSessionRecentlyCompleted(resumeState.sessionId);
         setModeOverlayStatus("success");
         await sleep(PROCESSING_OVERLAY_SUCCESS_DELAY_MS);
         onCompleteRef.current?.({
@@ -3149,7 +3209,6 @@ function FloPayCheckout({
     const key = JSON.stringify({
       c: params?.clientId,
       a: {
-        u: params?.account?.userId ?? "",
         e: params?.account?.email?.trim().toLowerCase() ?? "",
         country: params?.account?.country ?? ""
       },
@@ -3191,7 +3250,11 @@ function FloPayCheckout({
     if (sid) {
       try {
         realResult = await api.getUnifiedCheckoutSession(sid);
-        if (realResult.data.session?.status === "complete") {
+        const status = realResult.data.session?.status;
+        if (status === "complete") {
+          if (wasSessionRecentlyCompleted(sid)) {
+            return { sid, result: realResult };
+          }
           if (typeof window !== "undefined") window.sessionStorage.removeItem(cacheKey);
           sid = null;
           realResult = null;
@@ -4856,6 +4919,10 @@ function FloPayAutomaticPaymentButton({
           floPayErr = normalizeSavedPaymentError(intentRecoveryErr);
         }
       }
+      const inResumeWindow = typeof window !== "undefined" && new URLSearchParams(window.location.search).has("payment_intent_client_secret") && !!readPayPalResumeState2();
+      if (floPayErr.code === "payment_intent_unexpected_state" && inResumeWindow) {
+        return;
+      }
       await showError(floPayErr, {
         emitDecline: true,
         method: floPayErr.checkoutMethod ?? DEFAULT_SAVED_PAYMENT_DECLINE_METHOD
@@ -5027,25 +5094,58 @@ function FloPayAutomaticPaymentButton({
           );
         }
         const resultStatus = mapPayPalIntentStatusToPaymentResult(paymentIntent?.status);
-        if (paymentIntent && resultStatus !== "failed") {
-          const paymentMethodId2 = typeof paymentIntent.payment_method === "string" ? paymentIntent.payment_method : paymentIntent.payment_method?.id;
-          await showSuccess({
-            result: {
-              status: resultStatus,
-              paymentIntentId: paymentIntent.id,
-              paymentMethodId: paymentMethodId2,
-              checkoutMethod: "paypal"
-            },
-            session: null,
-            sessionId: resumeState.sessionId,
-            autoCompleted: false
-          });
-        } else {
+        if (!paymentIntent || resultStatus === "failed") {
           throw Object.assign(
             new import_shared10.FloPayError("PayPal payment was not completed. Please try again.", "api_error"),
             { checkoutMethod: "paypal" }
           );
         }
+        const paymentMethodId2 = typeof paymentIntent.payment_method === "string" ? paymentIntent.payment_method : paymentIntent.payment_method?.id;
+        if (!resumeState.sessionId) {
+          throw Object.assign(
+            new import_shared10.FloPayError("Missing session id on PayPal resume.", "api_error"),
+            { checkoutMethod: "paypal" }
+          );
+        }
+        const api = new import_js3.PaymentAPI(resolvedBillingUrl);
+        const sessionResult = await api.getUnifiedCheckoutSession(resumeState.sessionId);
+        const resumeSession = sessionResult.data.session;
+        if (!resumeSession) {
+          throw Object.assign(
+            new import_shared10.FloPayError("Could not load session to capture PayPal payment.", "api_error"),
+            { checkoutMethod: "paypal" }
+          );
+        }
+        if (resumeSession.status !== "complete") {
+          const processResult = await processSavedPaymentForMode({
+            billingApiUrl: resolvedBillingUrl,
+            sessionId: resumeState.sessionId,
+            session: resumeSession,
+            tokenizedData: {
+              id: paymentMethodId2 ?? paymentIntent.id,
+              type: "card",
+              threeDSecureActionResultTokenId: paymentIntent.id,
+              isPaypal: true
+            }
+          });
+          if (processResult.type !== "success") {
+            throw Object.assign(
+              new import_shared10.FloPayError("Failed to finalize PayPal payment.", "api_error"),
+              { checkoutMethod: "paypal" }
+            );
+          }
+        }
+        await showSuccess({
+          result: {
+            status: resultStatus,
+            paymentIntentId: paymentIntent.id,
+            paymentMethodId: paymentMethodId2,
+            checkoutMethod: "paypal"
+          },
+          session: resumeSession,
+          sessionId: resumeState.sessionId,
+          autoCompleted: false
+        });
       } catch (err) {
         const floPayErr = normalizeSavedPaymentError(err);
         await showError(floPayErr, {