Merge pull request #36 from logeecom/dev

Release version 1.3.7

Author: logeecom

PacklinkPro/Block/Checkout/Config.php

@@ -10,20 +10,17 @@
 use Magento\Checkout\Model\Session;
 use Magento\Framework\Locale\Resolver;
 use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
 use Magento\Quote\Model\Quote\Address;
 use Packlink\PacklinkPro\Bootstrap;
+use Packlink\PacklinkPro\Helper\CspNonceProviderFactory;
 use Packlink\PacklinkPro\IntegrationCore\BusinessLogic\Http\DTO\ParcelInfo;
 use Packlink\PacklinkPro\IntegrationCore\BusinessLogic\ShippingMethod\Interfaces\ShopShippingMethodService;
 use Packlink\PacklinkPro\IntegrationCore\BusinessLogic\ShippingMethod\ShippingMethodService;
 use Packlink\PacklinkPro\IntegrationCore\Infrastructure\ServiceRegister;
 use Packlink\PacklinkPro\Services\BusinessLogic\CarrierService;
 use Packlink\PacklinkPro\Services\BusinessLogic\ConfigurationService;
 
-/**
- * Class Config.
- *
- * @package Packlink\PacklinkPro\Block\Checkout
- */
 class Config extends Template
 {
     /**
@@ -40,25 +37,35 @@ class Config extends Template
     private $carrierService;
 
     /**
-     * Config constructor.
-     *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Checkout\Model\Session $session
-     * @param \Magento\Framework\Locale\Resolver $locale
-     * @param \Packlink\PacklinkPro\Bootstrap $bootstrap
+     * @var Template\Context
+     */
+    private $context;
+
+
+    private $nonceProviderFactory;
+
+    /**
+     * @param Context $context
+     * @param Session $session
+     * @param Resolver $locale
+     * @param Bootstrap $bootstrap
+     * @param CspNonceProviderFactory $nonceProviderFactory
      * @param array $data
      */
     public function __construct(
         Template\Context $context,
         Session $session,
         Resolver $locale,
         Bootstrap $bootstrap,
+        CspNonceProviderFactory $nonceProviderFactory,
         array $data = []
     ) {
         parent::__construct($context, $data);
 
         $this->checkoutSession = $session;
         $this->locale = $locale;
+        $this->context = $context;
+        $this->nonceProviderFactory = $nonceProviderFactory;
 
         $bootstrap->initInstance();
     }
@@ -237,6 +244,28 @@ public function getCurrentLanguageCode()
         return $locale ? substr($locale, 0, 2) : 'en';
     }
 
+    /**
+     * Csp nonce is necessary for Magento version 2.1.7 and higher.
+     * Magento\Csp\Helper\CspNonceProvider class does not exist in earlier versions.
+     *
+     * @return string
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getCspNonce()
+    {
+        $cspNonceProvider = $this->nonceProviderFactory->create();
+
+        if ($cspNonceProvider) {
+            return $cspNonceProvider->generateNonce();
+        }
+
+        return '';
+    }
+
+    /**
+     * @return ShopShippingMethodService
+     */
     private function getCarrierService()
     {
         if ($this->carrierService === null) {

PacklinkPro/Helper/CspNonceProviderFactory.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Packlink\PacklinkPro\Helper;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Class CspNonceProviderFactory.
+ *
+ * @package Packlink\PacklinkPro\Helper
+ */
+class CspNonceProviderFactory
+{
+    /** @var ObjectManagerInterface  */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Create an instance of CspNonceProvider if it exists.
+     *
+     * @return object|null
+     */
+    public function create()
+    {
+        if (class_exists('Magento\Csp\Helper\CspNonceProvider')) {
+            return $this->objectManager->get('Magento\Csp\Helper\CspNonceProvider');
+        }
+
+        return null;
+    }
+}

PacklinkPro/composer.json

@@ -2,7 +2,7 @@
   "name": "packlink/magento2",
   "description": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
   "type": "magento2-module",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

PacklinkPro/etc/module.xml

@@ -8,5 +8,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Packlink_PacklinkPro" setup_version="1.3.6" schema_version="1.3.6"/>
+    <module name="Packlink_PacklinkPro" setup_version="1.3.7" schema_version="1.3.7"/>
 </config>

PacklinkPro/view/frontend/templates/checkout/config.phtml

@@ -89,7 +89,7 @@
 <span hidden id="pl-change-drop-off-text"><?= __('Change drop-off location') ?></span>
 
 
-<script>
+<script nonce="<?= $block->getCspNonce() ?>">
     (function () {
         require(
             [

PacklinkPro/view/frontend/templates/checkout/shipping.phtml

@@ -88,8 +88,7 @@
 <span hidden id="pl-select-drop-off-text"><?= __('Select drop-off location') ?></span>
 <span hidden id="pl-change-drop-off-text"><?= __('Change drop-off location') ?></span>
 
-
-<script>
+<script nonce="<?= $block->getCspNonce() ?>">
     (function () {
         let logos = [],
             quoteItemWeights = <?= json_encode($block->getQuoteItemWeights()) ?>,

PluginInstallation/1.3.7/PacklinkPro.zip

@@ -0,0 +1,5 @@
+This folder contains packages for version 1.3.7.
+
+Please follow instructions from [Readme file](../../Packlink/PacklinkPro/README.md).
+
+Changes are described in the [Change log](../../CHANGELOG.md).

PluginInstallation/1.3.7/README.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [1.3.7](https://github.com/packlink-dev/magento2_module/compare/v1.3.6...1.3.7)
+### Added
+- Compatibility with Magento 2.4.7
+
 ## [1.3.6](https://github.com/packlink-dev/magento2_module/compare/v1.3.5...1.3.6)
 ### Changed
 - Update core to the latest version