strapi-plugin-payone-provider 1.5.8 → 1.6.1

package/server/services/payone.js

@@ -6,9 +6,6 @@ const paymentService = require("./paymentService");
 const testConnectionService = require("./testConnectionService");
 const applePayService = require("./applePayService");
 
-/**
- * Main Payone service - aggregates all sub-services
- */
 module.exports = ({ strapi }) => ({
   // Settings
   async getSettings() {

package/server/services/settingsService.js

@@ -2,11 +2,6 @@
 
 const PLUGIN_NAME = "strapi-plugin-payone-provider";
 
-/**
- * Get plugin store instance
- * @param {Object} strapi - Strapi instance
- * @returns {Object} Plugin store
- */
 const getPluginStore = (strapi) => {
   return strapi.store({
     environment: "",
@@ -15,22 +10,11 @@ const getPluginStore = (strapi) => {
   });
 };
 
-/**
- * Get Payone settings
- * @param {Object} strapi - Strapi instance
- * @returns {Promise<Object>} Settings
- */
 const getSettings = async (strapi) => {
   const pluginStore = getPluginStore(strapi);
   return await pluginStore.get({ key: "settings" });
 };
 
-/**
- * Update Payone settings
- * @param {Object} strapi - Strapi instance
- * @param {Object} settings - Settings to update
- * @returns {Promise<Object>} Updated settings
- */
 const updateSettings = async (strapi, settings) => {
   const pluginStore = getPluginStore(strapi);
   await pluginStore.set({
@@ -40,11 +24,6 @@ const updateSettings = async (strapi, settings) => {
   return settings;
 };
 
-/**
- * Validate settings
- * @param {Object} settings - Settings to validate
- * @returns {boolean} True if valid
- */
 const validateSettings = (settings) => {
   return !!(settings && settings.aid && settings.portalid && settings.key);
 };

package/server/services/testConnectionService.js

@@ -7,11 +7,6 @@ const { getSettings, validateSettings } = require("./settingsService");
 
 const POST_GATEWAY_URL = "https://api.pay1.de/post-gateway/";
 
-/**
- * Test Payone connection
- * @param {Object} strapi - Strapi instance
- * @returns {Promise<Object>} Test result
- */
 const testConnection = async (strapi) => {
   try {
     const settings = await getSettings(strapi);
@@ -79,11 +74,7 @@ const testConnection = async (strapi) => {
       result.Error?.CustomerMessage ||
       "";
 
-    strapi.log.info("Payone test connection response:", { status, errorCode });
-
-    // Handle error status
     if (status === "ERROR" || status === "error") {
-      // Authentication errors
       if (["2006", "920", "921", "922", "401", "403"].includes(errorCode)) {
         return {
           success: false,
@@ -92,7 +83,6 @@ const testConnection = async (strapi) => {
         };
       }
 
-      // Check for invalid credentials in message
       const errorMessageStr = typeof errorMessage === "string" ? errorMessage : JSON.stringify(errorMessage);
       const errorMessageLower = (errorMessageStr || "").toLowerCase();
       const authErrorKeywords = [
@@ -118,7 +108,6 @@ const testConnection = async (strapi) => {
         };
       }
 
-      // Reference already exists (911) means credentials are working
       if (errorCode === "911") {
         return {
           success: true,
@@ -132,7 +121,6 @@ const testConnection = async (strapi) => {
         };
       }
 
-      // Other errors
       return {
         success: false,
         message: `Connection failed: ${customErrorMessage || errorMessageStr || "Unknown error"}`,
@@ -145,7 +133,6 @@ const testConnection = async (strapi) => {
       };
     }
 
-    // APPROVED status means connection is OK
     if (status === "APPROVED" || status === "approved") {
       return {
         success: true,
@@ -159,7 +146,6 @@ const testConnection = async (strapi) => {
       };
     }
 
-    // Unexpected response format
     return {
       success: false,
       message: "Unexpected response format from Payone API",

package/server/services/transactionService.js

@@ -1,5 +1,6 @@
 "use strict";
 
+<<<<<<< HEAD
 const { getPluginStore, PLUGIN_NAME } = require("./settingsService");
 
 /**
@@ -8,6 +9,10 @@ const { getPluginStore, PLUGIN_NAME } = require("./settingsService");
  * @param {Object} transactionData - Transaction data
  * @returns {Promise<void>}
  */
+=======
+const { getPluginStore } = require("./settingsService");
+
+>>>>>>> feature/apple-pay
 const logTransaction = async (strapi, transactionData) => {
   const pluginStore = getPluginStore(strapi);
   let transactionHistory =
@@ -41,7 +46,10 @@ const logTransaction = async (strapi, transactionData) => {
 
   transactionHistory.unshift(logEntry);
 
+<<<<<<< HEAD
   // Keep only last 1000 transactions
+=======
+>>>>>>> feature/apple-pay
   if (transactionHistory.length > 1000) {
     transactionHistory = transactionHistory.slice(0, 1000);
   }
@@ -54,18 +62,24 @@ const logTransaction = async (strapi, transactionData) => {
   strapi.log.info("Transaction logged:", logEntry);
 };
 
+<<<<<<< HEAD
 /**
  * Get transaction history with filters
  * @param {Object} strapi - Strapi instance
  * @param {Object} filters - Filter options
  * @returns {Promise<Array>} Filtered transaction history
  */
+=======
+>>>>>>> feature/apple-pay
 const getTransactionHistory = async (strapi, filters = {}) => {
   const pluginStore = getPluginStore(strapi);
   let transactionHistory =
     (await pluginStore.get({ key: "transactionHistory" })) || [];
 
+<<<<<<< HEAD
   // Apply filters
+=======
+>>>>>>> feature/apple-pay
   if (filters.status) {
     transactionHistory = transactionHistory.filter(
       (transaction) => transaction.status === filters.status

package/server/utils/paymentMethodParams.js

@@ -1,11 +1,6 @@
 "use strict";
 
-/**
- * Add payment method specific parameters
- * @param {Object} params - Request parameters
- * @param {Object} logger - Logger instance
- * @returns {Object} Updated parameters with payment method defaults
- */
+
 const addPaymentMethodParams = (params, logger) => {
   const updated = { ...params };
   const clearingtype = updated.clearingtype || "cc";
@@ -62,7 +57,6 @@ const addPaymentMethodParams = (params, logger) => {
     }
   };
 
-  // Handle special cases (gpp, apl) FIRST - set wallettype BEFORE changing clearingtype
   if (clearingtype === "gpp" || clearingtype === "apl") {
     if (clearingtype === "gpp") {
       updated.wallettype = "GGP";
@@ -74,34 +68,76 @@ const addPaymentMethodParams = (params, logger) => {
 
   const defaults = methodDefaults[clearingtype] || methodDefaults.cc;
 
-  // Apply defaults (but don't override wallettype if already set)
   Object.entries(defaults).forEach(([key, value]) => {
     if (key === "wallettype" && updated.wallettype) {
-      return; // Don't override wallettype if already set
+      return;
     }
     if (!updated[key]) {
       updated[key] = value;
     }
   });
-  
-  // Handle Apple Pay token if present
-  if (updated.applePayToken || updated["add_paydata[paymentmethod_token_data]"]) {
-    const token = updated.applePayToken || updated["add_paydata[paymentmethod_token_data]"];
-    const gatewayMerchantId = updated.mid || updated.portalid || '';
-    
-    updated["add_paydata[paymentmethod_token_data]"] = token;
-    updated["add_paydata[paymentmethod]"] = "APL";
-    updated["add_paydata[paymentmethod_type]"] = "APPLEPAY";
-    updated["add_paydata[gatewayid]"] = "payonegmbh";
-    if (gatewayMerchantId) {
-      updated["add_paydata[gateway_merchantid]"] = gatewayMerchantId;
+
+  if (updated.applePayToken) {
+    let tokenData;
+    try {
+      // Decode Base64 token
+      const tokenString = Buffer.from(updated.applePayToken, 'base64').toString('utf-8');
+      tokenData = JSON.parse(tokenString);
+    } catch (e) {
+      try {
+        // Try parsing as JSON string directly
+        tokenData = typeof updated.applePayToken === 'string'
+          ? JSON.parse(updated.applePayToken)
+          : updated.applePayToken;
+      } catch (e2) {
+        // If already an object, use as-is
+        tokenData = updated.applePayToken;
+      }
+    }
+
+    if (tokenData && typeof tokenData === 'object') {
+      const paymentData = tokenData.paymentData;
+
+      if (!paymentData) {
+        if (logger) {
+          logger.error("[Apple Pay] Invalid token structure: missing paymentData field");
+        }
+        delete updated.applePayToken;
+        return updated;
+      }
+
+      const header = paymentData.header || {};
+
+      // Payone required fields according to docs
+      updated["add_paydata[paymentdata_token_version]"] = paymentData.version || "EC_v1";
+      updated["add_paydata[paymentdata_token_data]"] = paymentData.data || "";
+      updated["add_paydata[paymentdata_token_signature]"] = paymentData.signature || "";
+      updated["add_paydata[paymentdata_token_ephemeral_publickey]"] = header.ephemeralPublicKey || "";
+      updated["add_paydata[paymentdata_token_publickey_hash]"] = header.publicKeyHash || "";
+
+      // Transaction ID is optional according to Payone docs
+      if (paymentData.transactionId || header.transactionId) {
+        updated["add_paydata[paymentdata_token_transaction_id]"] = paymentData.transactionId || header.transactionId || "";
+      }
+
+      if (!updated["add_paydata[paymentdata_token_data]"] ||
+        !updated["add_paydata[paymentdata_token_signature]"] ||
+        !updated["add_paydata[paymentdata_token_ephemeral_publickey]"] ||
+        !updated["add_paydata[paymentdata_token_publickey_hash]"]) {
+        if (logger) {
+          logger.error("[Apple Pay] Missing required token fields:", {
+            hasData: !!updated["add_paydata[paymentdata_token_data]"],
+            hasSignature: !!updated["add_paydata[paymentdata_token_signature]"],
+            hasEphemeralPublicKey: !!updated["add_paydata[paymentdata_token_ephemeral_publickey]"],
+            hasPublicKeyHash: !!updated["add_paydata[paymentdata_token_publickey_hash]"]
+          });
+        }
+      }
     }
-    
-    // Remove applePayToken from params as it's now in add_paydata
+
     delete updated.applePayToken;
   }
 
-  // Ensure wallettype is set for wallet payments
   if (updated.clearingtype === "wlt" && !updated.wallettype) {
     if (clearingtype === "gpp" || updated.paymentMethod === "gpp" || (updated["add_paydata[paymentmethod]"] === "GGP")) {
       updated.wallettype = "GGP";
@@ -111,14 +147,11 @@ const addPaymentMethodParams = (params, logger) => {
       updated.wallettype = "PPE";
     }
   }
-  
-  // Remove cardtype if clearingtype is wallet payment
   if (updated.clearingtype === "wlt" && updated.cardtype) {
     delete updated.cardtype;
   }
 
 
-  // Common defaults
   const commonDefaults = {
     salutation: "Herr",
     gender: "m",

package/server/utils/requestBuilder.js

@@ -3,13 +3,6 @@
 const crypto = require("crypto");
 const { normalizeCustomerId } = require("./normalize");
 
-/**
- * Build client request parameters for Payone API
- * @param {Object} settings - Payone settings
- * @param {Object} params - Request parameters
- * @param {Object|null} logger - Logger instance
- * @returns {Object} Built request parameters
- */
 const buildClientRequestParams = (settings, params, logger = null) => {
   const requestParams = {
     request: params.request,
@@ -21,29 +14,23 @@ const buildClientRequestParams = (settings, params, logger = null) => {
     ...params
   };
 
-  // Generate MD5 hash key
   requestParams.key = crypto
     .createHash("md5")
     .update(settings.portalKey || settings.key)
     .digest("hex");
 
-  // Normalize customer ID
   requestParams.customerid = normalizeCustomerId(
     requestParams.customerid,
     logger
   );
 
-  // Add 3D Secure parameters if enabled and for credit card payments
   const isCreditCard = requestParams.clearingtype === "cc";
-  // Enable 3DS if setting is true or not explicitly false (default to enabled if not set)
   const enable3DSecure = settings.enable3DSecure !== false;
 
   if (isCreditCard && enable3DSecure && (params.request === "preauthorization" || params.request === "authorization")) {
     requestParams["3dsecure"] = "yes";
     requestParams.ecommercemode = params.ecommercemode || "internet";
 
-    // Ensure redirect URLs are always provided for 3DS
-    // These are required for 3DS authentication flow
     if (!requestParams.successurl) {
       requestParams.successurl = params.successurl || "https://www.example.com/success";
     }
@@ -54,7 +41,6 @@ const buildClientRequestParams = (settings, params, logger = null) => {
       requestParams.backurl = params.backurl || "https://www.example.com/back";
     }
 
-    // Log redirect URLs for debugging
     if (logger) {
       logger.info("3DS Redirect URLs:", {
         successurl: requestParams.successurl,
@@ -66,7 +52,6 @@ const buildClientRequestParams = (settings, params, logger = null) => {
     requestParams["3dsecure"] = "no";
   }
 
-  // Set default values
   const defaults = {
     salutation: "Herr",
     gender: "m",
@@ -82,12 +67,10 @@ const buildClientRequestParams = (settings, params, logger = null) => {
     }
   });
 
-  // Remove cardtype if clearingtype is wallet payment
   if (requestParams.clearingtype === "wlt" && requestParams.cardtype) {
     delete requestParams.cardtype;
   }
 
-  // Ensure wallettype is set for wallet payments
   if (requestParams.clearingtype === "wlt" && !requestParams.wallettype) {
     if (requestParams["add_paydata[paymentmethod_token_data]"]) {
       requestParams.wallettype = "GGP";
@@ -99,11 +82,6 @@ const buildClientRequestParams = (settings, params, logger = null) => {
   return requestParams;
 };
 
-/**
- * Convert request parameters to form data
- * @param {Object} requestParams - Request parameters
- * @returns {URLSearchParams} Form data
- */
 const toFormData = (requestParams) => {
   const formData = new URLSearchParams();
   for (const [key, value] of Object.entries(requestParams)) {