strapi-plugin-payone-provider 1.6.1 → 1.6.3

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

@@ -13,10 +13,6 @@ 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(() => {
@@ -27,28 +23,14 @@ const usePaymentActions = () => {
           setSettings(response.data);
         }
       } catch (error) {
-<<<<<<< HEAD
-        // Silent fail
-=======
->>>>>>> feature/apple-pay
       }
     };
     loadSettings();
   }, []);
 
-<<<<<<< HEAD
-  // Payment form state
   const [paymentAmount, setPaymentAmount] = useState("1000");
 
-  // 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 [paymentAmount, setPaymentAmount] = useState("1000");
-
-  const generateOrderReference = () => {
->>>>>>> feature/apple-pay
     const sequence = 1000 + Math.floor((Date.now() % 99000));
     return generateLagOrderNumber(sequence);
   };
@@ -64,19 +46,11 @@ 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);
@@ -106,29 +80,15 @@ 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 = {
@@ -139,10 +99,6 @@ 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;
@@ -156,10 +112,6 @@ 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';
@@ -183,39 +135,13 @@ const usePaymentActions = () => {
 
       const result = await payoneRequests.preauthorization(params);
       const responseData = result?.data || result;
-<<<<<<< HEAD
-
-      // Log full response
-      console.log("Preauthorization Response:", responseData);
-      console.log("Response Status:", responseData.status || responseData.Status);
-      console.log("Response Error Code:", responseData.errorcode || responseData.errorCode || responseData.ErrorCode);
-      console.log("Response Error Message:", responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage);
-      console.log("All redirect URL fields:", {
-        redirectUrl: responseData.redirectUrl,
-        redirecturl: responseData.redirecturl,
-        RedirectUrl: responseData.RedirectUrl,
-        redirect_url: responseData.redirect_url,
-        url: responseData.url,
-        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 ||
@@ -225,10 +151,6 @@ 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));
@@ -240,10 +162,6 @@ const usePaymentActions = () => {
         return;
       }
 
-<<<<<<< HEAD
-      // Check for other errors (but not 3DS required)
-=======
->>>>>>> feature/apple-pay
       if ((status === "ERROR" || status === "INVALID" || errorCode) && !is3DSRequiredError) {
         setPaymentError(
           errorMessage ||
@@ -266,21 +184,8 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
-<<<<<<< HEAD
-      console.log("[Payment] Preauthorization result:", {
-        status,
-        hasError: !!errorCode,
-        errorCode,
-        errorMessage
-      });
-
       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}`;
@@ -288,19 +193,11 @@ 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);
@@ -313,20 +210,11 @@ 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 = {
@@ -337,10 +225,6 @@ 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;
@@ -354,10 +238,6 @@ 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';
@@ -381,39 +261,13 @@ const usePaymentActions = () => {
 
       const result = await payoneRequests.authorization(params);
       const responseData = result?.data || result;
-<<<<<<< HEAD
-
-      // Log full response
-      console.log("Authorization Response:", responseData);
-      console.log("Response Status:", responseData.status || responseData.Status);
-      console.log("Response Error Code:", responseData.errorcode || responseData.errorCode || responseData.ErrorCode);
-      console.log("Response Error Message:", responseData.errormessage || responseData.errorMessage || responseData.ErrorMessage);
-      console.log("All redirect URL fields:", {
-        redirectUrl: responseData.redirectUrl,
-        redirecturl: responseData.redirecturl,
-        RedirectUrl: responseData.RedirectUrl,
-        redirect_url: responseData.redirect_url,
-        url: responseData.url,
-        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 ||
@@ -423,10 +277,6 @@ 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));
@@ -438,10 +288,6 @@ const usePaymentActions = () => {
         return;
       }
 
-<<<<<<< HEAD
-      // Check for other errors (but not 3DS required)
-=======
->>>>>>> feature/apple-pay
       if ((status === "ERROR" || status === "INVALID" || errorCode) && !is3DSRequiredError) {
         setPaymentError(
           errorMessage ||
@@ -464,16 +310,6 @@ const usePaymentActions = () => {
 
       setPaymentResult(responseData);
 
-<<<<<<< HEAD
-      console.log("[Payment] Authorization result:", {
-        status,
-        hasError: !!errorCode,
-        errorCode,
-        errorMessage
-      });
-
-=======
->>>>>>> feature/apple-pay
       if (status === "APPROVED") {
         handlePaymentSuccess("Authorization completed successfully");
         // Return success result for Apple Pay callback
@@ -484,19 +320,11 @@ 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/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

@@ -368,8 +368,8 @@ export const getPaymentMethodDisplayName = (paymentMethod) => {
 };
 
 
-export const getPaymentMethodOptions = () => {
-  return [
+export const getPaymentMethodOptions = (isLiveMode = false) => {
+  return isLiveMode ? [{ value: "apl", label: "Apple Pay" }] : [
     { value: "cc", label: "Credit Card (Visa, Mastercard)" },
     { value: "wlt", label: "PayPal" },
     { value: "gpp", label: "Google Pay" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-payone-provider",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "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

@@ -1,14 +1,12 @@
 "use strict";
 
 module.exports = async ({ strapi }) => {
-  // Initialize plugin settings store
   const pluginStore = strapi.store({
     environment: "",
     type: "plugin",
     name: "strapi-plugin-payone-provider"
   });
 
-  // Initialize default settings if not already set
   const settings = await pluginStore.get({ key: "settings" });
   if (!settings) {
     await pluginStore.set({
@@ -28,18 +26,12 @@ 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",
@@ -49,15 +41,11 @@ module.exports = async ({ strapi }) => {
     "/content-ui/plugins/strapi-plugin-payone-provider/payment/back"
   ];
 
-  // Register routes using Koa router
   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) => {
@@ -66,10 +54,6 @@ 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');
@@ -80,12 +64,10 @@ module.exports = async ({ strapi }) => {
         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');
@@ -126,7 +108,6 @@ module.exports = async ({ strapi }) => {
       }
     });
 
->>>>>>> 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/services/transactionService.js

@@ -1,18 +1,7 @@
 "use strict";
 
-<<<<<<< HEAD
-const { getPluginStore, PLUGIN_NAME } = require("./settingsService");
-
-/**
- * Log transaction to history
- * @param {Object} strapi - Strapi instance
- * @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 =
@@ -46,10 +35,6 @@ 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);
   }
@@ -62,24 +47,11 @@ 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/admin/src/components/Initializer/index.js

@@ -1,16 +0,0 @@
-import { useEffect, useRef } from "react";
-import pluginId from "../../pluginId";
-
-const Initializer = ({ setPlugin }) => {
-  const ref = useRef(setPlugin);
-
-  useEffect(() => {
-    if (ref.current) {
-      ref.current(pluginId);
-    }
-  }, []);
-
-  return null;
-};
-
-export default Initializer;

package/admin/src/components/PluginIcon/index.js

@@ -1,6 +0,0 @@
-import React from "react";
-import { Puzzle } from "@strapi/icons";
-
-const PluginIcon = () => <Puzzle />;
-
-export default PluginIcon;

package/admin/src/pages/App/components/AppHeader.js

@@ -1,55 +0,0 @@
-import React from "react";
-import { HeaderLayout, Box, Typography, Button } from "@strapi/design-system";
-import { Check, ArrowLeft } from "@strapi/icons";
-import { useHistory, useLocation } from "react-router-dom";
-import pluginId from "../../../pluginId";
-
-const AppHeader = ({ activeTab, isSaving, onSave }) => {
-  const history = useHistory();
-  const location = useLocation();
-  const isApplePayConfigPage = location.pathname.includes('/apple-pay-config');
-
-  return (
-    <HeaderLayout
-      title={
-        <Box>
-          <Typography variant="alpha" as="h1" fontWeight="bold" className="payment-title">
-            {isApplePayConfigPage ? "Apple Pay Configuration" : "Payone Provider"}
-          </Typography>
-          <Typography variant="pi" marginTop={2} className="payment-subtitle">
-            {isApplePayConfigPage 
-              ? "Configure Apple Pay settings for your payment gateway"
-              : "Configure your Payone integration and manage payment transactions"
-            }
-          </Typography>
-        </Box>
-      }
-      primaryAction={
-        isApplePayConfigPage ? (
-          <Button
-            onClick={() => history.push(`/plugins/${pluginId}`)}
-            startIcon={<ArrowLeft />}
-            size="L"
-            variant="secondary"
-          >
-            Back to Main
-          </Button>
-        ) : activeTab === 0 ? (
-          <Button
-            loading={isSaving}
-            onClick={onSave}
-            startIcon={<Check />}
-            size="L"
-            variant="default"
-            className="payment-button payment-button-success"
-          >
-            Save Configuration
-          </Button>
-        ) : null
-      }
-    />
-  );
-};
-
-export default AppHeader;
-