get rid of csp-module and implement secure-renderer

rommelfreddy · Aug 27, 2024 · 623cc3e · 623cc3e
1 parent 226cc3f
commit 623cc3e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 45 deletions.
diff --git a/Plugin/AddCspInlineScripts.php b/Plugin/AddCspInlineScripts.php
diff --git a/composer.json b/composer.json
@@ -25,7 +25,6 @@
         "magento/module-store": "^100.0|^101.0",
         "magento/module-swatches": "^100.0",
         "magento/module-page-cache": "^100.0",
-        "yireo/magento2-csp-utilities": "^1.0",
         "psr/log": "^1 || ^2 || ^3",
         "php": ">=7.4.0",
         "ext-dom": "*",

diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -4,10 +4,6 @@
         <plugin name="Yireo_NextGenImages::replaceTagsInHtml" type="Yireo\NextGenImages\Plugin\ReplaceTagsInHtml"/>
     </type>
 
-    <type name="Magento\Framework\View\Element\Template">
-        <plugin name="Yireo_NextGenImages::addCspInlineScripts" type="Yireo\NextGenImages\Plugin\AddCspInlineScripts"/>
-    </type>
-
     <type name="Magento\Swatches\Helper\Data">
         <plugin name="Yireo_NextGenImages::correctImagesInAjaxResponse" type="Yireo\NextGenImages\Plugin\CorrectImagesInAjaxResponse"/>
     </type>

diff --git a/etc/module.xml b/etc/module.xml
@@ -10,7 +10,6 @@
             <module name="Magento_PageCache"/>
             <module name="Magento_Store"/>
             <module name="Magento_Swatches"/>
-            <module name="Yireo_CspUtilities"/>
         </sequence>
     </module>
 </config>
diff --git a/view/frontend/layout/hyva_catalog_category_view.xml b/view/frontend/layout/hyva_catalog_category_view.xml
diff --git a/view/frontend/templates/hyva/category-additions.phtml b/view/frontend/templates/hyva/category-additions.phtml
diff --git a/view/frontend/templates/hyva/gallery-additions.phtml b/view/frontend/templates/hyva/gallery-additions.phtml
@@ -1,8 +1,17 @@
-<script>
+<?php
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+$script = <<<JS
+    'use strict'
     document.addEventListener('alpine:init', () => {
         Alpine.data('initGallery', () => {
             const galleryInitData = initGallery();
             document.dispatchEvent(new CustomEvent('gallery-init', {detail: galleryInitData}));
             return galleryInitData;
         });
-    });</script>
+    });
+JS;
+
+echo $secureRenderer->renderTag('script', [], $script, false);