Merge pull request #772 from Nosto/release/6.0.1

Release 6.0.1
Nosto · May 23, 2022 · 4b2e5f4 · 4b2e5f4
2 parents b4cc9f5 + fad6b65
commit 4b2e5f4
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 670 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 All notable changes to this project will be documented in this file. This project adheres to Semantic Versioning.
 
+### 6.0.1
+* Add support for both version 2 and 3 of phpseclib/phpseclib library (for compatibility with Magento versions 2.3.x and 2.4.x)
+* Remove customer visitor checksum generation when 2c.cid cookie does not exist
+
 ### 6.0.0
 * Compatibility with Magento 2.4.4
 * Bump minimum PHP version to 7.4

diff --git a/CustomerData/CartTagging.php b/CustomerData/CartTagging.php
@@ -88,12 +88,16 @@ public function __construct(
      */
     public function getSectionData()
     {
-        $nostoCustomerId = $this->cookieManager->getCookie(NostoCustomer::COOKIE_NAME);
         $data = [
-            'hcid' => $this->generateVisitorChecksum($nostoCustomerId),
             'items' => [],
             'restore_cart_url' => ''
         ];
+
+        $nostoCustomerId = $this->cookieManager->getCookie(NostoCustomer::COOKIE_NAME);
+        if ($nostoCustomerId) {
+            $data['hcid'] = $this->generateVisitorChecksum($nostoCustomerId);
+        }
+
         $cart = $this->cartHelper->getCart();
         $nostoCart = $this->nostoCartBuilder->build(
             $this->getQuote(),

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection ALL */
 /**
  * Copyright (c) 2020, Nosto Solutions Ltd
  * All rights reserved.
@@ -47,7 +47,6 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
 use Nosto\Tagging\Helper\Scope as NostoHelperScope;
-use phpseclib3\Crypt\Random;
 
 /**
  * NostoHelperData helper used for common tasks, mainly configurations.
@@ -242,15 +241,23 @@ public function __construct(
      * Nosto accounts used on this installation.
      *
      * @return string the ID.
+     * @suppress PhanAccessMethodInternal, PhanUndeclaredClassConstant, PhanUndeclaredClassMethod
      */
     public function getInstallationId()
     {
         $installationId = $this->scopeConfig->getValue(
             self::XML_PATH_INSTALLATION_ID
         );
         if (empty($installationId)) {
-            // Running bin2hex() will make the ID string length 64 characters.
-            $installationId = bin2hex(Random::string(32));
+            //Check if phpseclib v3 is used
+            //needed for comaptibility with Magento 2.4 versions
+            if (class_exists("phpseclib3\Crypt\Random")) {
+                // Running bin2hex() will make the ID string length 64 characters.
+                $installationId = bin2hex(\phpseclib3\Crypt\Random::string(32));
+            } else {
+                // Running bin2hex() will make the ID string length 64 characters.
+                $installationId = bin2hex(\phpseclib\Crypt\Random::string(32));
+            }
             $this->configWriter->save(
                 self::XML_PATH_INSTALLATION_ID,
                 $installationId

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nosto/module-nostotagging",
   "description": "Increase your conversion rate and average order value by delivering your customers personalized product recommendations throughout their shopping journey.",
   "type": "magento2-module",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "require-dev": {
     "phpmd/phpmd": "^2.5",
     "sebastian/phpcpd": "*",
@@ -39,10 +39,10 @@
     "OSL-3.0"
   ],
   "require": {
-    "nosto/php-sdk": ">=5.8.1",
     "php": ">=7.4.0",
     "magento/framework": ">=101.0.6|~102.0",
-    "ext-json": "*"
+    "ext-json": "*",
+    "nosto/php-sdk": "^5.8"
   },
   "repositories": [
     {