Merge pull request #6 from stape-io/feature/fix-cookie-generation-logic

Bukashk0zzz · web-flow · commit 7b0ea90b7ead · 2023-12-22T06:17:54.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+v1.0.9
+- Fixed issue with cookie being re-generated on every page load.
+
 v1.0.2
 - Fixed issue with main snippet not showing when cookie keeper enabled
 
diff --git a/Plugin/HttpPlugin.php b/Plugin/HttpPlugin.php
@@ -115,7 +115,9 @@ public function beforeSendResponse(HttpResponse $subject)
             return;
         }
 
+        $cookieValue = $this->cookieManager->getCookie(self::COOKIE_NAME, $this->generateCookieValue());
+
         /** @var \Magento\Framework\App\Request\Http $request */
-        $this->cookieManager->setPublicCookie(self::COOKIE_NAME, $this->generateCookieValue(), $metadata);
+        $this->cookieManager->setPublicCookie(self::COOKIE_NAME, $cookieValue, $metadata);
     }
 }
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "license": [
         "GPL-3.0-only"
     ],
-    "version": "1.0.8",
+    "version": "1.0.9",
     "require": {
         "php": ">=7.4.0"
     },
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Stape_Gtm" schema_version="1.0.8" setup_version="1.0.8">
+    <module name="Stape_Gtm" schema_version="1.0.8" setup_version="1.0.9">
         <sequence>
             <module name="Magento_Backend" />
             <module name="Magento_Catalog" />

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,9 @@ public function beforeSendResponse(HttpResponse $subject)`
`115`	`115`	`return;`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ $cookieValue = $this->cookieManager->getCookie(self::COOKIE_NAME, $this->generateCookieValue());`
	`119`	`+`
`118`	`120`	`/** @var \Magento\Framework\App\Request\Http $request */`
`119`		`- $this->cookieManager->setPublicCookie(self::COOKIE_NAME, $this->generateCookieValue(), $metadata);`
	`121`	`+ $this->cookieManager->setPublicCookie(self::COOKIE_NAME, $cookieValue, $metadata);`
`120`	`122`	`}`
`121`	`123`	`}`