Revert "LYNX-319 401 and 403 HTTP response codes for GraphQL API"

This reverts commit 8f401aa.

Author: svera

app/code/Magento/CustomerGraphQl/Controller/HttpRequestValidator/AuthorizationRequestValidator.php

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2024 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -212,11 +212,4 @@
         <plugin name="merge_order_after_customer_signup"
                 type="Magento\CustomerGraphQl\Plugin\Model\MergeGuestOrder" />
     </type>
-    <type name="Magento\GraphQl\Controller\HttpRequestProcessor">
-        <arguments>
-            <argument name="requestValidators" xsi:type="array">
-                <item name="authorizationValidator" xsi:type="object">Magento\CustomerGraphQl\Controller\HttpRequestValidator\AuthorizationRequestValidator</item>
-            </argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/CustomerGraphQl/etc/graphql/di.xml

@@ -1,13 +1,14 @@
 <?php
+
 /**
- * Copyright 2024 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\GraphQl\Controller;
 
-use Exception;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\AreaList;
 use Magento\Framework\App\FrontControllerInterface;
@@ -23,8 +24,6 @@
 use Magento\Framework\GraphQl\Query\QueryProcessor;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\SchemaGeneratorInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\Response;
 use Magento\GraphQl\Helper\Query\Logger\LogData;
@@ -185,7 +184,7 @@ public function dispatch(RequestInterface $request): ResponseInterface
         $statusCode = 200;
         $jsonResult = $this->jsonFactory->create();
         $data = $this->getDataFromRequest($request);
-        $result = ['errors' => []];
+        $result = [];
 
         $schema = null;
         $query = $data['query'] ?? '';
@@ -206,14 +205,8 @@ public function dispatch(RequestInterface $request): ResponseInterface
                 $this->contextFactory->create(),
                 $data['variables'] ?? []
             );
-            $statusCode = $this->getHttpResponseCode($result);
-        } catch (GraphQlAuthenticationException $error) {
-            $result['errors'][] = $this->graphQlError->create($error);
-            $statusCode = 401;
-        } catch (GraphQlAuthorizationException $error) {
-            $result['errors'][] = $this->graphQlError->create($error);
-            $statusCode = 403;
-        } catch (Exception $error) {
+        } catch (\Exception $error) {
+            $result['errors'] = isset($result['errors']) ? $result['errors'] : [];
             $result['errors'][] = $this->graphQlError->create($error);
             $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
         }
@@ -223,7 +216,7 @@ public function dispatch(RequestInterface $request): ResponseInterface
         $jsonResult->renderResult($this->httpResponse);
 
         // log information about the query, unless it is an introspection query
-        if (!str_contains($query, 'IntrospectionQuery')) {
+        if (strpos($query, 'IntrospectionQuery') === false) {
             $queryInformation = $this->logDataHelper->getLogData($request, $data, $schema, $this->httpResponse);
             $this->loggerPool->execute($queryInformation);
         }
@@ -254,30 +247,4 @@ private function getDataFromRequest(RequestInterface $request): array
 
         return $data;
     }
-
-    /**
-     * Retrieve http response code based on the error categories
-     *
-     * @param array $result
-     * @return int
-     */
-    private function getHttpResponseCode(array $result): int
-    {
-        if (empty($result['errors'])) {
-            return 200;
-        }
-        foreach ($result['errors'] as $error) {
-            if (!isset($error['extensions']['category'])) {
-                continue;
-            }
-            switch ($error['extensions']['category']) {
-                case GraphQlAuthenticationException::EXCEPTION_CATEGORY:
-                    return 401;
-                case GraphQlAuthorizationException::EXCEPTION_CATEGORY:
-                    return 403;
-            }
-        }
-
-        return 200;
-    }
 }