ACP2E-4194: GraphQL Exception in SWAT

Author: dhorytskyi

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

@@ -10,6 +10,7 @@
 use Exception;
 use GraphQL\Error\FormattedError;
 use GraphQL\Error\SyntaxError;
+use GraphQL\Language\Source;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\AreaList;
 use Magento\Framework\App\FrontControllerInterface;
@@ -239,25 +240,21 @@ public function dispatch(RequestInterface $request): ResponseInterface
     /**
      * Handle GraphQL Exceptions
      *
-     * @param Exception $error
+     * @param Exception $e
      * @return array
      * @throws Throwable
      */
-    private function handleGraphQlException(Exception $error): array
+    private function handleGraphQlException(Exception $e): array
     {
-        if ($error instanceof SyntaxError || $error instanceof GraphQlInputException) {
-            return [['errors' => [FormattedError::createFromException($error)]], 400];
-        }
-        if ($error instanceof GraphQlAuthenticationException) {
-            return [['errors' => [$this->graphQlError->create($error)]], 401];
-        }
-        if ($error instanceof GraphQlAuthorizationException) {
-            return [['errors' => [$this->graphQlError->create($error)]], 403];
-        }
-        return [
-            ['errors' => [$this->graphQlError->create($error)]],
-            ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS
-        ];
+        [$error, $statusCode] = match (true) {
+            $e instanceof GraphQlInputException => [FormattedError::createFromException($e), 200],
+            $e instanceof SyntaxError => [FormattedError::createFromException($e), 400],
+            $e instanceof GraphQlAuthenticationException => [$this->graphQlError->create($e), 401],
+            $e instanceof GraphQlAuthorizationException => [$this->graphQlError->create($e), 403],
+            default => [$this->graphQlError->create($e), ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS],
+        };
+
+        return [['errors' => [$error]], $statusCode];
     }
 
     /**
@@ -286,23 +283,30 @@ private function getHttpResponseCode(array $result): int
      *
      * @param RequestInterface $request
      * @return array
-     * @throws GraphQlInputException
+     * @throws SyntaxError
      */
     private function getDataFromRequest(RequestInterface $request): array
     {
         $data = [];
-        try {
-            /** @var Http $request */
-            if ($request->isPost()) {
-                $data = $request->getContent() ? $this->jsonSerializer->unserialize($request->getContent()) : [];
-            } elseif ($request->isGet()) {
-                $data = $request->getParams();
+        /** @var Http $request */
+        if ($request->isPost() && $request->getContent()) {
+            $content = $request->getContent();
+            try {
+                $data = $this->jsonSerializer->unserialize($content);
+            } catch (\InvalidArgumentException $e) {
+                $source = new Source($content);
+                throw new SyntaxError($source, 0, $e->getMessage());
+            }
+        } elseif ($request->isGet()) {
+            $data = $request->getParams();
+            try {
                 $data['variables'] = !empty($data['variables']) && is_string($data['variables'])
                     ? $this->jsonSerializer->unserialize($data['variables'])
                     : null;
+            } catch (\InvalidArgumentException $e) {
+                $source = new Source($data['variables']);
+                throw new SyntaxError($source, 0, $e->getMessage());
             }
-        } catch (\InvalidArgumentException $e) {
-            throw new GraphQlInputException(__('Unable to parse the request.'), $e);
         }
 
         return $data;

app/design/adminhtml/Magento/backend/i18n/en_US.csv

@@ -550,4 +550,4 @@ Dashboard,Dashboard
 "Email to a Friend","Email to a Friend"
 "Invalid data type","Invalid data type"
 "Invalid value provided for attribute %1","Invalid value provided for attribute %1"
-
+"Unknown type ""%1"".","Unknown type ""%1""."

lib/internal/Magento/Framework/GraphQl/Schema/SchemaGenerator.php

@@ -8,6 +8,7 @@
 namespace Magento\Framework\GraphQl\Schema;
 
 use Magento\Framework\GraphQl\ConfigInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema;
 use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
 use Magento\Framework\GraphQl\SchemaFactory;
@@ -57,7 +58,11 @@ public function generate() : Schema
                 'query' => $this->typeRegistry->get('Query'),
                 'mutation' => $this->typeRegistry->get('Mutation'),
                 'typeLoader' => function ($name) {
-                    return $this->typeRegistry->get($name);
+                    try {
+                        return $this->typeRegistry->get($name);
+                    } catch (GraphQlInputException) {
+                        return null;
+                    }
                 },
                 'types' => function () {
                     $typesImplementors = [];

lib/internal/Magento/Framework/GraphQl/Schema/Type/TypeRegistry.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\GraphQl\Schema\Type;
 
+use LogicException;
 use Magento\Framework\GraphQl\ConfigInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\TypeInterface;
@@ -66,7 +67,13 @@ public function __construct(
     public function get(string $typeName): TypeInterface
     {
         if (!isset($this->types[$typeName])) {
-            $configElement = $this->config->getConfigElement($typeName);
+            try {
+                $configElement = $this->config->getConfigElement($typeName);
+            } catch (LogicException) {
+                throw new GraphQlInputException(
+                    new Phrase('Unknown type "%1".', [$typeName])
+                );
+            }
 
             $configElementClass = get_class($configElement);
             if (!isset($this->configToTypeMap[$configElementClass])) {