strapi-plugin-payone-provider 1.5.2 → 1.5.3

package/admin/src/pages/App/components/ApplePayButton.js

@@ -553,36 +553,83 @@ const ApplePayButton = ({
       }
 
       // Call the callback with the token BEFORE completing payment
-      // This ensures the token is processed before the dialog closes
+      // This ensures the token is saved before the dialog closes
       console.log("[Apple Pay] Sending token to callback");
       let callbackSuccess = true;
+      let callbackError = null;
+
       if (onTokenReceived) {
         try {
-          // If callback is async, wait for it
+          // Call the callback to save the token
+          // The callback should set the token in state and return success immediately
+          // It should NOT process the payment yet - that will happen when user clicks the button
           const callbackResult = onTokenReceived(tokenString, {
             paymentToken: paymentToken,
             billingContact: response.payerName || response.details?.billingContact,
             shippingContact: response.shippingAddress || response.details?.shippingAddress,
             shippingOption: response.shippingOption || response.details?.shippingOption
           });
-          
-          // If callback returns a promise, wait for it
+
+          // If callback returns a promise, wait for it to resolve or reject
           if (callbackResult && typeof callbackResult.then === 'function') {
-            await callbackResult;
+            try {
+              const result = await callbackResult;
+              console.log("[Apple Pay] Token callback completed successfully:", result);
+              // Check if result indicates success
+              if (result && result.success === false) {
+                callbackSuccess = false;
+                callbackError = new Error(result.message || "Token callback returned failure");
+              }
+            } catch (error) {
+              console.error("[Apple Pay] Token callback promise rejected:", error);
+              callbackSuccess = false;
+              callbackError = error;
+            }
+          } else if (callbackResult === false) {
+            // If callback explicitly returns false, treat as failure
+            callbackSuccess = false;
+            console.warn("[Apple Pay] Token callback returned false");
+          } else {
+            // If callback returns a value (not a promise), assume success
+            console.log("[Apple Pay] Token callback returned synchronously");
           }
-        } catch (callbackError) {
-          console.error("[Apple Pay] Error in token callback:", callbackError);
+        } catch (error) {
+          console.error("[Apple Pay] Error in token callback:", error);
           callbackSuccess = false;
+          callbackError = error;
         }
+      } else {
+        console.warn("[Apple Pay] No onTokenReceived callback provided");
+        // If no callback, we should still complete the payment
+        // But mark as success since we can't determine the result
+        callbackSuccess = true;
       }
 
       // Complete payment with success or fail based on callback result
+      // IMPORTANT: Only call complete() after the callback has fully finished
       console.log("[Apple Pay] Completing payment with status:", callbackSuccess ? "success" : "fail");
+
       try {
-        await response.complete(callbackSuccess ? "success" : "fail");
-        console.log("[Apple Pay] Payment completed successfully");
+        // Use a small delay to ensure state updates are complete
+        // This prevents the dialog from closing before the token is saved
+        await new Promise(resolve => setTimeout(resolve, 200));
+
+        const completionStatus = callbackSuccess ? "success" : "fail";
+        await response.complete(completionStatus);
+        console.log("[Apple Pay] Payment completed with status:", completionStatus);
+
+        // If there was an error, notify the error handler
+        if (!callbackSuccess && callbackError && onError) {
+          onError(callbackError);
+        }
       } catch (completeError) {
         console.error("[Apple Pay] Error completing payment:", completeError);
+        // Try to complete with fail status if there's an error
+        try {
+          await response.complete("fail");
+        } catch (finalError) {
+          console.error("[Apple Pay] Failed to complete payment even with fail status:", finalError);
+        }
         if (onError) {
           onError(completeError);
         }

package/admin/src/pages/App/components/paymentActions/AuthorizationForm.js

@@ -44,16 +44,33 @@ const AuthorizationForm = ({
 
   const handleApplePayToken = async (token, paymentData) => {
     if (!token) {
+      console.error("[Apple Pay] Token is missing in handleApplePayToken");
       return Promise.reject(new Error("Token is missing"));
     }
+
+    console.log("[Apple Pay] handleApplePayToken called with token:", {
+      hasToken: !!token,
+      tokenLength: token?.length,
+      paymentData: !!paymentData
+    });
+
+    // IMPORTANT: Set token in state immediately (synchronously)
+    // This ensures the token is saved before the dialog closes
     setApplePayToken(token);
-    try {
-      await onAuthorization(token);
-      return Promise.resolve();
-    } catch (error) {
-      console.error("[Apple Pay] Error in authorization:", error);
-      return Promise.reject(error);
-    }
+
+    console.log("[Apple Pay] Token saved to state successfully");
+
+    // Don't call onAuthorization immediately
+    // Let the user manually trigger the payment using the button
+    // This prevents the dialog from closing prematurely if there's an error
+    // The dialog will close with success, and the user will see the "Process Authorization" button
+
+    // Return success immediately so the dialog closes properly
+    // The actual payment processing will happen when the user clicks the button
+    return Promise.resolve({
+      success: true,
+      message: "Token received successfully. Please click 'Process Authorization' to complete the payment."
+    });
   };
 
   const handleApplePayError = (error) => {

package/admin/src/pages/App/components/paymentActions/PreauthorizationForm.js

@@ -44,16 +44,33 @@ const PreauthorizationForm = ({
 
   const handleApplePayToken = async (token, paymentData) => {
     if (!token) {
+      console.error("[Apple Pay] Token is missing in handleApplePayToken");
       return Promise.reject(new Error("Token is missing"));
     }
+
+    console.log("[Apple Pay] handleApplePayToken called with token:", {
+      hasToken: !!token,
+      tokenLength: token?.length,
+      paymentData: !!paymentData
+    });
+
+    // IMPORTANT: Set token in state immediately (synchronously)
+    // This ensures the token is saved before the dialog closes
     setApplePayToken(token);
-    try {
-      await onPreauthorization(token);
-      return Promise.resolve();
-    } catch (error) {
-      console.error("[Apple Pay] Error in preauthorization:", error);
-      return Promise.reject(error);
-    }
+
+    console.log("[Apple Pay] Token saved to state successfully");
+
+    // Don't call onPreauthorization immediately
+    // Let the user manually trigger the payment using the button
+    // This prevents the dialog from closing prematurely if there's an error
+    // The dialog will close with success, and the user will see the "Process Preauthorization" button
+
+    // Return success immediately so the dialog closes properly
+    // The actual payment processing will happen when the user clicks the button
+    return Promise.resolve({
+      success: true,
+      message: "Token received successfully. Please click 'Process Preauthorization' to complete the payment."
+    });
   };
 
   const handleApplePayError = (error) => {

package/admin/src/pages/hooks/usePaymentActions.js

@@ -83,6 +83,12 @@ const usePaymentActions = () => {
   };
 
   const handlePreauthorization = async (tokenParam = null) => {
+    console.log("[Payment] handlePreauthorization called", {
+      hasToken: !!tokenParam,
+      paymentMethod,
+      amount: paymentAmount
+    });
+    
     setIsProcessingPayment(true);
     setPaymentError(null);
     setPaymentResult(null);
@@ -211,16 +217,31 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
+      console.log("[Payment] Preauthorization result:", {
+        status,
+        hasError: !!errorCode,
+        errorCode,
+        errorMessage
+      });
+
       if (status === "APPROVED") {
         handlePaymentSuccess("Preauthorization completed successfully");
+        // Return success result for Apple Pay callback
+        return { success: true, data: responseData };
       } else {
+        const errorMsg = errorMessage || `Unexpected status: ${status}`;
         handlePaymentError(
-          { message: `Unexpected status: ${status}` },
+          { message: errorMsg },
           `Preauthorization completed with status: ${status}`
         );
+        // Return error result for Apple Pay callback
+        throw new Error(errorMsg);
       }
     } catch (error) {
+      console.error("[Payment] Preauthorization error:", error);
       handlePaymentError(error, "Preauthorization failed");
+      // Re-throw error so Apple Pay callback knows it failed
+      throw error;
     } finally {
       setIsProcessingPayment(false);
     }
@@ -356,16 +377,31 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
+      console.log("[Payment] Authorization result:", {
+        status,
+        hasError: !!errorCode,
+        errorCode,
+        errorMessage
+      });
+
       if (status === "APPROVED") {
         handlePaymentSuccess("Authorization completed successfully");
+        // Return success result for Apple Pay callback
+        return { success: true, data: responseData };
       } else {
+        const errorMsg = errorMessage || `Unexpected status: ${status}`;
         handlePaymentError(
-          { message: `Unexpected status: ${status}` },
+          { message: errorMsg },
           `Authorization completed with status: ${status}`
         );
+        // Return error result for Apple Pay callback
+        throw new Error(errorMsg);
       }
     } catch (error) {
+      console.error("[Payment] Authorization error:", error);
       handlePaymentError(error, "Authorization failed");
+      // Re-throw error so Apple Pay callback knows it failed
+      throw error;
     } finally {
       setIsProcessingPayment(false);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-payone-provider",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Strapi plugin for Payone payment gateway integration",
   "license": "MIT",
   "maintainers": [