@tagadapay/plugin-sdk 4.0.0 → 4.0.4

package/dist/v2/standalone/payment-service.js

@@ -221,13 +221,40 @@ export class PaymentService {
         });
         this.callbacks.onCurrentPaymentId?.(response.payment?.id || null);
         if (response.payment.requireAction !== 'none') {
-            await this.handlePaymentAction(response.payment);
-            return { success: true, payment: response.payment, order: response.order, redirecting: true };
+            // Pre-empt terminal failure surfaced through requireAction='error' (e.g.
+            // Stripe rejecting an APM that isn't enabled on the account) or status
+            // already declined/failed. Don't even invoke the action handler — for
+            // 'error' it would just fire onError, for declined+redirect it might
+            // navigate to a stale URL. Surface the failure so the button resets.
+            if (response.payment.requireAction === 'error'
+                || response.payment.status === 'declined'
+                || response.payment.status === 'failed') {
+                const msg = response.payment.requireActionData?.message
+                    || response.payment.error?.message
+                    || 'Payment declined';
+                this.callbacks.onError?.(msg);
+                this.callbacks.onProcessing?.(false);
+                return { success: false, error: msg, payment: response.payment, order: response.order };
+            }
+            // Run the action handler; propagate its outcome (covers radar declines,
+            // missing redirect URLs, etc. — not just the headline 'error' case).
+            const outcome = await this.handlePaymentAction(response.payment);
+            const settled = this.settleActionOutcome(outcome, response.payment, response.order);
+            if (settled)
+                return settled;
+            // 'pending' falls through to polling
         }
         if (response.payment.status === 'succeeded') {
             this.callbacks.onProcessing?.(false);
             return { success: true, payment: response.payment, order: response.order };
         }
+        if (response.payment.status === 'declined'
+            || response.payment.status === 'failed') {
+            const msg = response.payment.error?.message || 'Payment declined';
+            this.callbacks.onError?.(msg);
+            this.callbacks.onProcessing?.(false);
+            return { success: false, error: msg, payment: response.payment, order: response.order };
+        }
         return new Promise((resolve) => {
             this.startPolling(response.payment.id, {
                 onSuccess: (payment) => {
@@ -239,14 +266,42 @@ export class PaymentService {
                     this.callbacks.onProcessing?.(false);
                     resolve({ success: false, error });
                 },
-                onRequireAction: (payment) => {
-                    void this.handlePaymentAction(payment);
+                onRequireAction: async (payment) => {
+                    // Polling found a new requireAction mid-flight. Run the handler and
+                    // resolve the outer promise with its outcome — otherwise the caller
+                    // hangs forever waiting on a polling loop that already stopped.
+                    const outcome = await this.handlePaymentAction(payment);
+                    const settled = this.settleActionOutcome(outcome, payment, response.order);
+                    if (settled) {
+                        this.callbacks.onProcessing?.(false);
+                        resolve(settled);
+                    }
+                    // 'pending' outcome means the action handler started its own polling;
+                    // the outer promise stays open and will resolve via that path.
                 },
             });
         });
     }
+    /**
+     * Translate an ActionOutcome into a PaymentResult, or null when the outcome
+     * is 'pending' (caller should keep polling instead of resolving).
+     */
+    settleActionOutcome(outcome, payment, order) {
+        switch (outcome.kind) {
+            case 'redirected':
+                return { success: true, payment, order, redirecting: true };
+            case 'completed':
+                return { success: true, payment: outcome.payment, order };
+            case 'failed':
+                return { success: false, error: outcome.error, payment: outcome.payment ?? payment, order };
+            case 'pending':
+                return null;
+        }
+    }
     /**
      * After radar / completePaymentAfterAction, handle the resumed payment.
+     * Fires callbacks for side effects AND returns an outcome so the caller
+     * (handlePaymentAction) can propagate failure into PaymentResult.
      */
     async handleResumedPayment(resumedPayment) {
         if (resumedPayment.status === 'declined' || resumedPayment.status === 'failed') {
@@ -256,18 +311,17 @@ export class PaymentService {
             this.callbacks.onError?.(errorMsg);
             this.callbacks.onProcessing?.(false);
             this.callbacks.onFailure?.(errorMsg);
-            return;
+            return { kind: 'failed', error: errorMsg, payment: resumedPayment };
         }
         if (resumedPayment.status === 'succeeded') {
             this.callbacks.onProcessing?.(false);
             this.callbacks.onSuccess?.(resumedPayment);
-            return;
+            return { kind: 'completed', payment: resumedPayment };
         }
         if (resumedPayment.requireAction !== 'none' && resumedPayment.requireActionData) {
-            await this.handlePaymentAction(resumedPayment);
-            return;
+            return this.handlePaymentAction(resumedPayment);
         }
-        // Start polling for final status
+        // Start polling for final status — outcome will arrive via callbacks.
         this.startPolling(resumedPayment.id, {
             onSuccess: (p) => {
                 this.callbacks.onProcessing?.(false);
@@ -279,18 +333,19 @@ export class PaymentService {
             },
             onRequireAction: (p) => { void this.handlePaymentAction(p); },
         });
+        return { kind: 'pending' };
     }
     // ==========================================================================
     // PAYMENT ACTION HANDLER (mirrors usePaymentActionHandler)
     // ==========================================================================
     async handlePaymentAction(payment) {
         if (payment.requireAction === 'none')
-            return;
+            return { kind: 'pending' };
         if (payment.requireActionData?.processed)
-            return;
+            return { kind: 'pending' };
         const actionData = payment.requireActionData;
         if (!actionData)
-            return;
+            return { kind: 'pending' };
         try {
             await this.paymentsResource.markPaymentActionProcessed(payment.id);
         }
@@ -306,50 +361,55 @@ export class PaymentService {
                         await this.callbacks.onBeforeRedirect(payment, redirectUrl);
                     }
                     window.location.href = redirectUrl;
+                    return { kind: 'redirected' };
                 }
-                else if (payment.status === 'succeeded') {
+                if (payment.status === 'succeeded') {
                     this.callbacks.onProcessing?.(false);
                     this.callbacks.onSuccess?.(payment);
+                    return { kind: 'completed', payment };
                 }
-                break;
+                // Action said redirect but no URL and payment not succeeded — broken
+                // response from backend. Surface as failure rather than hanging.
+                const noUrlMsg = 'Payment redirect URL missing';
+                this.callbacks.onError?.(noUrlMsg);
+                this.callbacks.onProcessing?.(false);
+                return { kind: 'failed', error: noUrlMsg, payment };
             }
             case 'threeds_auth': {
                 const session = actionData.metadata?.threedsSession;
                 if (session?.acsChallengeUrl) {
                     console.log('[PaymentService] 3DS challenge redirect:', session.acsChallengeUrl);
                     window.location.href = session.acsChallengeUrl;
+                    return { kind: 'redirected' };
                 }
-                break;
+                const noUrlMsg = '3DS challenge URL missing';
+                this.callbacks.onError?.(noUrlMsg);
+                this.callbacks.onProcessing?.(false);
+                return { kind: 'failed', error: noUrlMsg, payment };
             }
             case 'error': {
                 const msg = actionData.message || 'Payment action failed';
                 this.callbacks.onError?.(msg);
                 this.callbacks.onProcessing?.(false);
-                break;
+                return { kind: 'failed', error: msg, payment };
             }
             case 'kesspay_auth':
-                this.handleKessPayAuth(actionData);
-                break;
+                return this.handleKessPayAuth(actionData);
             case 'trustflow_auth':
-                this.handleTrustFlowAuth(actionData);
-                break;
+                return this.handleTrustFlowAuth(actionData);
             case 'finix_radar':
-                await this.handleFinixRadar(payment, actionData);
-                break;
+                return this.handleFinixRadar(payment, actionData);
             case 'stripe_radar':
-                await this.handleStripeRadar(payment, actionData);
-                break;
+                return this.handleStripeRadar(payment, actionData);
             case 'radar':
                 if (actionData.metadata?.provider === 'airwallex') {
-                    await this.handleAirwallexRadar(payment, actionData);
+                    return this.handleAirwallexRadar(payment, actionData);
                 }
-                break;
+                return { kind: 'pending' };
             case 'mastercard_auth':
-                await this.handleMasterCardAuth(payment, actionData);
-                break;
+                return this.handleMasterCardAuth(payment, actionData);
             case 'ngenius_3ds':
-                await this.handleNgeniusThreeds(payment, actionData);
-                break;
+                return this.handleNgeniusThreeds(payment, actionData);
             default: {
                 console.log('[PaymentService] Unhandled action, starting polling:', actionData.type);
                 this.startPolling(payment.id, {
@@ -357,7 +417,7 @@ export class PaymentService {
                     onFailure: (e) => { this.callbacks.onError?.(e); this.callbacks.onProcessing?.(false); },
                     onRequireAction: (p) => { void this.handlePaymentAction(p); },
                 });
-                break;
+                return { kind: 'pending' };
             }
         }
     }
@@ -367,9 +427,10 @@ export class PaymentService {
     handleKessPayAuth(actionData) {
         const threeDSData = actionData?.metadata?.threeds;
         if (!threeDSData?.challengeHtml) {
-            this.callbacks.onError?.('Missing KessPay 3DS challenge HTML');
+            const msg = 'Missing KessPay 3DS challenge HTML';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
-            return;
+            return { kind: 'failed', error: msg };
         }
         try {
             this.callbacks.onProcessing?.(false);
@@ -396,10 +457,13 @@ export class PaymentService {
                 document.write(threeDSData.challengeHtml);
                 document.close();
             }
+            return { kind: 'redirected' };
         }
         catch (error) {
-            this.callbacks.onError?.(error instanceof Error ? error.message : 'KessPay 3DS failed');
+            const msg = error instanceof Error ? error.message : 'KessPay 3DS failed';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
+            return { kind: 'failed', error: msg };
         }
     }
     // --------------------------------------------------------------------------
@@ -408,9 +472,10 @@ export class PaymentService {
     handleTrustFlowAuth(actionData) {
         const authData = actionData?.metadata?.trustflow;
         if (!authData?.appId || !authData?.txnId || !authData?.hash) {
-            this.callbacks.onError?.('Missing Trust Flow 3DS data');
+            const msg = 'Missing Trust Flow 3DS data';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
-            return;
+            return { kind: 'failed', error: msg };
         }
         try {
             this.callbacks.onProcessing?.(false);
@@ -427,10 +492,13 @@ export class PaymentService {
             }
             document.body.appendChild(form);
             form.submit();
+            return { kind: 'redirected' };
         }
         catch (error) {
-            this.callbacks.onError?.(error instanceof Error ? error.message : 'Trust Flow 3DS failed');
+            const msg = error instanceof Error ? error.message : 'Trust Flow 3DS failed';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
+            return { kind: 'failed', error: msg };
         }
     }
     // --------------------------------------------------------------------------
@@ -439,9 +507,10 @@ export class PaymentService {
     async handleFinixRadar(payment, actionData) {
         const radarConfig = actionData.metadata?.radar;
         if (!radarConfig) {
-            this.callbacks.onError?.('Finix radar config missing');
+            const msg = 'Finix radar config missing';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
-            return;
+            return { kind: 'failed', error: msg, payment };
         }
         try {
             await this.loadScript('https://js.finix.com/v/1/finix.js', () => typeof window.Finix?.Auth === 'function');
@@ -469,11 +538,13 @@ export class PaymentService {
                 },
             });
             const resumed = await this.paymentsResource.completePaymentAfterAction(payment.id);
-            await this.handleResumedPayment(resumed);
+            return await this.handleResumedPayment(resumed);
         }
         catch (error) {
-            this.callbacks.onError?.(error instanceof Error ? error.message : 'Finix radar failed');
+            const msg = error instanceof Error ? error.message : 'Finix radar failed';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
+            return { kind: 'failed', error: msg, payment };
         }
     }
     // --------------------------------------------------------------------------
@@ -482,9 +553,10 @@ export class PaymentService {
     async handleStripeRadar(payment, actionData) {
         const radarConfig = actionData.metadata?.radar;
         if (!radarConfig?.publishableKey) {
-            this.callbacks.onError?.('Stripe radar config missing');
+            const msg = 'Stripe radar config missing';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
-            return;
+            return { kind: 'failed', error: msg, payment };
         }
         try {
             await this.loadScript('https://js.stripe.com/v3/', () => typeof window.Stripe === 'function');
@@ -500,11 +572,13 @@ export class PaymentService {
                 stripeRadarSessionData: result.radarSession,
             });
             const resumed = await this.paymentsResource.completePaymentAfterAction(payment.id);
-            await this.handleResumedPayment(resumed);
+            return await this.handleResumedPayment(resumed);
         }
         catch (error) {
-            this.callbacks.onError?.(error instanceof Error ? error.message : 'Stripe radar failed');
+            const msg = error instanceof Error ? error.message : 'Stripe radar failed';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
+            return { kind: 'failed', error: msg, payment };
         }
     }
     // --------------------------------------------------------------------------
@@ -513,9 +587,10 @@ export class PaymentService {
     async handleNgeniusThreeds(payment, actionData) {
         const sdk = actionData.metadata?.sdk;
         if (!sdk?.paymentResponse || !sdk.orderReference || !sdk.paymentReference) {
-            this.callbacks.onError?.('N-Genius 3DS: missing SDK metadata');
+            const msg = 'N-Genius 3DS: missing SDK metadata';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
-            return;
+            return { kind: 'failed', error: msg, payment };
         }
         try {
             const sdkUrl = sdk.isSandboxed
@@ -543,13 +618,14 @@ export class PaymentService {
                 orderReference: sdk.orderReference,
                 paymentReference: sdk.paymentReference,
             });
-            await this.handleResumedPayment(completedPayment);
+            return await this.handleResumedPayment(completedPayment);
         }
         catch (error) {
             const msg = error instanceof Error ? error.message : 'N-Genius 3DS failed';
             console.error('[N-Genius 3DS] Error:', error);
             this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
+            return { kind: 'failed', error: msg, payment };
         }
     }
     // --------------------------------------------------------------------------
@@ -560,9 +636,10 @@ export class PaymentService {
         const orderId = payment.order?.id;
         const checkoutSessionId = payment.order?.checkoutSessionId;
         if (!orderId || !checkoutSessionId) {
-            this.callbacks.onError?.('Missing order info for Airwallex radar');
+            const msg = 'Missing order info for Airwallex radar';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
-            return;
+            return { kind: 'failed', error: msg, payment };
         }
         try {
             const sessionId = crypto.randomUUID();
@@ -591,11 +668,13 @@ export class PaymentService {
                 airwallexRadarSessionId: sessionId,
             });
             const resumed = await this.paymentsResource.completePaymentAfterAction(payment.id);
-            await this.handleResumedPayment(resumed);
+            return await this.handleResumedPayment(resumed);
         }
         catch (error) {
-            this.callbacks.onError?.(error instanceof Error ? error.message : 'Airwallex radar failed');
+            const msg = error instanceof Error ? error.message : 'Airwallex radar failed';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
+            return { kind: 'failed', error: msg, payment };
         }
     }
     // --------------------------------------------------------------------------
@@ -604,9 +683,10 @@ export class PaymentService {
     async handleMasterCardAuth(payment, actionData) {
         const threeDSData = actionData?.metadata?.threeds;
         if (!threeDSData?.sessionId || !threeDSData?.merchantId) {
-            this.callbacks.onError?.('Missing MasterCard 3DS data');
+            const msg = 'Missing MasterCard 3DS data';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
-            return;
+            return { kind: 'failed', error: msg, payment };
         }
         try {
             this.callbacks.onProcessing?.(false);
@@ -659,21 +739,26 @@ export class PaymentService {
                     document.write(challengeHtml);
                     document.close();
                 }
+                return { kind: 'redirected' };
             }
-            else {
-                // Frictionless — complete immediately
-                if (threeDSData.paymentId) {
-                    const resumed = await this.paymentsResource.completePaymentAfterAction(threeDSData.paymentId);
-                    await this.handleResumedPayment(resumed);
-                }
+            // Frictionless — complete immediately via resumed payment
+            if (threeDSData.paymentId) {
+                const resumed = await this.paymentsResource.completePaymentAfterAction(threeDSData.paymentId);
+                const cleanup = document.getElementById(containerId);
+                if (cleanup)
+                    cleanup.remove();
+                return await this.handleResumedPayment(resumed);
             }
             const cleanup = document.getElementById(containerId);
             if (cleanup)
                 cleanup.remove();
+            return { kind: 'pending' };
         }
         catch (error) {
-            this.callbacks.onError?.(error instanceof Error ? error.message : 'MasterCard 3DS failed');
+            const msg = error instanceof Error ? error.message : 'MasterCard 3DS failed';
+            this.callbacks.onError?.(msg);
             this.callbacks.onProcessing?.(false);
+            return { kind: 'failed', error: msg, payment };
         }
     }
     // --------------------------------------------------------------------------
@@ -979,4 +1064,86 @@ export class PaymentService {
             return { success: false, error: msg };
         }
     }
+    /**
+     * Stripe Express Checkout Element payment.
+     *
+     * Mirrors the inline flow from `react/components/StripeExpressButton.onConfirm`:
+     * 1. processPaymentDirect with isExpress=true → returns clientSecret
+     * 2. stripe.confirmPayment(elements, clientSecret) — must run while wallet sheet is open
+     * 3. Poll until webhook marks payment succeeded
+     *
+     * Used for ECE methods Stripe surfaces in one element: apple_pay, google_pay, link, klarna.
+     * The `stripe` and `elements` refs come from Stripe React hooks at the call site.
+     */
+    async processStripeExpressPayment(checkoutSessionId, paymentMethod, processorId, stripe, elements, options) {
+        this.callbacks.onProcessing?.(true);
+        this.callbacks.onError?.(null);
+        try {
+            const paymentFlowId = getAssignedPaymentFlowId();
+            const response = await this.paymentsResource.processPaymentDirect(checkoutSessionId, '', undefined, {
+                processorId,
+                paymentMethod,
+                isExpress: true,
+                paymentFlowId,
+                shippingRateId: options?.shippingRateId,
+            });
+            this.callbacks.onCurrentPaymentId?.(response.payment?.id || null);
+            const clientSecret = response?.payment?.requireActionData?.metadata?.stripeExpressCheckout?.clientSecret;
+            if (!clientSecret) {
+                const msg = 'Express checkout configuration missing — no client secret returned';
+                this.callbacks.onError?.(msg);
+                this.callbacks.onProcessing?.(false);
+                return { success: false, error: msg, payment: response.payment, order: response.order };
+            }
+            const { error: confirmError } = await stripe.confirmPayment({
+                elements,
+                clientSecret,
+                confirmParams: { return_url: window.location.href },
+                redirect: 'if_required',
+            });
+            if (confirmError) {
+                const msg = confirmError.message ?? 'Payment confirmation failed';
+                this.callbacks.onError?.(msg);
+                this.callbacks.onProcessing?.(false);
+                return { success: false, error: msg, payment: response.payment, order: response.order };
+            }
+            // Poll for webhook completion. Ignore stripe_express_checkout require-actions
+            // (already handled by stripe.confirmPayment above) and keep polling.
+            const paymentId = response.payment.id;
+            return await new Promise((resolve) => {
+                const tick = async () => {
+                    try {
+                        const payment = await this.paymentsResource.getPaymentStatus(paymentId);
+                        if (payment.status === 'succeeded' ||
+                            (payment.status === 'pending' && payment.subStatus === 'authorized')) {
+                            this.callbacks.onProcessing?.(false);
+                            resolve({ success: true, payment, order: response.order });
+                            return;
+                        }
+                        if (payment.status !== 'succeeded' && payment.status !== 'pending') {
+                            const msg = payment.status || 'Payment failed';
+                            this.callbacks.onError?.(msg);
+                            this.callbacks.onProcessing?.(false);
+                            resolve({ success: false, error: msg, payment, order: response.order });
+                            return;
+                        }
+                        // Pending — keep polling. Ignore stripe_express_checkout require-action
+                        // (it's just the original intent metadata; we already handled it).
+                        setTimeout(tick, 1500);
+                    }
+                    catch {
+                        // Network blip — try again. Bail after a few failures handled by getPaymentStatus retries upstream.
+                        setTimeout(tick, 1500);
+                    }
+                };
+                void tick();
+            });
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            this.callbacks.onError?.(msg);
+            this.callbacks.onProcessing?.(false);
+            return { success: false, error: msg };
+        }
+    }
 }