Merge remote-tracking branch '39040/bug/AC-12731-csp-inline-critical-css' into compr_author

Author: Indrani Sonawane

app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php

@@ -7,9 +7,10 @@
 
 namespace Magento\Theme\Controller\Result;
 
+use Magento\Csp\Api\InlineUtilInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\App\Response\Http;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\View\Result\Layout;
@@ -26,12 +27,23 @@ class AsyncCssPlugin
      */
     private $scopeConfig;
 
+    /**
+     * @var InlineUtilInterface
+     */
+    private $cspInlineUtil;
+
     /**
      * @param ScopeConfigInterface $scopeConfig
+     * @param InlineUtilInterface|null $cspInlineUtil
      */
-    public function __construct(ScopeConfigInterface $scopeConfig)
-    {
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        InlineUtilInterface $cspInlineUtil = null
+    ) {
         $this->scopeConfig = $scopeConfig;
+        $this->cspInlineUtil = $cspInlineUtil ?: ObjectManager::getInstance()->get(
+            InlineUtilInterface::class
+        );
     }
 
     /**
@@ -99,10 +111,13 @@ private function extractLinkTags(string &$content): string
                 $media = $mediaAttribute[2];
             }
             $media = $media ?? 'all';
-
+            $onload = $this->cspInlineUtil->renderEventListener(
+                'onload',
+                sprintf('this.onload=null;this.media=\'%s\'', $media)
+            );
             $style = sprintf(
-                '<link rel="stylesheet" media="print" onload="this.onload=null;this.media=\'%s\'" href="%s">',
-                $media,
+                '<link rel="stylesheet" media="print" %s href="%s">',
+                $onload,
                 $href
             );
             $styles .= "\n" . $style;

app/code/Magento/Theme/Test/Unit/Controller/Result/AsyncCssPluginTest.php

@@ -1,13 +1,16 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Theme\Test\Unit\Controller\Result;
 
 use Magento\Theme\Controller\Result\AsyncCssPlugin;
+use Magento\Csp\Api\InlineUtilInterface;
 use Magento\Framework\App\Response\Http;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -21,7 +24,7 @@
  */
 class AsyncCssPluginTest extends TestCase
 {
-    const STUB_XML_PATH_USE_CSS_CRITICAL_PATH = 'dev/css/use_css_critical_path';
+    private const STUB_XML_PATH_USE_CSS_CRITICAL_PATH = 'dev/css/use_css_critical_path';
 
     /**
      * @var AsyncCssPlugin
@@ -38,9 +41,16 @@ class AsyncCssPluginTest extends TestCase
      */
     private $httpMock;
 
-    /** @var Layout|MockObject */
+    /**
+     * @var Layout|MockObject
+     */
     private $layoutMock;
 
+    /**
+     * @var InlineUtilInterface|MockObject
+     */
+    private $cspInlineUtilMock;
+
     /**
      * @inheritdoc
      */
@@ -53,12 +63,14 @@ protected function setUp(): void
 
         $this->httpMock = $this->createMock(Http::class);
         $this->layoutMock = $this->createMock(Layout::class);
+        $this->cspInlineUtilMock = $this->createMock(InlineUtilInterface::class);
 
         $objectManager = new ObjectManagerHelper($this);
         $this->plugin = $objectManager->getObject(
             AsyncCssPlugin::class,
             [
-                'scopeConfig' => $this->scopeConfigMock
+                'scopeConfig' => $this->scopeConfigMock,
+                'cspInlineUtil' => $this->cspInlineUtilMock
             ]
         );
     }
@@ -149,6 +161,14 @@ public function testAfterRenderResult(string $content, bool $isSetFlag, string $
             ->with(self::STUB_XML_PATH_USE_CSS_CRITICAL_PATH, ScopeInterface::SCOPE_STORE)
             ->willReturn($isSetFlag);
 
+        if ($isSetFlag) {
+            $this->cspInlineUtilMock->expects($this->any())
+                ->method('renderEventListener')
+                ->with(
+                    'onload',
+                    "this.onload=null;this.media='all'"
+                )->willReturn('onload="this.onload=null;this.media=\'all\'"');
+        }
         // Expects
         $this->httpMock->expects($this->any())
             ->method('setContent')

app/code/Magento/Theme/composer.json

@@ -10,6 +10,7 @@
         "magento/module-backend": "*",
         "magento/module-cms": "*",
         "magento/module-config": "*",
+        "magento/module-csp": "*",
         "magento/module-customer": "*",
         "magento/module-eav": "*",
         "magento/module-media-storage": "*",

app/code/Magento/Theme/etc/module.xml

@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Store"/>
             <module name="Magento_Directory"/>
+            <module name="Magento_Csp"/>
         </sequence>
     </module>
 </config>