strapi-plugin-payone-provider 1.4.0 → 1.4.2

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

@@ -5,7 +5,8 @@ import {
   getPreauthorizationParams,
   getAuthorizationParams,
   getCaptureParams,
-  getRefundParams
+  getRefundParams,
+  generateLagOrderNumber
 } from "../utils/paymentUtils";
 import { DEFAULT_PAYMENT_DATA } from "../constants/paymentConstants";
 
@@ -32,15 +33,16 @@ const usePaymentActions = () => {
   // Payment form state
   const [paymentAmount, setPaymentAmount] = useState("1000");
 
-  // Generate reference automatically
-  const generateReference = (prefix = "REF") => {
-    const timestamp = Date.now().toString(36).toUpperCase();
-    const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-    return `${prefix}-${timestamp}${random}`.slice(0, 20);
+  // Generate order reference using generateLagOrderNumber
+  // Sequence number starts from 1000 and increments based on timestamp
+  const generateOrderReference = () => {
+    // Use timestamp to generate unique sequence (1000 to 99999 range)
+    const sequence = 1000 + Math.floor((Date.now() % 99000));
+    return generateLagOrderNumber(sequence);
   };
 
-  const [preauthReference, setPreauthReference] = useState(generateReference("PRE"));
-  const [authReference, setAuthReference] = useState(generateReference("AUTH"));
+  const [preauthReference, setPreauthReference] = useState(generateOrderReference());
+  const [authReference, setAuthReference] = useState(generateOrderReference());
   const [captureTxid, setCaptureTxid] = useState("");
   const [refundTxid, setRefundTxid] = useState("");
   const [refundSequenceNumber, setRefundSequenceNumber] = useState("2");
@@ -85,7 +87,7 @@ const usePaymentActions = () => {
     setPaymentResult(null);
     try {
       // Auto-generate reference if empty
-      const finalPreauthReference = preauthReference.trim() || generateReference("PRE");
+      const finalPreauthReference = preauthReference.trim() || generateOrderReference();
       if (!preauthReference.trim()) {
         setPreauthReference(finalPreauthReference);
       }
@@ -116,9 +118,15 @@ const usePaymentActions = () => {
 
       if (needsRedirectUrls) {
         const baseUrl = window.location.origin;
-        baseParams.successurl = `${baseUrl}/admin/plugins/strapi-plugin-payone-provider/payment/success`;
-        baseParams.errorurl = `${baseUrl}/admin/plugins/strapi-plugin-payone-provider/payment/error`;
-        baseParams.backurl = `${baseUrl}/admin/plugins/strapi-plugin-payone-provider/payment/back`;
+        // Detect current context (admin or content-ui) from pathname
+        const currentPath = window.location.pathname;
+        const isContentUI = currentPath.includes('/content-ui') || currentPath.includes('/content-manager');
+        const basePath = isContentUI ? '/content-ui' : '/admin';
+        const pluginPath = '/plugins/strapi-plugin-payone-provider/payment';
+
+        baseParams.successurl = `${baseUrl}${basePath}${pluginPath}/success`;
+        baseParams.errorurl = `${baseUrl}${basePath}${pluginPath}/error`;
+        baseParams.backurl = `${baseUrl}${basePath}${pluginPath}/back`;
       }
 
       const tokenToUse = tokenParam || googlePayToken;
@@ -221,7 +229,7 @@ const usePaymentActions = () => {
 
     try {
       // Auto-generate reference if empty
-      const finalAuthReference = authReference.trim() || generateReference("AUTH");
+      const finalAuthReference = authReference.trim() || generateOrderReference();
       if (!authReference.trim()) {
         setAuthReference(finalAuthReference);
       }
@@ -252,9 +260,15 @@ const usePaymentActions = () => {
 
       if (needsRedirectUrls) {
         const baseUrl = window.location.origin;
-        baseParams.successurl = `${baseUrl}/admin/plugins/strapi-plugin-payone-provider/payment/success`;
-        baseParams.errorurl = `${baseUrl}/admin/plugins/strapi-plugin-payone-provider/payment/error`;
-        baseParams.backurl = `${baseUrl}/admin/plugins/strapi-plugin-payone-provider/payment/back`;
+        // Detect current context (admin or content-ui) from pathname
+        const currentPath = window.location.pathname;
+        const isContentUI = currentPath.includes('/content-ui') || currentPath.includes('/content-manager');
+        const basePath = isContentUI ? '/content-ui' : '/admin';
+        const pluginPath = '/plugins/strapi-plugin-payone-provider/payment';
+
+        baseParams.successurl = `${baseUrl}${basePath}${pluginPath}/success`;
+        baseParams.errorurl = `${baseUrl}${basePath}${pluginPath}/error`;
+        baseParams.backurl = `${baseUrl}${basePath}${pluginPath}/back`;
       }
 
       const tokenToUse = tokenParam || googlePayToken;

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

@@ -17,6 +17,21 @@
  * - SEPA Direct Debit (elv)
  */
 
+/**
+ * Generate order reference number
+ * @param {number} sequence - Sequence number (default: 1000)
+ * @returns {string} Generated order reference (format: ORD-XXXXX-XXXX)
+ */
+export function generateLagOrderNumber(sequence = 1000) {
+  const paddedSequence = sequence.toString().padStart(5, '0');
+  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  let randomPart = '';
+  for (let i = 0; i < 4; i++) {
+    randomPart += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+  return `ORD-${paddedSequence}-${randomPart}`;
+}
+
 /**
  * Get base parameters for all payment methods
  * Based on Payone v1 API Documentation

package/package.json

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

package/server/bootstrap.js

@@ -23,4 +23,46 @@ module.exports = async ({ strapi }) => {
       }
     });
   }
+
+  // Register custom routes for 3DS redirects at root level
+  // These routes handle redirects from Payone after 3DS authentication
+  // They work with both /admin/ and /content-ui/ paths
+  const pluginName = "strapi-plugin-payone-provider";
+
+  // Get the controller
+  const getController = () => {
+    return strapi.plugin(pluginName).controller("payone");
+  };
+
+  // All routes use the same handler - it detects success/error/back from URL path
+  // Routes match the plugin's internal payment callback URLs
+  const routes = [
+    "/admin/plugins/strapi-plugin-payone-provider/payment/success",
+    "/admin/plugins/strapi-plugin-payone-provider/payment/error",
+    "/admin/plugins/strapi-plugin-payone-provider/payment/back",
+    "/content-ui/plugins/strapi-plugin-payone-provider/payment/success",
+    "/content-ui/plugins/strapi-plugin-payone-provider/payment/error",
+    "/content-ui/plugins/strapi-plugin-payone-provider/payment/back"
+  ];
+
+  // Register routes using Koa router
+  try {
+    const Router = require('@koa/router');
+    const router = new Router();
+
+    routes.forEach(route => {
+      router.get(route, async (ctx) => {
+        const controller = getController();
+        return await controller.handle3DSCallback(ctx);
+      });
+    });
+
+    // Add router to the server app
+    if (strapi.server.app && typeof strapi.server.app.use === 'function') {
+      strapi.server.app.use(router.routes());
+      strapi.server.app.use(router.allowedMethods());
+    }
+  } catch (error) {
+    strapi.log.warn('Could not register 3DS callback routes:', error.message);
+  }
 };

package/server/controllers/payone.js

@@ -137,13 +137,39 @@ 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 {
-      strapi.log.info("3DS callback received:", ctx.request.body);
+      const isGetRequest = ctx.request.method === "GET";
+      const currentPath = ctx.request.url;
+
+      let resultType = "callback";
+      if (currentPath.includes("/success")) {
+        resultType = "success";
+      } else if (currentPath.includes("/error")) {
+        resultType = "error";
+      } else if (currentPath.includes("/back")) {
+        resultType = "cancelled";
+      }
+
+      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) {
+        const isContentUI = currentPath.includes('/content-ui');
+        const basePath = isContentUI ? '/content-ui' : '/admin';
+        const pluginPath = '/plugins/strapi-plugin-payone-provider';
 
-      const callbackData = ctx.request.body;
-      const result = await getPayoneService(strapi).handle3DSCallback(callbackData);
+        const queryParams = new URLSearchParams();
+        queryParams.set('3ds', resultType);
+        if (result.txid) queryParams.set('txid', result.txid);
+        if (result.status) queryParams.set('status', result.status);
+
+        const redirectUrl = `${basePath}${pluginPath}?${queryParams.toString()}`;
+        return ctx.redirect(redirectUrl);
+      }
 
       ctx.body = { data: result };
     } catch (error) {

package/server/services/paymentService.js

@@ -1,7 +1,6 @@
 "use strict";
 
 const axios = require("axios");
-const { normalizeReference } = require("../utils/normalize");
 const { buildClientRequestParams, toFormData } = require("../utils/requestBuilder");
 const { addPaymentMethodParams } = require("../utils/paymentMethodParams");
 const { parseResponse, extractTxId, requires3DSRedirect, get3DSRedirectUrl } = require("../utils/responseParser");
@@ -24,12 +23,7 @@ const sendRequest = async (strapi, params) => {
       throw new Error("Payone settings not configured");
     }
 
-    const reqType = params.request;
-    if (["authorization", "preauthorization", "refund"].includes(reqType)) {
-      const prefix =
-        reqType === "refund" ? "REF" : reqType === "preauthorization" ? "PRE" : "AUTH";
-      params.reference = normalizeReference(params.reference, prefix);
-    }
+    // Reference is saved as-is without normalization
 
     const requestParams = buildClientRequestParams(settings, params, strapi.log);
     const formData = toFormData(requestParams);
@@ -219,36 +213,48 @@ const refund = async (strapi, params) => {
 /**
  * Handle 3D Secure callback from Payone
  * This processes the callback after customer completes 3DS authentication
+ * Note: Payone's redirect callback typically doesn't include transaction details -
+ * the URL path (success/error/back) indicates the result.
  * @param {Object} strapi - Strapi instance
- * @param {Object} callbackData - Callback data from Payone
+ * @param {Object} callbackData - Callback data from Payone (may be empty or minimal)
+ * @param {string} resultType - Result type from URL path: 'success', 'error', 'cancelled', or 'callback'
  * @returns {Promise<Object>} Processed callback result
  */
-const handle3DSCallback = async (strapi, callbackData) => {
+const handle3DSCallback = async (strapi, callbackData, resultType = 'callback') => {
   try {
-    const parsedData = parseResponse(callbackData, strapi.log);
+    // Parse any data that Payone might have sent
+    const parsedData = callbackData && Object.keys(callbackData).length > 0
+      ? parseResponse(callbackData, strapi.log)
+      : {};
 
-    // Extract transaction information
+    // Extract transaction information if available
     const txid = extractTxId(parsedData);
-    const status = parsedData.status || parsedData.Status || "unknown";
     const reference = parsedData.reference || parsedData.Reference || null;
 
-    // Log the callback transaction
-    await logTransaction(strapi, {
-      txid: txid || null,
-      reference: reference || null,
-      status: status,
-      request_type: "3ds_callback",
-      amount: parsedData.amount || null,
-      currency: parsedData.currency || "EUR",
-      raw_request: callbackData,
-      raw_response: parsedData,
-      error_code: parsedData.Error?.ErrorCode || null,
-      error_message: parsedData.Error?.ErrorMessage || null,
-      customer_message: parsedData.Error?.CustomerMessage || null
+    // Determine status from resultType (URL path) since Payone callback may not include status
+    let status;
+    if (resultType === 'success') {
+      status = 'APPROVED';
+    } else if (resultType === 'error') {
+      status = 'ERROR';
+    } else if (resultType === 'cancelled') {
+      status = 'CANCELLED';
+    } else {
+      // Fallback to parsed data if available
+      status = parsedData.status || parsedData.Status || 'PENDING';
+    }
+
+    // Log for debugging purposes only (not saved to transaction history)
+    strapi.log.info("3DS callback processed:", {
+      resultType,
+      status,
+      txid,
+      reference,
+      callbackData
     });
 
     return {
-      success: status.toUpperCase() === "APPROVED" || status.toUpperCase() === "REDIRECT",
+      success: resultType === 'success',
       status: status,
       txid: txid,
       reference: reference,

package/server/services/payone.js

@@ -50,7 +50,7 @@ module.exports = ({ strapi }) => ({
   },
 
   // 3D Secure callback handler
-  async handle3DSCallback(callbackData) {
-    return await paymentService.handle3DSCallback(strapi, callbackData);
+  async handle3DSCallback(callbackData, resultType) {
+    return await paymentService.handle3DSCallback(strapi, callbackData, resultType);
   }
 });