@flopay/react 0.5.10 → 0.5.12

package/dist/index.cjs

@@ -789,12 +789,6 @@ 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");
@@ -1354,11 +1348,6 @@ 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",
@@ -3161,11 +3150,37 @@ function FloPayCheckout({
           );
         }
         const paymentMethodId = typeof paymentIntent.payment_method === "string" ? paymentIntent.payment_method : paymentIntent.payment_method?.id;
+        let finalResultStatus = resultStatus;
+        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" }
+              );
+            }
+            finalResultStatus = processResult.result.status;
+          }
+        }
         if (resumeState.sessionId) markSessionRecentlyCompleted(resumeState.sessionId);
         setModeOverlayStatus("success");
         await sleep(PROCESSING_OVERLAY_SUCCESS_DELAY_MS);
         onCompleteRef.current?.({
-          status: resultStatus,
+          status: finalResultStatus,
           paymentIntentId: paymentIntent.id,
           paymentMethodId,
           checkoutMethod: "paypal"
@@ -3234,42 +3249,24 @@ 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);
         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 (err) {
-        console.warn("[FloPay debug] resolveInlineSession getUnifiedCheckoutSession threw", { sid, err });
+      } catch {
         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,
@@ -3294,16 +3291,10 @@ function FloPayCheckout({
       const mergedParams = mergeInlineSessionPatch(baseParams, patch);
       const cacheKey = hashCreateParams(mergedParams);
       let promise = sessionInflightMap.get(cacheKey);
-      const inflightHit = !!promise;
       if (!promise) {
         promise = resolveInlineSession(mergedParams, cacheKey);
         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;
@@ -4930,6 +4921,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
@@ -5101,25 +5096,67 @@ 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);
+        let 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" }
+          );
+        }
+        let finalResultStatus = resultStatus;
+        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" }
+            );
+          }
+          finalResultStatus = processResult.result.status;
+          try {
+            const refreshed = await api.getUnifiedCheckoutSession(resumeState.sessionId);
+            if (refreshed.data.session) {
+              resumeSession = refreshed.data.session;
+            }
+          } catch {
+          }
+        }
+        await showSuccess({
+          result: {
+            status: finalResultStatus,
+            paymentIntentId: paymentIntent.id,
+            paymentMethodId: paymentMethodId2,
+            checkoutMethod: "paypal"
+          },
+          session: resumeSession,
+          sessionId: resumeState.sessionId,
+          autoCompleted: false
+        });
       } catch (err) {
         const floPayErr = normalizeSavedPaymentError(err);
         await showError(floPayErr, {