From 5a163ed9d087bdcf3aa17e41b4b2202333c95ea6 Mon Sep 17 00:00:00 2001
From: Tal Shalif <tshalif@chefworks.com>
Date: Sun, 18 Oct 2020 14:54:42 -0400
Subject: [PATCH 1/2] Add mandatory 'secure' to cookie when forcing
 'SameSite=None'

---
 Plugin/Session/AddSameSite.php  | 2 ++
 Stdlib/Cookie/CookieManager.php | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Plugin/Session/AddSameSite.php b/Plugin/Session/AddSameSite.php
index 2e1ed66..af4ed33 100644
--- a/Plugin/Session/AddSameSite.php
+++ b/Plugin/Session/AddSameSite.php
@@ -49,6 +49,8 @@ public function afterSetCookiePath(
             return $result;
         }
 
+        $subject->setOption('session.cookie_secure', 1);
+
         if ($version >= 70300) {
             $subject->setOption('session.cookie_samesite', 'None');
         } else {
diff --git a/Stdlib/Cookie/CookieManager.php b/Stdlib/Cookie/CookieManager.php
index e77eb19..936f785 100644
--- a/Stdlib/Cookie/CookieManager.php
+++ b/Stdlib/Cookie/CookieManager.php
@@ -174,7 +174,10 @@ protected function setCookie($name, $value, array $metadataArray)
             if (array_key_exists(ExtendPulicCookieMetadata::KEY_SAMESITE, $metadataArray)) {
                 $options = array_merge($options, [self::KEY_SAME_SITE => $metadataArray[ExtendPulicCookieMetadata::KEY_SAMESITE]]);
             } elseif ($sameSite) {
-                $options = array_merge($options, [self::KEY_SAME_SITE => 'None']);
+                $options = array_merge($options, [
+                    self::KEY_SAME_SITE => 'None',
+                    self::KEY_SECURE => true
+                ]);
             }
 
             $phpSetcookieSuccess = setcookie(

From d99432c3b4900e866082b625e86313c894aa7889 Mon Sep 17 00:00:00 2001
From: tshalif <tshalif+github@gmail.com>
Date: Thu, 28 Oct 2021 01:13:13 +0900
Subject: [PATCH 2/2] remove dependency on magento/framework to resolve
 conflict

---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a53fe46..c53a484 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,6 @@
     ],
     "require": {
         "php": "~7.2.0||~7.3.0||~7.4.0",
-        "magento/framework": "~102.0.0||~103.0.0",
         "lib-libxml": "*"
     },
     "autoload": {
@@ -28,4 +27,4 @@
             "Veriteworks\\CookieFix\\": ""
         }
     }
-}
\ No newline at end of file
+}