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

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

@@ -42,7 +42,7 @@ const ApplePayButton = ({
   const checkApplePayAvailability = async () => {
     try {
       console.log("[Apple Pay] Checking availability...");
-      
+
       // Check secure context using browser's native property
       // This is the most reliable way to check if we're in a secure context
       const isSecureContext = typeof window !== 'undefined' && window.isSecureContext;
@@ -57,7 +57,7 @@ const ApplePayButton = ({
       // - 127.0.0.1 (even on HTTP)
       // - file:// URLs
       const isSecure = isSecureContext || isLocalhost;
-      
+
       console.log("[Apple Pay] Secure context check:", {
         isSecureContext: isSecureContext,
         protocol: protocol,
@@ -78,12 +78,12 @@ const ApplePayButton = ({
           reason: !isSecureContext ? "window.isSecureContext is false" : "Unknown"
         });
       }
-      
+
       // First, check if Payment Request API is available
       // Payment Request API works on HTTP too, but Apple Pay JS API requires HTTPS
       if (typeof window === 'undefined' || !window.PaymentRequest) {
         console.log("[Apple Pay] Payment Request API not available");
-        
+
         // Fallback: Check Apple Pay JS API (for Safari, requires HTTPS)
         if (typeof window !== 'undefined' && window.ApplePaySession && isSecure) {
           try {
@@ -95,11 +95,11 @@ const ApplePayButton = ({
             return { available: false, method: null, error: 'insecure_context' };
           }
         }
-        
+
         if (!isSecure && typeof window !== 'undefined' && window.ApplePaySession) {
           console.warn("[Apple Pay] Apple Pay JS API requires HTTPS. Using Payment Request API fallback.");
         }
-        
+
         console.log("[Apple Pay] No Apple Pay support found");
         return { available: false, method: null };
       }
@@ -152,11 +152,11 @@ const ApplePayButton = ({
         try {
           const canPay = await testRequest.canMakePayment();
           console.log("[Apple Pay] canMakePayment result:", canPay);
-          
+
           if (canPay) {
             return { available: true, method: 'paymentRequest' };
           }
-          
+
           // If PaymentRequest says no, try Apple Pay JS API as fallback (only on HTTPS)
           if (typeof window !== 'undefined' && window.ApplePaySession && isSecure) {
             try {
@@ -172,17 +172,17 @@ const ApplePayButton = ({
               }
             }
           }
-          
+
           return { available: false, method: null };
         } catch (e) {
           console.error("[Apple Pay] Error checking canMakePayment:", e);
-          
+
           // If it's insecure context error, we can't use Apple Pay JS API
           if (e.message && e.message.includes('insecure')) {
             console.warn("[Apple Pay] Insecure context detected. Apple Pay requires HTTPS.");
             return { available: false, method: null, error: 'insecure_context' };
           }
-          
+
           // For other errors, try Apple Pay JS API as fallback (only on HTTPS)
           if (typeof window !== 'undefined' && window.ApplePaySession && isSecure) {
             try {
@@ -193,7 +193,7 @@ const ApplePayButton = ({
               return { available: false, method: null };
             }
           }
-          
+
           return { available: false, method: null };
         }
       }
@@ -204,7 +204,7 @@ const ApplePayButton = ({
       const hostnameFinal = typeof window !== 'undefined' ? window.location.hostname : '';
       const isLocalhostFinal = hostnameFinal === 'localhost' || hostnameFinal === '127.0.0.1';
       const isSecureFinal = isSecureContextFinal || isLocalhostFinal;
-      
+
       if (isSecureFinal) {
         console.log("[Apple Pay] canMakePayment not available, assuming support (secure context)");
         return { available: true, method: 'paymentRequest' };
@@ -219,20 +219,20 @@ const ApplePayButton = ({
       }
     } catch (error) {
       console.error("[Apple Pay] Error checking availability:", error);
-      
+
       // Check if it's insecure context error
       if (error.message && error.message.includes('insecure')) {
         console.warn("[Apple Pay] Insecure context - Apple Pay requires HTTPS");
         return { available: false, method: null, error: 'insecure_context' };
       }
-      
+
       // Fallback: Try Apple Pay JS API (only on HTTPS)
       // Re-check secure context
       const isSecureContextFallback = typeof window !== 'undefined' && window.isSecureContext;
       const hostnameFallback = typeof window !== 'undefined' ? window.location.hostname : '';
       const isLocalhostFallback = hostnameFallback === 'localhost' || hostnameFallback === '127.0.0.1';
       const isSecureFallback = isSecureContextFallback || isLocalhostFallback;
-      
+
       if (typeof window !== 'undefined' && window.ApplePaySession && isSecureFallback) {
         try {
           const canMakePayments = ApplePaySession.canMakePayments();
@@ -244,16 +244,16 @@ const ApplePayButton = ({
           }
         }
       }
-      
+
       return { available: false, method: null };
     }
   };
 
   useEffect(() => {
     const scriptUrl = "https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js";
-    
+
     console.log("[Apple Pay] Loading Apple Pay SDK script...");
-    
+
     if (document.querySelector(`script[src="${scriptUrl}"]`)) {
       console.log("[Apple Pay] Script already loaded");
       // Script already loaded, check if it's ready
@@ -270,20 +270,20 @@ const ApplePayButton = ({
     script.src = scriptUrl;
     script.crossOrigin = "anonymous";
     script.async = true;
-    
+
     script.onload = () => {
       console.log("[Apple Pay] SDK script loaded successfully");
       setTimeout(() => {
         initializeButton();
       }, 500);
     };
-    
+
     script.onerror = (error) => {
       console.error("[Apple Pay] Failed to load SDK script:", error);
       setIsLoading(false);
       setIsAvailable(false);
       setErrorMessage("Failed to load Apple Pay SDK. Please check Content Security Policy settings.");
-      
+
       // Even if script fails, try to use Payment Request API
       console.log("[Apple Pay] Trying Payment Request API as fallback...");
       setTimeout(() => {
@@ -306,22 +306,22 @@ const ApplePayButton = ({
   const initializeButton = async () => {
     try {
       console.log("[Apple Pay] Initializing button...");
-      
-      const isSecure = typeof window !== 'undefined' && 
-                      (window.location.protocol === 'https:' || 
-                       window.location.hostname === 'localhost' || 
-                       window.location.hostname === '127.0.0.1');
-      
+
+      const isSecure = typeof window !== 'undefined' &&
+        (window.location.protocol === 'https:' ||
+          window.location.hostname === 'localhost' ||
+          window.location.hostname === '127.0.0.1');
+
       console.log("[Apple Pay] Secure context check:", {
         protocol: window.location?.protocol,
         hostname: window.location?.hostname,
         isSecure: isSecure
       });
-      
-      const isLocalhost = typeof window !== 'undefined' && 
-                         (window.location.hostname === 'localhost' || 
-                          window.location.hostname === '127.0.0.1');
-      
+
+      const isLocalhost = typeof window !== 'undefined' &&
+        (window.location.hostname === 'localhost' ||
+          window.location.hostname === '127.0.0.1');
+
       if (!isSecure && !isLocalhost && window.location?.protocol === 'http:') {
         const errorMsg = "Apple Pay requires HTTPS. Please access this page via HTTPS (https://yourdomain.com) instead of HTTP. Localhost (http://localhost) is allowed for development.";
         setErrorMessage(errorMsg);
@@ -331,7 +331,7 @@ const ApplePayButton = ({
         console.warn("[Apple Pay] Current URL:", window.location.href);
         return;
       }
-      
+
       // Log context information
       console.log("[Apple Pay] Context info:", {
         protocol: window.location?.protocol,
@@ -340,16 +340,16 @@ const ApplePayButton = ({
         isLocalhost: isLocalhost,
         fullUrl: window.location?.href
       });
-      
+
       // Check availability
       const availability = await checkApplePayAvailability();
       console.log("[Apple Pay] Availability check result:", availability);
-      
+
       setIsAvailable(availability.available);
-      
+
       if (!availability.available) {
         let errorMsg = "Apple Pay is not available on this device or browser.";
-        
+
         if (isLocalhost) {
           errorMsg = "Apple Pay is not available on localhost. Apple Pay requires a registered domain with HTTPS. " +
             "For testing, please use a production domain with HTTPS or test on a device with Safari (iOS/macOS). " +
@@ -366,7 +366,7 @@ const ApplePayButton = ({
         } else {
           errorMsg += " Please use Safari on iOS, macOS, or iPadOS, or a browser that supports Payment Request API (Chrome, Edge, Safari).";
         }
-        
+
         setErrorMessage(errorMsg);
         setIsLoading(false);
         console.warn("[Apple Pay] Not available:", errorMsg);
@@ -380,14 +380,14 @@ const ApplePayButton = ({
       console.error("[Apple Pay] Initialization error:", error);
       setIsLoading(false);
       setIsAvailable(false);
-      
+
       // Check for insecure context error
       if (error.message && error.message.includes('insecure')) {
         setErrorMessage("Apple Pay requires HTTPS. Please access this page via HTTPS (https://yourdomain.com) instead of HTTP. Localhost is allowed for development.");
       } else {
         setErrorMessage(error.message || "Failed to initialize Apple Pay");
       }
-      
+
       if (onError) {
         onError(error);
       }
@@ -406,11 +406,11 @@ const ApplePayButton = ({
     });
 
     // Check HTTPS requirement
-    const isSecure = typeof window !== 'undefined' && 
-                    (window.location.protocol === 'https:' || 
-                     window.location.hostname === 'localhost' || 
-                     window.location.hostname === '127.0.0.1');
-    
+    const isSecure = typeof window !== 'undefined' &&
+      (window.location.protocol === 'https:' ||
+        window.location.hostname === 'localhost' ||
+        window.location.hostname === '127.0.0.1');
+
     if (!isSecure && window.location?.protocol === 'http:') {
       const errorMsg = "Apple Pay requires HTTPS. Please access this page via HTTPS.";
       console.error("[Apple Pay]", errorMsg);
@@ -496,16 +496,35 @@ const ApplePayButton = ({
           });
 
           merchantSessionPromise.then(session => {
-            console.log("[Apple Pay] Merchant session received:", {
-              hasMerchantIdentifier: !!session.merchantIdentifier,
-              merchantIdentifier: session.merchantIdentifier,
-              domainName: session.domainName,
-              displayName: session.displayName,
-              epochTimestamp: session.epochTimestamp,
-              expiresAt: session.expiresAt,
-              fullSession: session
-            });
-            
+            console.log("[Apple Pay] ========== MERCHANT SESSION RECEIVED ==========");
+            console.log("[Apple Pay] Full Merchant Session (JSON):", JSON.stringify(session, null, 2));
+            console.log("[Apple Pay] Session Type:", typeof session);
+            console.log("[Apple Pay] Is Object:", session instanceof Object);
+            console.log("[Apple Pay] Session Keys:", Object.keys(session || {}));
+            console.log("[Apple Pay] Session Keys Count:", Object.keys(session || {}).length);
+            console.log("[Apple Pay] Has Merchant Identifier:", !!session?.merchantIdentifier);
+            console.log("[Apple Pay] Merchant Identifier:", session?.merchantIdentifier);
+            console.log("[Apple Pay] Has Merchant Session Identifier:", !!session?.merchantSessionIdentifier);
+            console.log("[Apple Pay] Merchant Session Identifier:", session?.merchantSessionIdentifier);
+            console.log("[Apple Pay] Domain Name:", session?.domainName);
+            console.log("[Apple Pay] Display Name:", session?.displayName);
+            console.log("[Apple Pay] Epoch Timestamp:", session?.epochTimestamp);
+            console.log("[Apple Pay] Expires At:", session?.expiresAt);
+            console.log("[Apple Pay] Nonce:", session?.nonce);
+
+            // Log all properties
+            console.log("[Apple Pay] All Session Properties:");
+            if (session && typeof session === 'object') {
+              for (const [key, value] of Object.entries(session)) {
+                if (typeof value === 'string' && value.length > 200) {
+                  console.log(`[Apple Pay]   ${key}:`, value.substring(0, 200) + "... (truncated, length: " + value.length + ")");
+                } else {
+                  console.log(`[Apple Pay]   ${key}:`, value);
+                }
+              }
+            }
+            console.log("[Apple Pay] ==========================================");
+
             // Validate merchant session
             if (!session || (!session.merchantIdentifier && !session.merchantSessionIdentifier)) {
               console.error("[Apple Pay] Invalid merchant session - missing merchantIdentifier");
@@ -528,12 +547,12 @@ const ApplePayButton = ({
             stack: error.stack,
             response: error.response
           });
-          
+
           // Call onError to notify the user
           if (typeof onError === 'function') {
             onError(new Error(`Apple Pay merchant validation failed: ${error.message}. Please check your Payone Apple Pay configuration in PMI (CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay).`));
           }
-          
+
           // Complete with a rejected promise
           // This will cause Apple Pay to close the dialog, which is expected behavior
           // We cannot proceed without a valid merchant session from Payone
@@ -576,20 +595,20 @@ const ApplePayButton = ({
           message: error.message,
           stack: error.stack
         });
-        
+
         // Check if error is due to cancellation (user cancelled)
         // Payment Request API throws "AbortError" when user cancels
-        if (error.name === 'AbortError' || 
-            (error.message && (
-              error.message.includes('Cancelled') || 
-              error.message.includes('cancel') ||
-              error.message.includes('abort')
-            ))) {
+        if (error.name === 'AbortError' ||
+          (error.message && (
+            error.message.includes('Cancelled') ||
+            error.message.includes('cancel') ||
+            error.message.includes('abort')
+          ))) {
           console.log("[Apple Pay] User cancelled the payment");
           // Don't call onError for user cancellation
           return;
         }
-        
+
         // If it's a merchant validation error, log it specifically
         if (error.message && (
           error.message.includes('merchant') ||
@@ -617,11 +636,11 @@ const ApplePayButton = ({
 
       // Extract payment token
       const paymentToken = response.details?.paymentToken || response.details?.token;
-      
+
       if (!paymentToken) {
         console.error("[Apple Pay] Payment token is missing from response");
         try {
-        await response.complete("fail");
+          await response.complete("fail");
         } catch (completeError) {
           console.error("[Apple Pay] Error completing payment with fail:", completeError);
         }
@@ -663,11 +682,11 @@ const ApplePayButton = ({
           // The callback should set the token in state and return success immediately
           // It should NOT process the payment yet - that will happen when user clicks the button
           const callbackResult = onTokenReceived(tokenString, {
-          paymentToken: paymentToken,
-          billingContact: response.payerName || response.details?.billingContact,
-          shippingContact: response.shippingAddress || response.details?.shippingAddress,
-          shippingOption: response.shippingOption || response.details?.shippingOption
-        });
+            paymentToken: paymentToken,
+            billingContact: response.payerName || response.details?.billingContact,
+            shippingContact: response.shippingAddress || response.details?.shippingAddress,
+            shippingOption: response.shippingOption || response.details?.shippingOption
+          });
 
           // If callback returns a promise, wait for it to resolve or reject
           if (callbackResult && typeof callbackResult.then === 'function') {
@@ -779,12 +798,56 @@ const ApplePayButton = ({
         }
       });
 
-        console.log("[Apple Pay] Merchant session received from backend:", {
-          hasData: !!merchantSession.data,
-          merchantIdentifier: merchantSession.data?.merchantIdentifier
-        });
+      console.log("[Apple Pay] ========== BACKEND RESPONSE START ==========");
+      console.log("[Apple Pay] Full Backend Response:", JSON.stringify(merchantSession, null, 2));
+      console.log("[Apple Pay] Response Type:", typeof merchantSession);
+      console.log("[Apple Pay] Has Data:", !!merchantSession.data);
+      console.log("[Apple Pay] Has Error:", !!merchantSession.error);
+
+      if (merchantSession.data) {
+        console.log("[Apple Pay] Data Object:", merchantSession.data);
+        console.log("[Apple Pay] Data Type:", typeof merchantSession.data);
+        console.log("[Apple Pay] Data Keys:", Object.keys(merchantSession.data));
+        console.log("[Apple Pay] Data Keys Count:", Object.keys(merchantSession.data).length);
+        console.log("[Apple Pay] Merchant Identifier:", merchantSession.data.merchantIdentifier);
+        console.log("[Apple Pay] Domain Name:", merchantSession.data.domainName);
+        console.log("[Apple Pay] Display Name:", merchantSession.data.displayName);
+        console.log("[Apple Pay] Epoch Timestamp:", merchantSession.data.epochTimestamp);
+        console.log("[Apple Pay] Expires At:", merchantSession.data.expiresAt);
+      }
+
+      if (merchantSession.error) {
+        console.log("[Apple Pay] Error Object:", merchantSession.error);
+        console.log("[Apple Pay] Error Message:", merchantSession.error.message);
+        console.log("[Apple Pay] Error Details:", merchantSession.error.details);
+      }
+
+      console.log("[Apple Pay] ========== BACKEND RESPONSE END ==========");
+
+      // Check if there's an error in the response
+      if (merchantSession.error) {
+        console.error("[Apple Pay] Backend returned error:", merchantSession.error);
+        throw new Error(merchantSession.error.message || "Apple Pay merchant validation failed");
+      }
+
+      // Validate merchant session
+      const session = merchantSession.data || merchantSession;
+
+      // Check if session is empty object
+      if (!session || Object.keys(session).length === 0) {
+        console.error("[Apple Pay] Empty merchant session received from backend");
+        console.error("[Apple Pay] Full response:", JSON.stringify(merchantSession, null, 2));
+        throw new Error("Empty merchant session received. This usually means Payone did not return a valid merchant session. Please check your Payone Apple Pay configuration in PMI (CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay).");
+      }
+
+      if (!session.merchantIdentifier && !session.merchantSessionIdentifier) {
+        console.error("[Apple Pay] Invalid merchant session - missing merchantIdentifier");
+        console.error("[Apple Pay] Session object:", JSON.stringify(session, null, 2));
+        console.error("[Apple Pay] Full response:", JSON.stringify(merchantSession, null, 2));
+        throw new Error("Invalid merchant session: missing merchantIdentifier. 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.");
+      }
 
-        return merchantSession.data || merchantSession;
+      return session;
     } catch (error) {
       console.error("[Apple Pay] Merchant validation error:", {
         message: error.message,

package/package.json

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

package/server/controllers/payone.js

@@ -189,20 +189,70 @@ module.exports = ({ strapi }) => ({
       } : "No user");
 
       const params = ctx.request.body;
-      const result = await getPayoneService(strapi).validateApplePayMerchant(params);
+      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,
-        hasMerchantIdentifier: !!result.merchantIdentifier
+        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.");
+      }
+
       ctx.body = { data: result };
     } catch (error) {
       strapi.log.error("[Apple Pay] Controller error:", {
         message: error.message,
-        stack: error.stack
+        stack: error.stack,
+        name: error.name
       });
-      handleError(ctx, error);
+      
+      // Return error response instead of empty object
+      // This will help frontend understand what went wrong
+      ctx.status = error.status || 500;
+      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/services/applePayService.js

@@ -115,17 +115,71 @@ const initializeApplePaySession = async (strapi, params) => {
       throw axiosError;
     }
 
-    strapi.log.info("[Apple Pay] Payone response received:", {
-      status: response.status,
-      statusText: response.statusText,
-      headers: response.headers
-    });
+    strapi.log.info("[Apple Pay] ========== PAYONE RESPONSE START ==========");
+    strapi.log.info("[Apple Pay] HTTP Status:", response.status);
+    strapi.log.info("[Apple Pay] HTTP Status Text:", response.statusText);
+    strapi.log.info("[Apple Pay] Response Headers:", JSON.stringify(response.headers, null, 2));
+    strapi.log.info("[Apple Pay] Raw Response Data Type:", typeof response.data);
+    strapi.log.info("[Apple Pay] Raw Response Data:", response.data);
 
     // Parse response
     const responseData = parseResponse(response.data, strapi.log);
 
-    strapi.log.info("[Apple Pay] Session initialization response:", JSON.stringify(responseData, null, 2));
-    strapi.log.info("[Apple Pay] Response status:", responseData.status || responseData.Status);
+    strapi.log.info("[Apple Pay] ========== PARSED RESPONSE ==========");
+    strapi.log.info("[Apple Pay] Full Parsed Response (JSON):", JSON.stringify(responseData, null, 2));
+    strapi.log.info("[Apple Pay] Response Type:", typeof responseData);
+    strapi.log.info("[Apple Pay] Is Object:", responseData instanceof Object);
+    strapi.log.info("[Apple Pay] All Response Keys:", Object.keys(responseData));
+    strapi.log.info("[Apple Pay] Response Keys Count:", Object.keys(responseData).length);
+
+    // Log each key-value pair
+    strapi.log.info("[Apple Pay] ========== RESPONSE KEY-VALUE PAIRS ==========");
+    for (const [key, value] of Object.entries(responseData)) {
+      if (typeof value === 'string' && value.length > 200) {
+        strapi.log.info(`[Apple Pay] ${key}:`, value.substring(0, 200) + "... (truncated, length: " + value.length + ")");
+      } else {
+        strapi.log.info(`[Apple Pay] ${key}:`, value);
+      }
+    }
+
+    strapi.log.info("[Apple Pay] ========== IMPORTANT FIELDS ==========");
+    strapi.log.info("[Apple Pay] status:", responseData.status || responseData.Status || "NOT_SET");
+    strapi.log.info("[Apple Pay] Status (lowercase):", responseData.status || "NOT_SET");
+    strapi.log.info("[Apple Pay] Status (uppercase):", responseData.Status || "NOT_SET");
+    strapi.log.info("[Apple Pay] errorcode:", responseData.errorcode || responseData.ErrorCode || responseData.error_code || "none");
+    strapi.log.info("[Apple Pay] errormessage:", responseData.errormessage || responseData.ErrorMessage || responseData.errortxt || responseData.ErrorTxt || responseData.error_message || "none");
+    strapi.log.info("[Apple Pay] workorderid:", responseData.workorderid || responseData.workorderId || responseData.WorkorderId || "none");
+    strapi.log.info("[Apple Pay] txid:", responseData.txid || responseData.TxId || responseData.tx_id || "none");
+
+    // Check for Apple Pay session in various formats
+    strapi.log.info("[Apple Pay] ========== APPLE PAY SESSION CHECK ==========");
+    const applePaySessionKeys = [
+      "add_paydata[applepay_payment_session]",
+      "add_paydata_applepay_payment_session",
+      "addPaydata[applepay_payment_session]",
+      "addPaydata_applepay_payment_session",
+      "applepay_payment_session",
+      "applePayPaymentSession",
+      "payment_session",
+      "paymentSession"
+    ];
+
+    for (const key of applePaySessionKeys) {
+      if (responseData[key]) {
+        strapi.log.info(`[Apple Pay] Found Apple Pay session in key: ${key}`);
+        strapi.log.info(`[Apple Pay] Session value length: ${responseData[key].length}`);
+        strapi.log.info(`[Apple Pay] Session value preview: ${responseData[key].substring(0, 100)}...`);
+      }
+    }
+
+    // Check add_paydata object if it exists
+    if (responseData.add_paydata) {
+      strapi.log.info("[Apple Pay] add_paydata object exists:", typeof responseData.add_paydata);
+      strapi.log.info("[Apple Pay] add_paydata keys:", Object.keys(responseData.add_paydata));
+      strapi.log.info("[Apple Pay] add_paydata content:", JSON.stringify(responseData.add_paydata, null, 2));
+    }
+
+    strapi.log.info("[Apple Pay] ========== PAYONE RESPONSE END ==========");
 
     if (responseData.errorcode || responseData.ErrorCode) {
       strapi.log.warn("[Apple Pay] Response contains error:", {
@@ -167,6 +221,18 @@ const validateApplePayMerchant = async (strapi, params) => {
       throw new Error("Payone settings not configured");
     }
 
+    // Log all settings to verify MerchantId is being read correctly
+    strapi.log.info("[Apple Pay] ========== SETTINGS FROM CONFIG ==========");
+    strapi.log.info("[Apple Pay] Full Settings Object:", JSON.stringify(settings, null, 2));
+    strapi.log.info("[Apple Pay] Settings Keys:", Object.keys(settings || {}));
+    strapi.log.info("[Apple Pay] MerchantId (mid) from config:", settings.mid || "NOT_SET");
+    strapi.log.info("[Apple Pay] MerchantId type:", typeof settings.mid);
+    strapi.log.info("[Apple Pay] MerchantId length:", settings.mid ? settings.mid.length : 0);
+    strapi.log.info("[Apple Pay] merchantIdentifier from config:", settings.merchantIdentifier || "NOT_SET");
+    strapi.log.info("[Apple Pay] portalid from config:", settings.portalid || "NOT_SET");
+    strapi.log.info("[Apple Pay] mode from config:", settings.mode || "NOT_SET");
+    strapi.log.info("[Apple Pay] ==========================================");
+
     const {
       validationURL,
       mid,
@@ -177,9 +243,21 @@ const validateApplePayMerchant = async (strapi, params) => {
 
     // Get merchant data from settings (test or live mode)
     const merchantName = displayName || settings.merchantName || settings.displayName || "Test Store";
+
+    // Use MerchantId (mid) from config as merchantIdentifier
+    // Priority: params.mid > settings.mid > settings.merchantIdentifier
     const merchantId = mid || settings.mid || settings.merchantIdentifier;
     const portalId = portalid || settings.portalid;
 
+    strapi.log.info("[Apple Pay] ========== MERCHANT ID SELECTION ==========");
+    strapi.log.info("[Apple Pay] mid from params:", mid || "NOT_PROVIDED");
+    strapi.log.info("[Apple Pay] settings.mid:", settings.mid || "NOT_SET");
+    strapi.log.info("[Apple Pay] settings.merchantIdentifier:", settings.merchantIdentifier || "NOT_SET");
+    strapi.log.info("[Apple Pay] Selected merchantId:", merchantId || "NOT_SET");
+    strapi.log.info("[Apple Pay] Selected merchantId type:", typeof merchantId);
+    strapi.log.info("[Apple Pay] Selected merchantId length:", merchantId ? merchantId.length : 0);
+    strapi.log.info("[Apple Pay] ==========================================");
+
     // Get domain from params or settings or server config
     const domainName = domain || settings.domainName ||
       (strapi.config.get("server.url") ? new URL(strapi.config.get("server.url")).hostname : null) ||
@@ -205,10 +283,12 @@ const validateApplePayMerchant = async (strapi, params) => {
       strapi.log.error("[Apple Pay] Failed to initialize session with Payone:", {
         message: error.message,
         status: error.response?.status,
-        data: error.response?.data
+        data: error.response?.data,
+        stack: error.stack
       });
-      // Return empty object on error - Payment Request API will handle it
-      return {};
+      // DO NOT return empty object - throw error instead
+      // Empty object causes Apple Pay to close dialog without proper error message
+      throw new Error(`Failed to initialize Apple Pay session with Payone: ${error.message}. Please check your Payone configuration and ensure Apple Pay is properly set up in PMI.`);
     }
 
     strapi.log.info("[Apple Pay] Session initialization result:", {
@@ -272,12 +352,21 @@ const validateApplePayMerchant = async (strapi, params) => {
 
           // Validate decoded merchant session
           if (!merchantSession.merchantIdentifier) {
-            strapi.log.warn("[Apple Pay] Decoded merchant session missing merchantIdentifier, using fallback");
-            // Use fallback merchant identifier
-            merchantSession.merchantIdentifier = settings.merchantIdentifier ||
-              settings.mid ||
-              settings.portalid ||
-              `merchant.${domainName}`;
+            strapi.log.warn("[Apple Pay] Decoded merchant session missing merchantIdentifier, using MerchantId from config");
+            // Use MerchantId (mid) from config as merchantIdentifier
+            // Priority: settings.mid (MerchantId) > settings.merchantIdentifier > settings.portalid
+            strapi.log.info("[Apple Pay] Available MerchantId values from config:");
+            strapi.log.info("[Apple Pay]   settings.mid:", settings.mid || "NOT_SET");
+            strapi.log.info("[Apple Pay]   settings.merchantIdentifier:", settings.merchantIdentifier || "NOT_SET");
+            strapi.log.info("[Apple Pay]   settings.portalid:", settings.portalid || "NOT_SET");
+
+            const fallbackMerchantId = settings.mid || settings.merchantIdentifier || settings.portalid;
+            merchantSession.merchantIdentifier = fallbackMerchantId || `merchant.${domainName}`;
+
+            strapi.log.info("[Apple Pay] Selected MerchantId from config:", fallbackMerchantId || "NOT_SET");
+            strapi.log.info("[Apple Pay] Final merchantIdentifier set to:", merchantSession.merchantIdentifier);
+          } else {
+            strapi.log.info("[Apple Pay] Using merchantIdentifier from decoded Payone session:", merchantSession.merchantIdentifier);
           }
 
           // Ensure epochTimestamp and expiresAt are in seconds (not milliseconds)
@@ -332,11 +421,21 @@ const validateApplePayMerchant = async (strapi, params) => {
         throw new Error("Payone did not return Apple Pay merchant session. Please ensure Apple Pay is properly configured in Payone Merchant Interface (PMI): CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay configuration. The merchant session must come from Payone after successful Apple Pay onboarding.");
 
         // Get merchant identifier from settings
+        // Use MerchantId (mid) from config as merchantIdentifier
         // According to Payone docs, merchant identifier should be visible in PMI after onboarding
         // Path: CONFIGURATION/PAYMENT PORTALS - choose an onboarded Portal - Payment type configuration tab
-        let merchantIdentifier = settings.merchantIdentifier ||
-          settings.mid ||
-          settings.portalid;
+        strapi.log.info("[Apple Pay] ========== CREATING MERCHANT SESSION FROM CONFIG ==========");
+        strapi.log.info("[Apple Pay] Available MerchantId values from config:");
+        strapi.log.info("[Apple Pay]   settings.mid:", settings.mid || "NOT_SET");
+        strapi.log.info("[Apple Pay]   settings.merchantIdentifier:", settings.merchantIdentifier || "NOT_SET");
+        strapi.log.info("[Apple Pay]   settings.portalid:", settings.portalid || "NOT_SET");
+
+        // Priority: settings.mid (MerchantId) > settings.merchantIdentifier > settings.portalid
+        let merchantIdentifier = settings.mid || settings.merchantIdentifier || settings.portalid;
+
+        strapi.log.info("[Apple Pay] Selected merchantIdentifier:", merchantIdentifier || "NOT_SET");
+        strapi.log.info("[Apple Pay] merchantIdentifier type:", typeof merchantIdentifier);
+        strapi.log.info("[Apple Pay] merchantIdentifier length:", merchantIdentifier ? merchantIdentifier.length : 0);
 
         // If still no merchant identifier, try to construct one from domain
         // But this is not ideal - merchant identifier should come from Payone PMI
@@ -355,16 +454,25 @@ const validateApplePayMerchant = async (strapi, params) => {
         // Create a valid merchant session object
         // This format is required by Apple Pay Payment Request API
         // IMPORTANT: epochTimestamp and expiresAt must be in seconds (Unix timestamp), not milliseconds
+        // IMPORTANT: merchantIdentifier must be the MerchantId (mid) from Payone config
         const merchantSession = {
           epochTimestamp: Math.floor(Date.now() / 1000), // Unix timestamp in seconds
           expiresAt: Math.floor((Date.now() + (5 * 60 * 1000)) / 1000), // 5 minutes from now, in seconds
           merchantSessionIdentifier: `merchant.${domainName}`,
           nonce: generateNonce(),
-          merchantIdentifier: merchantIdentifier, // Already validated and converted to string
+          merchantIdentifier: merchantIdentifier, // MerchantId (mid) from config - already validated and converted to string
           domainName: domainName,
           displayName: merchantName
         };
 
+        strapi.log.info("[Apple Pay] Created merchant session with MerchantId from config:");
+        strapi.log.info("[Apple Pay]   merchantIdentifier:", merchantSession.merchantIdentifier);
+        strapi.log.info("[Apple Pay]   domainName:", merchantSession.domainName);
+        strapi.log.info("[Apple Pay]   displayName:", merchantSession.displayName);
+        strapi.log.info("[Apple Pay]   epochTimestamp:", merchantSession.epochTimestamp);
+        strapi.log.info("[Apple Pay]   expiresAt:", merchantSession.expiresAt);
+        strapi.log.info("[Apple Pay] ==========================================");
+
         // Validate merchant session before returning
         if (!merchantSession.merchantIdentifier || merchantSession.merchantIdentifier === 'undefined' || merchantSession.merchantIdentifier === 'null') {
           strapi.log.error("[Apple Pay] Created merchant session is missing or invalid merchantIdentifier!", {
@@ -395,9 +503,28 @@ const validateApplePayMerchant = async (strapi, params) => {
     // If initialization failed, we cannot proceed
     // Payment Request API requires a valid merchant session
     strapi.log.error("[Apple Pay] Session initialization failed - status:", responseStatus);
+    strapi.log.error("[Apple Pay] Full Payone response:", JSON.stringify(sessionResponse, null, 2));
     strapi.log.error("[Apple Pay] This means merchant validation will fail.");
-    strapi.log.error("[Apple Pay] Please check Payone PMI configuration and ensure Apple Pay is properly set up.");
-    throw new Error(`Apple Pay session initialization failed with status: ${responseStatus}. Please check your Payone Apple Pay configuration in PMI.`);
+    strapi.log.error("[Apple Pay] Possible causes:");
+    strapi.log.error("[Apple Pay] 1. Payone returned ERROR status - check errorcode and errormessage in response");
+    strapi.log.error("[Apple Pay] 2. Apple Pay not configured in Payone PMI");
+    strapi.log.error("[Apple Pay] 3. Domain not verified in Payone PMI");
+    strapi.log.error("[Apple Pay] 4. Merchant identifier not configured correctly");
+    strapi.log.error("[Apple Pay] 5. Apple Pay onboarding not completed");
+
+    // Extract error details from Payone response
+    const errorCode = sessionResponse.errorcode || sessionResponse.ErrorCode;
+    const errorMessage = sessionResponse.errormessage || sessionResponse.ErrorMessage || sessionResponse.errortxt || sessionResponse.ErrorTxt;
+
+    if (errorCode || errorMessage) {
+      strapi.log.error("[Apple Pay] Payone error details:", {
+        errorCode: errorCode,
+        errorMessage: errorMessage
+      });
+      throw new Error(`Payone Apple Pay initialization failed: ${errorCode ? `Error ${errorCode}` : ''} ${errorMessage || 'Unknown error'}. Please check your Payone Apple Pay configuration in PMI (CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay).`);
+    } else {
+      throw new Error(`Apple Pay session initialization failed with status: ${responseStatus || 'UNKNOWN'}. Please check your Payone Apple Pay configuration in PMI (CONFIGURATION → PAYMENT PORTALS → [Your Portal] → Apple Pay).`);
+    }
   } catch (error) {
     strapi.log.error("[Apple Pay] Merchant validation error:", {
       message: error.message,