feat: non-payment webhook initial code

force-app/main/default/classes/AdyenPaymentHelper.cls

@@ -28,7 +28,8 @@ public with sharing class AdyenPaymentHelper {
 
     public static CommercePayments.GatewayNotificationResponse handleAsyncNotificationCallback(CommercePayments.PaymentGatewayNotificationContext gatewayNotificationContext) {
         CommercePayments.PaymentGatewayNotificationRequest paymentGatewayNotificationRequest = Test.isRunningTest() ? null : gatewayNotificationContext.getPaymentGatewayNotificationRequest();
-        NotificationRequestItem notificationRequestItem = parseAdyenNotificationRequest(paymentGatewayNotificationRequest);
+        String adyenNotificationRequestPayload = Test.isRunningTest() ? TEST_NOTIFICATION_REQUEST_BODY : paymentGatewayNotificationRequest.getRequestBody().toString();
+        NotificationRequestItem notificationRequestItem = WebhookUtils.parseAdyenNotificationRequest(adyenNotificationRequestPayload);
         Adyen_Adapter__mdt adyenAdapter = AdyenPaymentUtility.retrieveAdapterByMerchantAcct(notificationRequestItem.merchantAccountCode);
         HMACValidator validator;
         try {
@@ -63,27 +64,6 @@ public with sharing class AdyenPaymentHelper {
         gatewayNotificationResponse.setStatusCode(AdyenConstants.HTTP_SUCCESS_CODE);
         return gatewayNotificationResponse;
     }
-
-    /**
-    * Take the http request from the async notification callback and deserializes it into AdyenNotificationResponse.
-    *
-    * @param notificationRequest The body of the Adyen notification request.
-    * @return AdyenNotificationRequest  The deserialized version of the Adyen notification request.
-    *
-    */
-    public static NotificationRequestItem parseAdyenNotificationRequest(CommercePayments.PaymentGatewayNotificationRequest notificationRequest) {
-        String adyenNotificationRequestPayload = Test.isRunningTest() ? TEST_NOTIFICATION_REQUEST_BODY : AdyenPaymentUtility.makeSalesforceCompatible(notificationRequest.getRequestBody().toString());
-        AdyenNotification adyenNotification  = (AdyenNotification) JSON.deserialize(adyenNotificationRequestPayload, AdyenNotification.class);
-        NotificationRequestItem notificationRequestItem = new NotificationRequestItem();
-        if (adyenNotification != null) {
-            for (NotificationItems notificationItem : adyenNotification.notificationItems) {
-                if (notificationItem.NotificationRequestItem != null) {
-                    notificationRequestItem = notificationItem.NotificationRequestItem;
-                }
-            }
-        }
-        return notificationRequestItem;
-    }
 
     /**
     * Creates and records (ie saves) the notification save result.

force-app/main/default/classes/NonPaymentWebhookHandler.cls

@@ -0,0 +1,34 @@
+@RestResource(UrlMapping='/nonPaymentWebhook/v1/*')
+global with sharing class NonPaymentWebhookHandler {
+    @HttpPost
+    global static String doPost() {
+        NotificationRequestItem notificationRequestItem;
+        RestRequest req = RestContext.request;
+        String acceptedResponse = '[accepted]';
+        try {
+            notificationRequestItem = WebhookUtils.parseAdyenNotificationRequest(req.requestBody.toString());
+            Adyen_Adapter__mdt adyenAdapter = AdyenPaymentUtility.retrieveAdapterByMerchantAcct(notificationRequestItem.merchantAccountCode);
+            HMACValidator validator;
+            validator = new HMACValidator(notificationRequestItem, adyenAdapter.HMAC_Key__c);
+            if (!Test.isRunningTest() && !validator.validateHMAC()) {
+                return acceptedResponse + ', but not a valid notification request';
+            }
+            // TODO: CAPTURE/REFUND and its failed counterparts should not be valid here
+            if (!AdyenPaymentUtility.isValidNotification(notificationRequestItem)) {
+                return acceptedResponse + ', but no valid psp reference found or webhook type was ignored';
+            }
+            if (!AdyenPaymentUtility.relatedPaymentFound(notificationRequestItem.originalReference)) {
+                return acceptedResponse + ', but no related payment record found';
+            }
+            // TODO: create gateway log
+            return acceptedResponse;
+        } catch (Exception ex) {
+            System.debug(LoggingLevel.ERROR, ex.getMessage());
+            if (ex instanceof HMACValidator.HmacValidationException) {
+                return '[accepted] but not valid notification request';
+            } else {
+                return '[accepted] but an exception happened: ' + ex.getMessage();
+            }
+        }
+    }
+}

force-app/main/default/classes/NonPaymentWebhookHandler.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>61.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

force-app/main/default/classes/WebhookUtils.cls

@@ -0,0 +1,15 @@
+public with sharing class WebhookUtils {
+    public static NotificationRequestItem parseAdyenNotificationRequest(String notificationRequestBody) {
+        String notificationRequestCompatibleBody = AdyenPaymentUtility.makeSalesforceCompatible(notificationRequestBody);
+        AdyenNotification adyenNotification  = (AdyenNotification) JSON.deserialize(notificationRequestCompatibleBody, AdyenNotification.class);
+        NotificationRequestItem notificationRequestItem = new NotificationRequestItem();
+        if (adyenNotification != null) {
+            for (NotificationItems notificationItem : adyenNotification.notificationItems) {
+                if (notificationItem.NotificationRequestItem != null) {
+                    notificationRequestItem = notificationItem.NotificationRequestItem;
+                }
+            }
+        }
+        return notificationRequestItem;
+    }
+}

force-app/main/default/classes/WebhookUtils.cls-meta.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>61.0</apiVersion>
+    <status>Active</status>
+</ApexClass>

manifest/package.xml

@@ -14,6 +14,8 @@
         <members>TestDataFactory</members>
         <members>AdyenGatewayAdapter</members>
         <members>AdyenGatewayAdapterTest</members>
+        <members>NonPaymentWebhookHandler</members>
+        <members>WebhookUtils</members>
         <name>ApexClass</name>
     </types>
     <types>