Merge pull request #1159 from buckaroo-it/BP-4146-Don-t-require-CSP-i…

…f-it-is-disabled BP-4146-Don-t-require-CSP-if-it-is-disabled
buckaroo-it · Jan 30, 2025 · cd381e7 · cd381e7
2 parents 10cef65 + 038b610
commit cd381e7
Show file tree

Hide file tree

Showing 18 changed files with 149 additions and 301 deletions.
diff --git a/Block/Cart/BuckarooConfig.php b/Block/Cart/BuckarooConfig.php
@@ -71,14 +71,4 @@ public function getBuckarooConfigJson()
         $configProvider = $this->configProviderFactory->get('buckaroo_fee');
         return $this->jsonEncoder->serialize($configProvider->getConfig());
     }
-
-    /**
-     * Get CSP nonce
-     *
-     * @return string
-     */
-    public function getCspNonce()
-    {
-        return $this->getData('cspNonce') ?: '';
-    }
 }
diff --git a/Block/Checkout/Success.php b/Block/Checkout/Success.php
@@ -52,14 +52,4 @@ public function __construct(
         );
         $this->currentCustomer = $currentCustomer;
     }
-
-    /**
-     * Get CSP nonce
-     *
-     * @return string
-     */
-    public function getCspNonce()
-    {
-        return $this->getData('cspNonce') ?: '';
-    }
 }
diff --git a/Factory/CspNonceProviderFactory.php b/Factory/CspNonceProviderFactory.php
diff --git a/Helper/CustomCspNonceProvider.php b/Helper/CustomCspNonceProvider.php
diff --git a/Observer/AddCspNonce.php b/Observer/AddCspNonce.php
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
diff --git a/view/frontend/templates/cart/buckaroo_config.phtml b/view/frontend/templates/cart/buckaroo_config.phtml
@@ -18,11 +18,11 @@
  * @license   https://tldrlegal.com/license/mit-license
  */
 
-/** @var string $cspNonce */
+/** @var string $block */
 ?>
 <div id="buckaroo-fee-cart" data-bind="scope:'buckarooFeeCart'">
     <!-- ko template: getTemplate() --><!-- /ko -->
-    <script nonce="<?= $block->getCspNonce() ?>">
+    <script>
         window.buckarooConfig = <?= /* @noEscape */ $block->getBuckarooConfigJson(); ?>;
     </script>
 </div>
diff --git a/view/frontend/templates/catalog/product/view/applepay.phtml b/view/frontend/templates/catalog/product/view/applepay.phtml
@@ -18,13 +18,13 @@
  * @license   https://tldrlegal.com/license/mit-license
  */
 
-/** @var string $cspNonce */
+/** @var string $block */
 ?>
 <?php if ($block->canShowButton('Product')): ?>
-    <div id="apple-pay-catalog-product-view-component" data-bind="scope:'applepayproductcomponent'">
+<div id="apple-pay-catalog-product-view-component" data-bind="scope:'applepayproductcomponent'">
         <!-- ko template: getTemplate() --><!-- /ko -->
 
-    <script nonce="<?= $cspNonce ?>">
+    <script>
         if ('undefined' === typeof window.checkoutConfig) {
             window.checkoutConfig = <?= /* @noEscape */ ($block->getApplepayConfig()); ?>;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;

diff --git a/view/frontend/templates/catalog/product/view/ideal-fast-checkout.phtml b/view/frontend/templates/catalog/product/view/ideal-fast-checkout.phtml
@@ -19,6 +19,8 @@
  * @license   https://tldrlegal.com/license/mit-license
  */
 
+/** @var string $block */
+
 if ($block->canShowButton('Product')): ?>
 
     <div id="fast-checkout-ideal-btn-component" data-bind="scope: 'fastCheckoutIdeal'">

diff --git a/view/frontend/templates/catalog/product/view/idin.phtml b/view/frontend/templates/catalog/product/view/idin.phtml
@@ -17,6 +17,7 @@
  * @copyright Copyright (c) Buckaroo B.V.
  * @license   https://tldrlegal.com/license/mit-license
  */
+/** @var string $block */
 ?>
 <?php if ($block->canShowProductIdin()): ?>
     <div id="buckaroo_idin_product" style="background: #d4eded; padding: 10px; display: inline-block; width: 100%; ">
@@ -25,4 +26,4 @@
         <span data-bind="i18n: 'You must be 18 or older to pay for the products below'"
               style="height: 50px; display: block; float: left; line-height: 50px; margin-left: 11px; "></span>
     </div>
-<?php endif; ?>
+<?php endif; ?>
diff --git a/view/frontend/templates/catalog/product/view/paypal-express.phtml b/view/frontend/templates/catalog/product/view/paypal-express.phtml
@@ -17,6 +17,7 @@
  * @copyright Copyright (c) Buckaroo B.V.
  * @license   https://tldrlegal.com/license/mit-license
  */
+/** @var string $block */
 ?>
 <?php if ($block->canShowButton('Product')): ?>
 <div id="paypal-express-button-component" data-bind="scope:'paypalExpress'">
@@ -30,7 +31,10 @@
                         "paypalExpress": {
                             "component":"buckaroo/paypal-express/button",
                             "template":"Buckaroo_Magento2/catalog/product/view/paypal-express",
-                            "data":  <?= /* @noEscape */ json_encode($block->getConfig()); ?>
+                            "config": {
+                                  "data": <?= /* @noEscape */ json_encode($block->getConfig()); ?>,
+                                  "page": "product"
+                            }
                         }
                     }
                 }

diff --git a/view/frontend/templates/checkout/cart/applepay.phtml b/view/frontend/templates/checkout/cart/applepay.phtml
@@ -17,25 +17,31 @@
  * @copyright Copyright (c) Buckaroo B.V.
  * @license   https://tldrlegal.com/license/mit-license
  */
+/** @var string $block */
 ?>
 <?php if ($block->canShowButton('Cart')): ?>
-<div class="box-tocart">
-    <div class="fieldset">
-        <div class="actions">
-            <div id="apple-pay-wrapper" data-bind="afterRender: showPayButton"></div>
-        </div>
-    </div>
+<div id="apple-pay-catalog-cart-view-component" data-bind="scope:'buckarooApplepayCart'">
+    <!-- ko template: getTemplate() --><!-- /ko -->
+    <script>
+        if ('undefined' === typeof window.checkoutConfig) {
+            window.checkoutConfig = <?= /* @noEscape */ $block->getCheckoutConfig(); ?>;
+            window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
+        }
+    </script>
+
+    <script type="text/x-magento-init">
+        {
+            "[data-bind='scope:buckarooApplepayCart']": {
+                "Magento_Ui/js/core/app": {
+                    "components": {
+                        "buckarooApplepayCart": {
+                            "component": "buckaroo/applepay/checkout-cart"
+                        }
+                    }
+                }
+            }
+        }
+    </script>
 </div>
 
-<script>
-    if ('undefined' === typeof window.checkoutConfig) {
-        window.checkoutConfig = <?= /* @noEscape */ $block->getCheckoutConfig(); ?>;
-        window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
-    }
-    showPayButton = function() {
-        require(['jquery', 'buckaroo/applepay/checkout-cart'], function (jQuery, applepayPay) {
-            applepayPay.showPayButton('cart');
-        });
-    }
-</script>
 <?php endif; ?>
diff --git a/view/frontend/templates/checkout/cart/ideal-fast-checkout.phtml b/view/frontend/templates/checkout/cart/ideal-fast-checkout.phtml
@@ -18,6 +18,7 @@
  * @copyright Copyright (c) Buckaroo B.V.
  * @license   https://tldrlegal.com/license/mit-license
  */
+/** @var string $block */
 
 if ($block->canShowButton('Cart')): ?>