strapi-plugin-payone-provider 1.5.8 → 1.6.1

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

@@ -13,7 +13,10 @@ import { DEFAULT_PAYMENT_DATA } from "../constants/paymentConstants";
 const usePaymentActions = () => {
   const toggleNotification = useNotification();
 
+<<<<<<< HEAD
   // Load settings to get enable3DSecure value
+=======
+>>>>>>> feature/apple-pay
   const [settings, setSettings] = useState({ enable3DSecure: false });
 
   useEffect(() => {
@@ -24,12 +27,16 @@ const usePaymentActions = () => {
           setSettings(response.data);
         }
       } catch (error) {
+<<<<<<< HEAD
         // Silent fail
+=======
+>>>>>>> feature/apple-pay
       }
     };
     loadSettings();
   }, []);
 
+<<<<<<< HEAD
   // Payment form state
   const [paymentAmount, setPaymentAmount] = useState("1000");
 
@@ -37,6 +44,11 @@ const usePaymentActions = () => {
   // Sequence number starts from 1000 and increments based on timestamp
   const generateOrderReference = () => {
     // Use timestamp to generate unique sequence (1000 to 99999 range)
+=======
+  const [paymentAmount, setPaymentAmount] = useState("1000");
+
+  const generateOrderReference = () => {
+>>>>>>> feature/apple-pay
     const sequence = 1000 + Math.floor((Date.now() % 99000));
     return generateLagOrderNumber(sequence);
   };
@@ -52,13 +64,19 @@ const usePaymentActions = () => {
   const [googlePayToken, setGooglePayToken] = useState(null);
   const [applePayToken, setApplePayToken] = useState(null);
 
+<<<<<<< HEAD
   // Card details for 3DS testing
+=======
+>>>>>>> feature/apple-pay
   const [cardtype, setCardtype] = useState("");
   const [cardpan, setCardpan] = useState("");
   const [cardexpiredate, setCardexpiredate] = useState("");
   const [cardcvc2, setCardcvc2] = useState("");
 
+<<<<<<< HEAD
   // Payment processing state
+=======
+>>>>>>> feature/apple-pay
   const [isProcessingPayment, setIsProcessingPayment] = useState(false);
   const [paymentResult, setPaymentResult] = useState(null);
   const [paymentError, setPaymentError] = useState(null);
@@ -88,19 +106,29 @@ const usePaymentActions = () => {
       paymentMethod,
       amount: paymentAmount
     });
+<<<<<<< HEAD
     
+=======
+
+>>>>>>> feature/apple-pay
     setIsProcessingPayment(true);
     setPaymentError(null);
     setPaymentResult(null);
     try {
+<<<<<<< HEAD
       // Auto-generate reference if empty
+=======
+>>>>>>> feature/apple-pay
       const finalPreauthReference = preauthReference.trim() || generateOrderReference();
       if (!preauthReference.trim()) {
         setPreauthReference(finalPreauthReference);
       }
 
+<<<<<<< HEAD
       // Determine currency based on card type
       // American Express typically requires USD, other cards use EUR
+=======
+>>>>>>> feature/apple-pay
       const currency = (paymentMethod === "cc" && cardtype === "A") ? "USD" : "EUR";
 
       const baseParams = {
@@ -111,7 +139,10 @@ const usePaymentActions = () => {
         ...DEFAULT_PAYMENT_DATA
       };
 
+<<<<<<< HEAD
       // Add card details if credit card payment and 3DS enabled
+=======
+>>>>>>> feature/apple-pay
       if (paymentMethod === "cc" && settings.enable3DSecure !== false) {
         if (cardtype) baseParams.cardtype = cardtype;
         if (cardpan) baseParams.cardpan = cardpan;
@@ -125,7 +156,10 @@ const usePaymentActions = () => {
 
       if (needsRedirectUrls) {
         const baseUrl = window.location.origin;
+<<<<<<< HEAD
         // Detect current context (admin or content-ui) from pathname
+=======
+>>>>>>> feature/apple-pay
         const currentPath = window.location.pathname;
         const isContentUI = currentPath.includes('/content-ui') || currentPath.includes('/content-manager');
         const basePath = isContentUI ? '/content-ui' : '/admin';
@@ -149,6 +183,7 @@ const usePaymentActions = () => {
 
       const result = await payoneRequests.preauthorization(params);
       const responseData = result?.data || result;
+<<<<<<< HEAD
 
       // Log full response
       console.log("Preauthorization Response:", responseData);
@@ -164,15 +199,23 @@ const usePaymentActions = () => {
         Url: responseData.Url
       });
 
+=======
+>>>>>>> feature/apple-pay
       const status = (responseData.status || responseData.Status || "").toUpperCase();
       const errorCode = responseData.errorcode || responseData.errorCode || responseData.ErrorCode;
       const errorMessage = responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage;
 
+<<<<<<< HEAD
       // Check for 3DS required error (4219)
       const requires3DSErrorCodes = ["4219", 4219];
       const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
 
       // Check all possible redirect URL fields
+=======
+      const requires3DSErrorCodes = ["4219", 4219];
+      const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
+
+>>>>>>> feature/apple-pay
       const redirectUrl =
         responseData.redirectUrl ||
         responseData.redirecturl ||
@@ -182,7 +225,10 @@ const usePaymentActions = () => {
         responseData.Url ||
         null;
 
+<<<<<<< HEAD
       // If 3DS required but no redirect URL, show helpful message
+=======
+>>>>>>> feature/apple-pay
       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));
@@ -194,7 +240,10 @@ const usePaymentActions = () => {
         return;
       }
 
+<<<<<<< HEAD
       // Check for other errors (but not 3DS required)
+=======
+>>>>>>> feature/apple-pay
       if ((status === "ERROR" || status === "INVALID" || errorCode) && !is3DSRequiredError) {
         setPaymentError(
           errorMessage ||
@@ -217,6 +266,7 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
+<<<<<<< HEAD
       console.log("[Payment] Preauthorization result:", {
         status,
         hasError: !!errorCode,
@@ -227,6 +277,10 @@ const usePaymentActions = () => {
       if (status === "APPROVED") {
         handlePaymentSuccess("Preauthorization completed successfully");
         // Return success result for Apple Pay callback
+=======
+      if (status === "APPROVED") {
+        handlePaymentSuccess("Preauthorization completed successfully");
+>>>>>>> feature/apple-pay
         return { success: true, data: responseData };
       } else {
         const errorMsg = errorMessage || `Unexpected status: ${status}`;
@@ -234,13 +288,19 @@ const usePaymentActions = () => {
           { message: errorMsg },
           `Preauthorization completed with status: ${status}`
         );
+<<<<<<< HEAD
         // Return error result for Apple Pay callback
+=======
+>>>>>>> feature/apple-pay
         throw new Error(errorMsg);
       }
     } catch (error) {
       console.error("[Payment] Preauthorization error:", error);
       handlePaymentError(error, "Preauthorization failed");
+<<<<<<< HEAD
       // Re-throw error so Apple Pay callback knows it failed
+=======
+>>>>>>> feature/apple-pay
       throw error;
     } finally {
       setIsProcessingPayment(false);
@@ -253,14 +313,20 @@ const usePaymentActions = () => {
     setPaymentResult(null);
 
     try {
+<<<<<<< HEAD
       // Auto-generate reference if empty
+=======
+>>>>>>> feature/apple-pay
       const finalAuthReference = authReference.trim() || generateOrderReference();
       if (!authReference.trim()) {
         setAuthReference(finalAuthReference);
       }
 
+<<<<<<< HEAD
       // Determine currency based on card type
       // American Express typically requires USD, other cards use EUR
+=======
+>>>>>>> feature/apple-pay
       const currency = (paymentMethod === "cc" && cardtype === "A") ? "USD" : "EUR";
 
       const baseParams = {
@@ -271,7 +337,10 @@ const usePaymentActions = () => {
         ...DEFAULT_PAYMENT_DATA
       };
 
+<<<<<<< HEAD
       // Add card details if credit card payment and 3DS enabled
+=======
+>>>>>>> feature/apple-pay
       if (paymentMethod === "cc" && settings.enable3DSecure !== false) {
         if (cardtype) baseParams.cardtype = cardtype;
         if (cardpan) baseParams.cardpan = cardpan;
@@ -285,7 +354,10 @@ const usePaymentActions = () => {
 
       if (needsRedirectUrls) {
         const baseUrl = window.location.origin;
+<<<<<<< HEAD
         // Detect current context (admin or content-ui) from pathname
+=======
+>>>>>>> feature/apple-pay
         const currentPath = window.location.pathname;
         const isContentUI = currentPath.includes('/content-ui') || currentPath.includes('/content-manager');
         const basePath = isContentUI ? '/content-ui' : '/admin';
@@ -309,6 +381,7 @@ const usePaymentActions = () => {
 
       const result = await payoneRequests.authorization(params);
       const responseData = result?.data || result;
+<<<<<<< HEAD
 
       // Log full response
       console.log("Authorization Response:", responseData);
@@ -324,15 +397,23 @@ const usePaymentActions = () => {
         Url: responseData.Url
       });
 
+=======
+>>>>>>> feature/apple-pay
       const status = (responseData.status || responseData.Status || "").toUpperCase();
       const errorCode = responseData.errorcode || responseData.errorCode || responseData.ErrorCode;
       const errorMessage = responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage;
 
+<<<<<<< HEAD
       // Check for 3DS required error (4219)
       const requires3DSErrorCodes = ["4219", 4219];
       const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
 
       // Check all possible redirect URL fields
+=======
+      const requires3DSErrorCodes = ["4219", 4219];
+      const is3DSRequiredError = requires3DSErrorCodes.includes(errorCode);
+
+>>>>>>> feature/apple-pay
       const redirectUrl =
         responseData.redirectUrl ||
         responseData.redirecturl ||
@@ -342,7 +423,10 @@ const usePaymentActions = () => {
         responseData.Url ||
         null;
 
+<<<<<<< HEAD
       // If 3DS required but no redirect URL, show helpful message
+=======
+>>>>>>> feature/apple-pay
       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));
@@ -354,7 +438,10 @@ const usePaymentActions = () => {
         return;
       }
 
+<<<<<<< HEAD
       // Check for other errors (but not 3DS required)
+=======
+>>>>>>> feature/apple-pay
       if ((status === "ERROR" || status === "INVALID" || errorCode) && !is3DSRequiredError) {
         setPaymentError(
           errorMessage ||
@@ -377,6 +464,7 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
+<<<<<<< HEAD
       console.log("[Payment] Authorization result:", {
         status,
         hasError: !!errorCode,
@@ -384,6 +472,8 @@ const usePaymentActions = () => {
         errorMessage
       });
 
+=======
+>>>>>>> feature/apple-pay
       if (status === "APPROVED") {
         handlePaymentSuccess("Authorization completed successfully");
         // Return success result for Apple Pay callback
@@ -394,13 +484,19 @@ const usePaymentActions = () => {
           { message: errorMsg },
           `Authorization completed with status: ${status}`
         );
+<<<<<<< HEAD
         // Return error result for Apple Pay callback
+=======
+>>>>>>> feature/apple-pay
         throw new Error(errorMsg);
       }
     } catch (error) {
       console.error("[Payment] Authorization error:", error);
       handlePaymentError(error, "Authorization failed");
+<<<<<<< HEAD
       // Re-throw error so Apple Pay callback knows it failed
+=======
+>>>>>>> feature/apple-pay
       throw error;
     } finally {
       setIsProcessingPayment(false);

package/package.json

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

package/server/bootstrap.js

@@ -53,6 +53,11 @@ module.exports = async ({ strapi }) => {
   try {
     const Router = require('@koa/router');
     const router = new Router();
+<<<<<<< HEAD
+=======
+    const fs = require('fs');
+    const path = require('path');
+>>>>>>> feature/apple-pay
 
     routes.forEach(route => {
       router.get(route, async (ctx) => {
@@ -61,7 +66,67 @@ module.exports = async ({ strapi }) => {
       });
     });
 
+<<<<<<< HEAD
     // Add router to the server app
+=======
+    // Register route for Apple Pay .well-known file
+    router.get('/.well-known/apple-developer-merchantid-domain-association', async (ctx) => {
+      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');
+
+        let fileContent = null;
+        let filePathFound = null;
+
+        // Try main file first
+        if (fs.existsSync(filePath)) {
+          filePathFound = filePath;
+          fileContent = fs.readFileSync(filePath, 'utf8');
+        }
+        // Try alternative file name
+        else if (fs.existsSync(filePathTxt)) {
+          filePathFound = filePathTxt;
+          fileContent = fs.readFileSync(filePathTxt, 'utf8');
+        }
+
+        if (fileContent) {
+          ctx.type = 'text/plain';
+          ctx.body = fileContent;
+          strapi.log.info(`[Apple Pay] Served well-known file from: ${filePathFound}`);
+        } 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
+                ]
+              }
+            }
+          };
+        }
+      } 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
+          }
+        };
+      }
+    });
+
+>>>>>>> feature/apple-pay
     if (strapi.server.app && typeof strapi.server.app.use === 'function') {
       strapi.server.app.use(router.routes());
       strapi.server.app.use(router.allowedMethods());

package/server/controllers/payone.js

@@ -2,30 +2,15 @@
 
 const PLUGIN_NAME = "strapi-plugin-payone-provider";
 
-/**
- * Get Payone service
- * @param {Object} strapi - Strapi instance
- * @returns {Object} Payone service
- */
 const getPayoneService = (strapi) => {
   return strapi.plugin(PLUGIN_NAME).service("payone");
 };
 
-/**
- * Handle error response
- * @param {Object} ctx - Koa context
- * @param {Error} error - Error object
- */
 const handleError = (ctx, error) => {
   ctx.strapi.log.error("Payone controller error:", error);
   ctx.throw(500, error);
 };
 
-/**
- * Hide sensitive key in settings
- * @param {Object} settings - Settings object
- * @returns {Object} Settings with hidden key
- */
 const hideKey = (settings) => {
   if (settings && settings.key) {
     settings.key = "***HIDDEN***";
@@ -134,11 +119,6 @@ module.exports = ({ strapi }) => ({
     }
   },
 
-  /**
-   * Handle 3D Secure callback from Payone
-   * This endpoint receives the callback after customer completes 3DS authentication
-   * Works with both /admin/ and /content-ui/ paths
-   */
   async handle3DSCallback(ctx) {
     try {
       const isGetRequest = ctx.request.method === "GET";
@@ -180,33 +160,11 @@ module.exports = ({ strapi }) => ({
 
   async validateApplePayMerchant(ctx) {
     try {
-      strapi.log.info("[Apple Pay] Merchant validation request received");
       strapi.log.info("[Apple Pay] Request body:", JSON.stringify(ctx.request.body, null, 2));
-      strapi.log.info("[Apple Pay] User:", ctx.state.user ? {
-        id: ctx.state.user.id,
-        email: ctx.state.user.email,
-        roles: ctx.state.user.roles?.map(r => r.code)
-      } : "No user");
 
       const params = ctx.request.body;
-      const result = await getPayoneService(strapi).validateApplePayMerchant(params);
-
-      strapi.log.info("[Apple Pay] Merchant validation result:", {
-        hasResult: !!result,
-        hasMerchantIdentifier: !!result.merchantIdentifier,
-        merchantIdentifier: result.merchantIdentifier,
-        domainName: result.domainName,
-        displayName: result.displayName,
-        epochTimestamp: result.epochTimestamp,
-        expiresAt: result.expiresAt
-      });
-
-      // Validate result before sending
-      if (!result || !result.merchantIdentifier) {
-        strapi.log.error("[Apple Pay] Invalid merchant session returned - missing merchantIdentifier");
-        ctx.throw(500, "Apple Pay merchant validation failed: Invalid merchant session. Please check your Payone Apple Pay configuration in PMI.");
-      }
-
+      let result = await getPayoneService(strapi).validateApplePayMerchant(params);
+      strapi.log.info("[Apple Pay] Merchant validation result:", JSON.stringify(result, null, 2));
       ctx.body = { data: result };
     } catch (error) {
       strapi.log.error("[Apple Pay] Controller error:", {
@@ -214,11 +172,9 @@ module.exports = ({ strapi }) => ({
         stack: error.stack,
         name: error.name
       });
-      
-      // Return error response instead of empty object
-      // This will help frontend understand what went wrong
+
       ctx.status = error.status || 500;
-      ctx.body = { 
+      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)"

package/server/routes/index.js

@@ -161,7 +161,7 @@ module.exports = {
           policies: ["plugin::strapi-plugin-payone-provider.is-auth"],
           auth: false
         }
-      }
+      },
     ]
   }
 };