strapi-plugin-payone-provider 1.6.2 → 1.6.4

package/admin/src/pages/App/components/paymentActions/PaymentMethodSelector.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React from "react";
 import {
   Box,
   Flex,
@@ -24,13 +24,6 @@ const PaymentMethodSelector = ({
   onNavigateToConfig,
   isLiveMode,
 }) => {
-  useEffect(() => {
-    if (isLiveMode && paymentMethod !== "apl") {
-      setPaymentMethod("apl");
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isLiveMode]);
-
   return (
     <Box>
       <Flex direction="column" alignItems="stretch" gap={4}>
@@ -290,7 +283,7 @@ const PaymentMethodSelector = ({
             </Box>
           </>
         )}
-        {supportsCaptureMode(paymentMethod) && (
+        {paymentMethod !== "apl" && supportsCaptureMode(paymentMethod) && (
           <Select
             label="Capture Mode"
             name="captureMode"

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

@@ -39,7 +39,7 @@ const PreauthorizationForm = ({
   };
 
   const handleGooglePayError = (error) => {
-    console.error("[PreauthorizationForm] Google Pay error:", error);
+    console.error("Google Pay error:", error);
   };
 
   return (

package/admin/src/pages/App/index.jsx

@@ -22,17 +22,25 @@ const App = () => {
   const paymentActions = usePaymentActions();
 
   useEffect(() => {
-    if (location.pathname.includes('/apple-pay-config') || location.pathname.includes('/google-pay-config')) {
+    if (
+      location.pathname.includes("/apple-pay-config") ||
+      location.pathname.includes("/google-pay-config")
+    ) {
     } else {
-      const tabFromPath = location.pathname.includes('/history') ? 1 :
-        location.pathname.includes('/payment-actions') ? 2 :
-          location.pathname.includes('/documentation') ? 3 : 0;
+      const tabFromPath = location.pathname.includes("/history")
+        ? 1
+        : location.pathname.includes("/payment-actions")
+        ? 2
+        : location.pathname.includes("/documentation")
+        ? 3
+        : 0;
       setActiveTab(tabFromPath);
     }
   }, [location.pathname]);
 
-  const isApplePayConfigPage = location.pathname.includes('/apple-pay-config');
-  const isGooglePayConfigPage = location.pathname.includes('/google-pay-config');
+  const isApplePayConfigPage = location.pathname.includes("/apple-pay-config");
+  const isGooglePayConfigPage =
+    location.pathname.includes("/google-pay-config");
 
   if (isApplePayConfigPage) {
     return (
@@ -124,4 +132,4 @@ const App = () => {
   );
 };
 
-export default App;
+export default App;

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

@@ -6,7 +6,8 @@ import {
   getAuthorizationParams,
   getCaptureParams,
   getRefundParams,
-  generateLagOrderNumber
+  generateLagOrderNumber,
+  getValidCardExpiryDate,
 } from "../utils/paymentUtils";
 import { DEFAULT_PAYMENT_DATA } from "../constants/paymentConstants";
 
@@ -75,11 +76,14 @@ const usePaymentActions = () => {
   };
 
   const handlePreauthorization = async (tokenParam = null) => {
+<<<<<<< HEAD
     console.log("[Payment] handlePreauthorization called", {
       hasToken: !!tokenParam,
       paymentMethod,
       amount: paymentAmount
     });
+=======
+>>>>>>> release/1.6.4
     setIsProcessingPayment(true);
     setPaymentError(null);
     setPaymentResult(null);
@@ -102,7 +106,7 @@ const usePaymentActions = () => {
       if (paymentMethod === "cc" && settings.enable3DSecure !== false) {
         if (cardtype) baseParams.cardtype = cardtype;
         if (cardpan) baseParams.cardpan = cardpan;
-        if (cardexpiredate) baseParams.cardexpiredate = cardexpiredate;
+        baseParams.cardexpiredate = getValidCardExpiryDate(cardexpiredate);
         if (cardcvc2) baseParams.cardcvc2 = cardcvc2;
       }
 
@@ -152,8 +156,6 @@ const usePaymentActions = () => {
         null;
 
       if (is3DSRequiredError && !redirectUrl) {
-        console.warn("3DS authentication required (Error 4219) but no redirect URL found in response");
-        console.log("Full response:", JSON.stringify(responseData, null, 2));
         setPaymentError(
           "3D Secure authentication required. Please check Payone configuration and ensure redirect URLs are properly set. Error: " +
           (errorMessage || `Error code: ${errorCode}`)
@@ -177,7 +179,6 @@ const usePaymentActions = () => {
         (is3DSRequiredError && redirectUrl);
 
       if (needsRedirect && redirectUrl) {
-        console.log("Redirecting to 3DS:", redirectUrl);
         window.location.href = redirectUrl;
         return;
       }
@@ -228,7 +229,7 @@ const usePaymentActions = () => {
       if (paymentMethod === "cc" && settings.enable3DSecure !== false) {
         if (cardtype) baseParams.cardtype = cardtype;
         if (cardpan) baseParams.cardpan = cardpan;
-        if (cardexpiredate) baseParams.cardexpiredate = cardexpiredate;
+        baseParams.cardexpiredate = getValidCardExpiryDate(cardexpiredate);
         if (cardcvc2) baseParams.cardcvc2 = cardcvc2;
       }
 
@@ -278,8 +279,6 @@ const usePaymentActions = () => {
         null;
 
       if (is3DSRequiredError && !redirectUrl) {
-        console.warn("3DS authentication required (Error 4219) but no redirect URL found in response");
-        console.log("Full response:", JSON.stringify(responseData, null, 2));
         setPaymentError(
           "3D Secure authentication required. Please check Payone configuration and ensure redirect URLs are properly set. Error: " +
           (errorMessage || `Error code: ${errorCode}`)
@@ -303,7 +302,6 @@ const usePaymentActions = () => {
         (is3DSRequiredError && redirectUrl);
 
       if (needsRedirect && redirectUrl) {
-        console.log("Redirecting to 3DS:", redirectUrl);
         window.location.href = redirectUrl;
         return;
       }

package/admin/src/pages/utils/injectApplePayScript.js

@@ -0,0 +1,34 @@
+export const injectApplePayScript = () => {
+
+  if (typeof window === 'undefined') {
+    return;
+  }
+
+  const checkApplePay = () => {
+    try {
+      return typeof window.ApplePaySession !== 'undefined' &&
+        typeof window.ApplePaySession.canMakePayments === 'function';
+    } catch (e) {
+      return false;
+    }
+  };
+
+  if (checkApplePay()) {
+    window.dispatchEvent(new CustomEvent("applePayAvailable"));
+  } else {
+    const checkInterval = setInterval(() => {
+      if (checkApplePay()) {
+        clearInterval(checkInterval);
+        window.dispatchEvent(new CustomEvent("applePayAvailable"));
+      }
+    }, 200);
+
+    setTimeout(() => {
+      clearInterval(checkInterval);
+      if (!checkApplePay()) {
+        window.dispatchEvent(new CustomEvent("applePayNotAvailable"));
+      }
+    }, 5000);
+  }
+};
+

package/admin/src/pages/utils/paymentUtils.js

@@ -1,3 +1,43 @@
+export function getValidCardExpiryDate(cardexpiredate) {
+  const now = new Date();
+  const currentYear = now.getFullYear() % 100;
+  const currentMonth = now.getMonth() + 1;
+
+  if (!cardexpiredate || cardexpiredate.trim() === "") {
+    const nextYear = currentYear + 1;
+    const monthStr = String(currentMonth).padStart(2, '0');
+    return `${nextYear}${monthStr}`;
+  }
+
+  // Validate format (must be 4 digits)
+  if (!/^\d{4}$/.test(cardexpiredate)) {
+    const nextYear = currentYear + 1;
+    const monthStr = String(currentMonth).padStart(2, '0');
+    return `${nextYear}${monthStr}`;
+  }
+
+  // Parse YYMM format
+  const year = parseInt(cardexpiredate.substring(0, 2), 10);
+  const month = parseInt(cardexpiredate.substring(2, 4), 10);
+
+  // Validate month (1-12)
+  if (month < 1 || month > 12) {
+    const nextYear = currentYear + 1;
+    const monthStr = String(currentMonth).padStart(2, '0');
+    return `${nextYear}${monthStr}`;
+  }
+
+  const currentDate = new Date(2000 + currentYear, currentMonth - 1);
+  const expiryDate = new Date(2000 + year, month - 1);
+
+  if (expiryDate < currentDate) {
+    const nextYear = currentYear + 1;
+    const monthStr = String(currentMonth).padStart(2, '0');
+    return `${nextYear}${monthStr}`;
+  }
+
+  return cardexpiredate;
+}
 
 export function generateLagOrderNumber(sequence = 1000) {
   const paddedSequence = sequence.toString().padStart(5, '0');
@@ -125,7 +165,7 @@ export const getPaymentMethodParams = (paymentMethod, options = {}) => {
         clearingtype: "cc",
         cardtype: finalCardType, // V = Visa, M = Mastercard, A = Amex
         cardpan: cardpan || "4111111111111111", // Test Visa card
-        cardexpiredate: cardexpiredate || "2512", // MMYY format
+        cardexpiredate: getValidCardExpiryDate(cardexpiredate),
         cardcvc2: cardcvc2 || "123" // 3-digit security code
       };
 
@@ -374,24 +414,16 @@ export const getPaymentMethodOptions = (isLiveMode = false) => {
     { value: "wlt", label: "PayPal" },
     { value: "gpp", label: "Google Pay" },
     { value: "apl", label: "Apple Pay" },
-    { value: "sb", label: "Sofort Banking" },
     { value: "elv", label: "SEPA Direct Debit" }
   ];
 };
 
-/**
- * Check if payment method supports capture mode
- * @param {string} paymentMethod - Payment method
- * @returns {boolean} True if supports capture mode
- */
+
 export const supportsCaptureMode = (paymentMethod) => {
-  return paymentMethod === "wlt" || paymentMethod === "gpp" || paymentMethod === "apl"; // PayPal, Google Pay, and Apple Pay support capture mode
+  return paymentMethod === "wlt" || paymentMethod === "gpp" || paymentMethod === "apl";
 };
 
-/**
- * Get capture mode options
- * @returns {Array} Array of capture mode options
- */
+
 export const getCaptureModeOptions = () => {
   return [
     { value: "full", label: "Full Capture" },
@@ -399,14 +431,6 @@ export const getCaptureModeOptions = () => {
   ];
 };
 
-/**
- * Validate payment parameters based on Payone v1 documentation
- * Comprehensive validation for all operations and payment methods
- * @param {string} operation - Operation type (preauthorization, authorization, capture, refund)
- * @param {string} paymentMethod - Payment method
- * @param {Object} params - Parameters to validate
- * @returns {Object} Validation result with detailed error messages
- */
 export const validatePaymentParams = (operation, paymentMethod, params) => {
   const errors = [];
 
@@ -419,12 +443,10 @@ export const validatePaymentParams = (operation, paymentMethod, params) => {
     errors.push("Currency is required");
   }
 
-  // Validate currency format (ISO 4217)
   if (params.currency && !/^[A-Z]{3}$/.test(params.currency)) {
     errors.push("Currency must be in ISO 4217 format (e.g., EUR, USD)");
   }
 
-  // Operation specific validations (Payone v1 documentation)
   switch (operation) {
     case "preauthorization":
       if (!params.reference) {
@@ -504,7 +526,6 @@ export const validatePaymentParams = (operation, paymentMethod, params) => {
       break;
   }
 
-  // Payment method specific validations (Payone v1 documentation)
   switch (paymentMethod) {
     case "cc":
       if (!params.cardpan || !params.cardexpiredate || !params.cardcvc2) {
@@ -517,9 +538,9 @@ export const validatePaymentParams = (operation, paymentMethod, params) => {
       if (params.cardpan && !/^\d{13,19}$/.test(params.cardpan.replace(/\s/g, ''))) {
         errors.push("Card number must be 13-19 digits");
       }
-      // Validate expiry date format (MMYY)
+      // Validate expiry date format (YYMM)
       if (params.cardexpiredate && !/^\d{4}$/.test(params.cardexpiredate)) {
-        errors.push("Card expiry date must be in MMYY format");
+        errors.push("Card expiry date must be in YYMM format (e.g., 2512 = December 2025)");
       }
       // Validate CVC format (3-4 digits)
       if (params.cardcvc2 && !/^\d{3,4}$/.test(params.cardcvc2)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-payone-provider",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Strapi plugin for Payone payment gateway integration",
   "license": "MIT",
   "maintainers": [
@@ -10,6 +10,7 @@
     }
   ],
   "dependencies": {
+    "apple-pay-button": "^1.2.1",
     "axios": "^1.6.3",
     "prop-types": "^15.7.2"
   },

package/server/bootstrap.js

@@ -58,53 +58,37 @@ module.exports = async ({ strapi }) => {
       try {
         const publicPath = path.join(process.cwd(), 'public');
         const wellKnownPath = path.join(publicPath, '.well-known');
-        const filePath = path.join(wellKnownPath, 'apple-developer-merchantid-domain-association');
-        const filePathTxt = path.join(wellKnownPath, 'apple-developer-merchant-id-domain-association.txt');
+        const possiblePaths = [
+          path.join(wellKnownPath, 'apple-developer-merchantid-domain-association'),
+          path.join(wellKnownPath, 'apple-developer-merchantid-domain-association.txt'),
+          path.join(wellKnownPath, 'apple-developer-merchant-id-domain-association.txt'),
+        ];
 
         let fileContent = null;
         let filePathFound = null;
 
-        if (fs.existsSync(filePath)) {
-          filePathFound = filePath;
-          fileContent = fs.readFileSync(filePath, 'utf8');
-        }
-        else if (fs.existsSync(filePathTxt)) {
-          filePathFound = filePathTxt;
-          fileContent = fs.readFileSync(filePathTxt, 'utf8');
+        for (const filePath of possiblePaths) {
+          if (fs.existsSync(filePath)) {
+            filePathFound = filePath;
+            fileContent = fs.readFileSync(filePath, 'utf8');
+            break;
+          }
         }
 
         if (fileContent) {
           ctx.type = 'text/plain';
-          ctx.body = fileContent;
-          strapi.log.info(`[Apple Pay] Served well-known file from: ${filePathFound}`);
+          ctx.set('Content-Type', 'text/plain');
+          ctx.set('Cache-Control', 'public, max-age=31536000');
+          ctx.body = fileContent.trim();
         } else {
-          strapi.log.warn(`[Apple Pay] Well-known file not found. Tried: ${filePath} and ${filePathTxt}`);
           ctx.status = 404;
-          ctx.body = {
-            error: {
-              status: 404,
-              name: "NotFoundError",
-              message: "Apple Pay domain verification file not found",
-              details: {
-                expectedPaths: [
-                  filePath,
-                  filePathTxt
-                ]
-              }
-            }
-          };
+          ctx.type = 'text/plain';
+          ctx.body = 'File not found';
         }
       } catch (error) {
-        strapi.log.error("[Apple Pay] Serve well-known file error:", error);
         ctx.status = 500;
-        ctx.body = {
-          error: {
-            status: 500,
-            name: "InternalServerError",
-            message: error.message || "Failed to serve well-known file",
-            details: error.stack
-          }
-        };
+        ctx.type = 'text/plain';
+        ctx.body = 'Internal server error';
       }
     });
 
@@ -113,6 +97,6 @@ module.exports = async ({ strapi }) => {
       strapi.server.app.use(router.allowedMethods());
     }
   } catch (error) {
-    strapi.log.warn('Could not register 3DS callback routes:', error.message);
+    // Silent fail
   }
 };

package/server/controllers/payone.js

@@ -7,7 +7,12 @@ const getPayoneService = (strapi) => {
 };
 
 const handleError = (ctx, error) => {
-  ctx.strapi.log.error("Payone controller error:", error);
+  if (error.response || error.status >= 400) {
+    ctx.strapi.log.error("Payone controller error:", {
+      status: error.status || error.response?.status,
+      message: error.message
+    });
+  }
   ctx.throw(500, error);
 };
 
@@ -71,11 +76,9 @@ module.exports = ({ strapi }) => ({
   async authorization(ctx) {
     try {
       const params = ctx.request.body;
-      strapi.log.info("Payone authorization controller called with:", params);
       const result = await getPayoneService(strapi).authorization(params);
       ctx.body = { data: result };
     } catch (error) {
-      strapi.log.error("Payone authorization error:", error);
       handleError(ctx, error);
     }
   },
@@ -134,7 +137,6 @@ module.exports = ({ strapi }) => ({
       }
 
       const callbackData = isGetRequest ? ctx.query : ctx.request.body;
-      strapi.log.info(`3DS ${resultType} received (${ctx.request.method}):`, callbackData);
       const result = await getPayoneService(strapi).handle3DSCallback(callbackData, resultType);
 
       if (isGetRequest) {
@@ -153,31 +155,81 @@ module.exports = ({ strapi }) => ({
 
       ctx.body = { data: result };
     } catch (error) {
-      strapi.log.error("3DS callback error:", error);
       handleError(ctx, error);
     }
   },
 
   async validateApplePayMerchant(ctx) {
     try {
-      strapi.log.info("[Apple Pay] Request body:", JSON.stringify(ctx.request.body, null, 2));
+      const settings = await getPayoneService(strapi).getSettings();
+      const applePayConfig = settings?.applePayConfig || {};
 
       const params = ctx.request.body;
+
+      if (!params) {
+        throw new Error("Request body is missing");
+      }
+
+      // Ensure domain is set
+      if (!params.domain && !params.domainName) {
+        params.domain = ctx.request.hostname || ctx.request.host || 'localhost';
+        params.domainName = params.domain;
+      } else if (params.domain && !params.domainName) {
+        params.domainName = params.domain;
+      } else if (params.domainName && !params.domain) {
+        params.domain = params.domainName;
+      }
+
+      if (!params.displayName) {
+        params.displayName = settings?.merchantName || "Store";
+      }
+
+      if (!params.currency) {
+        params.currency = applePayConfig.currencyCode || "EUR";
+      }
+      if (!params.countryCode) {
+        params.countryCode = applePayConfig.countryCode || "DE";
+      }
+
       let result = await getPayoneService(strapi).validateApplePayMerchant(params);
-      strapi.log.info("[Apple Pay] Merchant validation result:", JSON.stringify(result, null, 2));
+
+      if (!result) {
+        throw new Error("Merchant validation returned null. Please check your Payone Apple Pay configuration.");
+      }
+
       ctx.body = { data: result };
     } catch (error) {
-      strapi.log.error("[Apple Pay] Controller error:", {
-        message: error.message,
-        stack: error.stack,
-        name: error.name
-      });
+      const errorStatus = error.status || (error.message?.includes('403') ? 403 : 500);
+
+      // Only log if it's a response error
+      if (error.response || errorStatus === 403 || errorStatus === 401 || errorStatus >= 500) {
+        strapi.log.error("[Apple Pay] Controller error:", {
+          status: errorStatus,
+          message: error.message
+        });
+      }
+
+      // Extract detailed error message if available
+      let errorMessage = error.message || "Apple Pay merchant validation failed";
+      let errorDetails = "Please check your Payone Apple Pay configuration in PMI (CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay). Ensure that Merchant ID (mid) is correctly configured and Apple Pay is enabled for your portal.";
+
+      // If it's a 403 error, provide more specific guidance
+      if (errorStatus === 403 || error.message?.includes('403')) {
+        errorDetails = "403 Forbidden: Authentication failed with Payone. " +
+          "Please check: 1) Your Payone credentials (aid, portalid, mid, key) in plugin settings, " +
+          "2) Mode is set to 'live' (Apple Pay only works in live mode), " +
+          "3) Your domain is registered with Payone Merchant Services, " +
+          "4) Merchant ID (mid) matches your merchantIdentifier in PMI, " +
+          "5) Apple Pay is enabled for your portal in PMI.";
+      }
 
-      ctx.status = error.status || 500;
+      ctx.status = errorStatus;
       ctx.body = {
         error: {
-          message: error.message || "Apple Pay merchant validation failed",
-          details: "Please check your Payone Apple Pay configuration in PMI (CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay)"
+          status: errorStatus,
+          name: error.name || "Error",
+          message: errorMessage,
+          details: errorDetails
         }
       };
     }