Revert "Merge branch 'lynx-319' of github.com:sivaschenko/magento2ce into LYNX-311-DELIVERY"

This reverts commit 676a315, reversing
changes made to ad7dfa8.

Author: svera

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

@@ -214,11 +214,4 @@
             </argument>
         </arguments>
     </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

@@ -19,8 +19,6 @@
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\GraphQl\Exception\ExceptionFormatter;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Query\Fields as QueryFields;
 use Magento\Framework\GraphQl\Query\QueryParser;
 use Magento\Framework\GraphQl\Query\QueryProcessor;
@@ -183,9 +181,10 @@ public function dispatch(RequestInterface $request): ResponseInterface
     {
         $this->areaList->getArea(Area::AREA_GRAPHQL)->load(Area::PART_TRANSLATE);
 
+        $statusCode = 200;
         $jsonResult = $this->jsonFactory->create();
         $data = $this->getDataFromRequest($request);
-        $result = ['errors' => []];
+        $result = [];
 
         $schema = null;
         try {
@@ -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) {
+            $result['errors'] = isset($result['errors']) ? $result['errors'] : [];
             $result['errors'][] = $this->graphQlError->create($error);
             $statusCode = ExceptionFormatter::HTTP_GRAPH_QL_SCHEMA_ERROR_STATUS;
         }
@@ -231,32 +224,6 @@ public function dispatch(RequestInterface $request): ResponseInterface
         return $this->httpResponse;
     }
 
-    /**
-     * 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;
-    }
-
     /**
      * Get data from request body or query string
      *

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

@@ -26,6 +26,7 @@
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQl\ResolverCacheAbstract;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 
 /**
  * Test for customer resolver cache
@@ -541,7 +542,7 @@ public function testGuestQueryingCustomerDoesNotGenerateResolverCacheEntry()
                 $query
             );
             $this->fail('Expected exception not thrown');
-        } catch (\Exception $e) {
+        } catch (ResponseContainsErrorsException $e) {
             // expected exception
         }