Fix process callback with content type text plain

pabloveintimilla · Mar 31, 2024 · 8d40bff · 8d40bff
1 parent 5e13ecf
commit 8d40bff
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/Config/config.php b/Config/config.php
@@ -6,6 +6,6 @@
     'name'        => 'AmazonSESBundle',
     'description' => 'Provides Amazon SES as an email transport and callback to process bounces',
     'author'      => 'Pablo Veintimilla Vargas',
-    'version'     => '1.0.0',
+    'version'     => '1.0.1',
     'routes'   => array()
 );
diff --git a/EventSubscriber/CallbackSubscriber.php b/EventSubscriber/CallbackSubscriber.php
@@ -52,11 +52,11 @@ public static function getSubscribedEvents(): array
     public function processCallbackRequest(TransportWebhookEvent $webhookEvent): void
     {
         $this->webhookEvent = $webhookEvent;
+
+        $this->parseRequest();
         if (!$this->validateCallbackRequest()) {
             return;
         }
-
-        $this->payload = $this->webhookEvent->getRequest()->request->all();
         $type = $this->parseType();
 
         try {
@@ -68,7 +68,24 @@ public function processCallbackRequest(TransportWebhookEvent $webhookEvent): voi
             return;
         }
 
-        $webhookEvent->setResponse(new Response("Callback processed: $type"));
+        $this->webhookEvent->setResponse(new Response("Callback processed: $type"));
+    }
+
+    /**
+     * Parse request to correct content type
+     */
+    protected function parseRequest()
+    {
+        $request = $this->webhookEvent->getRequest();
+        $contentType = $request->getContentType();
+        switch ($contentType) {
+            case 'json':
+                $this->payload = $request->request->all();
+                break;
+            default:
+                $this->payload = json_decode($request->getContent(), true, 512, JSON_THROW_ON_ERROR);
+                break;
+        }
     }
 
     /**
@@ -83,18 +100,17 @@ protected function validateCallbackRequest(): bool
             return false;
         }
 
-        // Check post data
-        $postData = $this->webhookEvent->getRequest()->request->all();
-        if (empty($postData)) {
+        // Check data
+        if (!is_array($this->payload)) {
             $message = 'There is no data to process.';
-            $this->logger->error($message);
+            $this->logger->error($message . $this->webhookEvent->getRequest()->getContent());
             $this->webhookEvent->setResponse(new Response($message, Response::HTTP_BAD_REQUEST));
             return false;
         }
 
         //Check type
         if (
-            !$this->arrayKeysExists($this->allowdTypes, $postData)
+            !$this->arrayKeysExists($this->allowdTypes, $this->payload)
         ) {
             $message = "Type of request is invalid";
             $this->webhookEvent->setResponse(new Response($message, Response::HTTP_BAD_REQUEST));

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ composer require pabloveintimilla/mautic-amazon-ses
 2. Install plugin
 
 ```
-php bin\console mautic:plugins:reload
+php bin/console mautic:plugins:reload
 ```
 
 ## CONFIGURATION MAUTIC