From eb3d290ac002f805cdc337d9eb991c995e699745 Mon Sep 17 00:00:00 2001
From: Jakub Polomsky <jakub.polomsky@qenta.com>
Date: Tue, 15 Jun 2021 08:54:06 +0200
Subject: [PATCH] override cookie settings to comply with new browser reqs.

---
 Model/Plugin/FixSession.php | 67 +++++++++++++++++++++++++++++++++++++
 etc/frontend/di.xml         |  4 +++
 2 files changed, 71 insertions(+)
 create mode 100644 Model/Plugin/FixSession.php

diff --git a/Model/Plugin/FixSession.php b/Model/Plugin/FixSession.php
new file mode 100644
index 0000000..6aee8fe
--- /dev/null
+++ b/Model/Plugin/FixSession.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Shop System Plugins - Terms of Use
+ *
+ * The plugins offered are provided free of charge by Qenta Payment CEE GmbH
+ * (abbreviated to Qenta CEE) and are explicitly not part of the Qenta CEE range of
+ * products and services.
+ *
+ * They have been tested and approved for full functionality in the standard configuration
+ * (status on delivery) of the corresponding shop system. They are under General Public
+ * License Version 2 (GPLv2) and can be used, developed and passed on to third parties under
+ * the same terms.
+ *
+ * However, Qenta CEE does not provide any guarantee or accept any liability for any errors
+ * occurring when used in an enhanced, customized shop system configuration.
+ *
+ * Operation in an enhanced, customized configuration is at your own risk and requires a
+ * comprehensive test phase by the user of the plugin.
+ *
+ * Customers use the plugins at their own risk. Qenta CEE does not guarantee their full
+ * functionality neither does Qenta CEE assume liability for any disadvantages related to
+ * the use of the plugins. Additionally, Qenta CEE does not guarantee the full functionality
+ * for customized shop systems or installed plugins of other vendors of plugins within the same
+ * shop system.
+ *
+ * Customers are responsible for testing the plugin's functionality before starting productive
+ * operation.
+ *
+ * By installing the plugin into the shop system the customer agrees to these terms of use.
+ * Please do not use the plugin if you do not agree to these terms of use!
+ */
+
+namespace Qenta\CheckoutSeamless\Model\Plugin;
+
+use Magento\Framework\HTTP\Header;
+use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
+use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
+
+
+class FixSession
+{
+    /**
+     * @var Header
+     */
+    protected $header;
+
+    public function __construct(Header $header)
+    {
+        $this->header = $header;
+    }
+
+    public function beforeSetPublicCookie(
+        PhpCookieManager $subject,
+        $name,
+        $value,
+        PublicCookieMetadata $metadata = null
+    ) {
+        if ($metadata && method_exists($metadata, 'getSameSite') && ($name == 'PHPSESSID')) {
+            if ($metadata->getSameSite() != 'None') {
+                $metadata->setSecure(true);
+                $metadata->setSameSite('None');
+            }
+        }
+        return [$name, $value, $metadata];
+    }
+}
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 20cc4ae..df28d45 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -50,4 +50,8 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\Framework\Stdlib\Cookie\PhpCookieManager">
+        <plugin name="fixSession" type="Qenta\CheckoutSeamless\Model\Plugin\FixSession" />
+    </type>
 </config>