ACP2E-3467: [Cloud] 500 response to empty Graphql response on 2.4.7

Author: dhorytskyi

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -19,6 +19,7 @@
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Fields as QueryFields;
 use Magento\Framework\GraphQl\Query\QueryParser;
 use Magento\Framework\GraphQl\Query\QueryProcessor;
@@ -208,7 +209,7 @@ public function dispatch(RequestInterface $request): ResponseInterface
                 );
                 $statusCode = 200;
             }
-        } catch (SyntaxError $error) {
+        } catch (SyntaxError|GraphQlInputException $error) {
             $result = [
                 'errors' => [FormattedError::createFromException($error)],
             ];
@@ -245,7 +246,7 @@ private function getDataFromRequest(RequestInterface $request): array
     {
         /** @var Http $request */
         if ($request->isPost()) {
-            $data = $this->jsonSerializer->unserialize($request->getContent());
+            $data = $request->getContent() ? $this->jsonSerializer->unserialize($request->getContent()) : [];
         } elseif ($request->isGet()) {
             $data = $request->getParams();
             $data['variables'] = isset($data['variables']) ?

dev/tests/integration/testsuite/Magento/GraphQl/Controller/GraphQlControllerTest.php

@@ -273,7 +273,7 @@ public function testDispatchWithOptions(): void
         self::assertEmpty($response->getContent());
     }
 
-    public function testDispatchWithoutQuery(): void
+    public function testDispatchWithGetWithoutQuery(): void
     {
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
@@ -282,4 +282,32 @@ public function testDispatchWithoutQuery(): void
         $output = $this->jsonSerializer->unserialize($response->getContent());
         self::assertNotEmpty($output['errors']);
     }
+
+    public function testDispatchWithPostAndWrongContentType(): void
+    {
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "simple1"}}) {
+        items {
+            id
+            name
+            sku
+        }
+    }
+}
+QUERY;
+        $postData = [
+            'query' => $query,
+            'variables' => null,
+            'operationName' => null
+        ];
+
+        $this->request->setPathInfo('/graphql');
+        $this->request->setMethod('POST');
+        $this->request->setContent(json_encode($postData));
+        $response = $this->graphql->dispatch($this->request);
+        self::assertEquals(400, $response->getStatusCode());
+        $output = $this->jsonSerializer->unserialize($response->getContent());
+        self::assertNotEmpty($output['errors']);
+    }
 }