Merge remote-tracking branch 'origin/AC-821' into spartans_pr_18042023

Author: glo80326

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

@@ -8,6 +8,7 @@
 namespace Magento\GraphQlCache\Controller\Plugin;
 
 use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\Controller\ResultInterface;
@@ -16,9 +17,11 @@
 use Magento\GraphQlCache\Model\CacheableQuery;
 use Magento\GraphQlCache\Model\CacheId\CacheIdCalculator;
 use Magento\PageCache\Model\Config;
+use Psr\Log\LoggerInterface;
 
 /**
  * Plugin for handling controller after controller tags and pre-controller validation.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class GraphQl
 {
@@ -52,28 +55,37 @@ class GraphQl
      */
     private $cacheIdCalculator;
 
+    /**
+     * @var LoggerInterface $logger
+     */
+    private $logger;
+
     /**
      * @param CacheableQuery $cacheableQuery
+     * @param CacheIdCalculator $cacheIdCalculator
      * @param Config $config
-     * @param ResponseHttp $response
+     * @param LoggerInterface $logger
      * @param HttpRequestProcessor $requestProcessor
+     * @param ResponseHttp $response
      * @param Registry $registry
-     * @param CacheIdCalculator $cacheIdCalculator
      */
     public function __construct(
         CacheableQuery $cacheableQuery,
+        CacheIdCalculator $cacheIdCalculator,
         Config $config,
-        ResponseHttp $response,
+        LoggerInterface $logger,
         HttpRequestProcessor $requestProcessor,
-        Registry $registry,
-        CacheIdCalculator $cacheIdCalculator
+        ResponseHttp $response,
+        Registry $registry = null
     ) {
         $this->cacheableQuery = $cacheableQuery;
+        $this->cacheIdCalculator = $cacheIdCalculator;
         $this->config = $config;
-        $this->response = $response;
+        $this->logger = $logger;
         $this->requestProcessor = $requestProcessor;
-        $this->registry = $registry;
-        $this->cacheIdCalculator = $cacheIdCalculator;
+        $this->response = $response;
+        $this->registry = $registry ?: ObjectManager::getInstance()
+            ->get(Registry::class);
     }
 
     /**
@@ -87,7 +99,12 @@ public function __construct(
     public function beforeDispatch(
         FrontControllerInterface $subject,
         RequestInterface $request
-    ) {
+    ): void {
+        try {
+            $this->requestProcessor->validateRequest($request);
+        } catch (\Exception $error) {
+            $this->logger->critical($error->getMessage());
+        }
         /** @var \Magento\Framework\App\Request\Http $request */
         $this->requestProcessor->processHeaders($request);
     }

app/code/Magento/GraphQlCache/Test/Unit/Controller/Plugin/GraphQlTest.php

@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQlCache\Test\Unit\Controller\Plugin;
+
+use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\GraphQl\Controller\HttpRequestProcessor;
+use Magento\GraphQlCache\Controller\Plugin\GraphQl;
+use Magento\GraphQlCache\Model\CacheableQuery;
+use Magento\GraphQlCache\Model\CacheId\CacheIdCalculator;
+use Magento\PageCache\Model\Config;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Test beforeDispatch
+ */
+class GraphQlTest extends TestCase
+{
+    /**
+     * @var GraphQl
+     */
+    private $graphql;
+
+    /**
+     * @var CacheableQuery|MockObject
+     */
+    private $cacheableQueryMock;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var ResponseHttp|MockObject
+     */
+    private $responseMock;
+
+    /**
+     * @var HttpRequestProcessor|MockObject
+     */
+    private $requestProcessorMock;
+
+    /**
+     * @var CacheIdCalculator|MockObject
+     */
+    private $cacheIdCalculatorMock;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var FrontControllerInterface|MockObject
+     */
+    private $subjectMock;
+
+    /**
+     * @var Http|MockObject
+     */
+    private $requestMock;
+
+    protected function setUp(): void
+    {
+        $this->cacheableQueryMock = $this->createMock(CacheableQuery::class);
+        $this->cacheIdCalculatorMock = $this->createMock(CacheIdCalculator::class);
+        $this->configMock = $this->createMock(Config::class);
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->onlyMethods(['critical'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->requestProcessorMock = $this->getMockBuilder(HttpRequestProcessor::class)
+            ->onlyMethods(['validateRequest','processHeaders'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->responseMock = $this->createMock(ResponseHttp::class);
+        $this->subjectMock = $this->createMock(FrontControllerInterface::class);
+        $this->requestMock = $this->createMock(Http::class);
+        $this->graphql = new GraphQl(
+            $this->cacheableQueryMock,
+            $this->cacheIdCalculatorMock,
+            $this->configMock,
+            $this->loggerMock,
+            $this->requestProcessorMock,
+            $this->responseMock
+        );
+    }
+
+    /**
+     * test beforeDispatch function for validation purpose
+     */
+    public function testBeforeDispatch(): void
+    {
+        $this->requestProcessorMock
+            ->expects($this->any())
+            ->method('validateRequest');
+        $this->requestProcessorMock
+            ->expects($this->any())
+            ->method('processHeaders');
+        $this->loggerMock
+            ->expects($this->any())
+            ->method('critical');
+        $this->assertNull($this->graphql->beforeDispatch($this->subjectMock, $this->requestMock));
+    }
+}