strapi-plugin-payone-provider 1.5.8-beta.1 → 1.6.0

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "strapi-plugin-payone-provider",
-  "version": "1.5.8-beta.1",
-  "description": "Strapi plugin for Payone payment gateway integration",
-  "license": "MIT",
-  "maintainers": [
-    {
-      "name": "NewProWeb Community",
-      "email": "abror.abdullaev@newproweb.com"
-    }
-  ],
-  "dependencies": {
-    "axios": "^1.6.2",
-    "prop-types": "^15.7.2"
-  },
-  "devDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-router-dom": "^5.3.4",
-    "styled-components": "^5.3.6"
-  },
-  "peerDependencies": {
-    "@strapi/strapi": "^4.0",
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0",
-    "react-router-dom": "^5.2.0",
-    "styled-components": "^5.2.1"
-  },
-  "engines": {
-    "node": ">=18.0.0",
-    "npm": ">=6.0.0"
-  },
-  "authors": [
-    {
-      "name": "NewProWeb <Aliev Davlatbek>",
-      "email": "mamurjonov.davlatbek@newproweb.com"
-    },
-    {
-      "name": "Akromjon Rahimjonov",
-      "email": "akromjon.rahimjonov@newproweb.com"
-    }
-  ],
-  "strapi": {
-    "name": "strapi-plugin-payone-provider",
-    "description": "Integrates Strapi Payone payment gateway with Strapi",
-    "kind": "plugin",
-    "displayName": "Strapi Payone Provider"
-  }
-}
+{
+  "name": "strapi-plugin-payone-provider",
+  "version": "1.6.0",
+  "description": "Strapi plugin for Payone payment gateway integration",
+  "license": "MIT",
+  "maintainers": [
+    {
+      "name": "NewProWeb Community",
+      "email": "abror.abdullaev@newproweb.com"
+    }
+  ],
+  "dependencies": {
+    "axios": "^1.6.3",
+    "prop-types": "^15.7.2"
+  },
+  "devDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^5.3.4",
+    "styled-components": "^5.3.6"
+  },
+  "peerDependencies": {
+    "@strapi/strapi": "^4.0",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
+    "react-router-dom": "^5.2.0",
+    "styled-components": "^5.2.1"
+  },
+  "engines": {
+    "node": ">=18.0.0",
+    "npm": ">=6.0.0"
+  },
+  "authors": [
+    {
+      "name": "NewProWeb <Aliev Davlatbek>",
+      "email": "mamurjonov.davlatbek@newproweb.com"
+    },
+    {
+      "name": "Akromjon Rahimjonov",
+      "email": "akromjon.rahimjonov@newproweb.com"
+    }
+  ],
+  "strapi": {
+    "name": "strapi-plugin-payone-provider",
+    "description": "Integrates Strapi Payone payment gateway with Strapi",
+    "kind": "plugin",
+    "displayName": "Strapi Payone Provider"
+  }
+}

package/server/bootstrap.js

@@ -53,6 +53,8 @@ module.exports = async ({ strapi }) => {
   try {
     const Router = require('@koa/router');
     const router = new Router();
+    const fs = require('fs');
+    const path = require('path');
 
     routes.forEach(route => {
       router.get(route, async (ctx) => {
@@ -61,7 +63,63 @@ module.exports = async ({ strapi }) => {
       });
     });
 
-    // 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
+          }
+        };
+      }
+    });
+
     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,17 @@
 
 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 +121,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,62 +162,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;
-      let result;
-      try {
-        result = await getPayoneService(strapi).validateApplePayMerchant(params);
-      } catch (serviceError) {
-        // Service threw an error - re-throw it so it's caught by the outer catch block
-        strapi.log.error("[Apple Pay] Service threw error:", {
-          message: serviceError.message,
-          stack: serviceError.stack
-        });
-        throw serviceError;
-      }
-
-      strapi.log.info("[Apple Pay] Merchant validation result:", {
-        hasResult: !!result,
-        resultType: typeof result,
-        resultIsObject: result instanceof Object,
-        resultKeys: result ? Object.keys(result) : [],
-        resultKeysLength: result ? Object.keys(result).length : 0,
-        hasMerchantIdentifier: !!result?.merchantIdentifier,
-        hasMerchantSessionIdentifier: !!result?.merchantSessionIdentifier,
-        merchantIdentifier: result?.merchantIdentifier,
-        domainName: result?.domainName,
-        displayName: result?.displayName,
-        epochTimestamp: result?.epochTimestamp,
-        expiresAt: result?.expiresAt,
-        fullResult: JSON.stringify(result)
-      });
-
-      // Validate result before sending
-      // Check if result is null, undefined, empty object, or missing merchantIdentifier
-      if (!result || 
-          (typeof result === 'object' && Object.keys(result).length === 0) ||
-          (!result.merchantIdentifier && !result.merchantSessionIdentifier)) {
-        strapi.log.error("[Apple Pay] CRITICAL: Invalid or empty merchant session returned!");
-        strapi.log.error("[Apple Pay] Result details:", {
-          hasResult: !!result,
-          resultType: typeof result,
-          resultIsObject: result instanceof Object,
-          resultKeys: result ? Object.keys(result) : [],
-          resultKeysLength: result ? Object.keys(result).length : 0,
-          hasMerchantIdentifier: !!result?.merchantIdentifier,
-          hasMerchantSessionIdentifier: !!result?.merchantSessionIdentifier,
-          resultStringified: JSON.stringify(result)
-        });
-        ctx.throw(500, "Apple Pay merchant validation failed: Invalid or empty merchant session received from Payone. Please check your Payone Apple Pay configuration in PMI (CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay). The merchant session must come from Payone after successful Apple Pay onboarding. Check server logs for Payone response details.");
-      }
-
+      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:", {
@@ -243,11 +174,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
         }
-      }
+      },
     ]
   }
 };