Merge pull request #30 from bsdnomad/master

Store switcher fix
Veriteworks · Jun 2, 2021 · 2dff524 · 2dff524
2 parents 1ce709e + 7d5a4a4
commit 2dff524
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Plugin/SwitchSameSite.php b/Plugin/SwitchSameSite.php
@@ -61,9 +61,17 @@ public function beforeSetPublicCookie(
             $agent = $this->header->getHttpUserAgent();
             $sameSite = $this->validator->shouldSendSameSiteNone($agent);
             if ($sameSite === false) {
-                $metadata->setSameSite('None');
+                $metadata
+                    ->setSecure(true)
+                    ->setSameSite('None');
             } else {
                 $config = $this->scopeConfig->getValue(self::CONFIG_PATH, ScopeInterface::SCOPE_STORE);
+
+                // Convert to lowercase since sometimes it comes as lower-cased string
+                if(strtolower($config) === 'none')
+                {
+                    $metadata->setSecure(true);
+                }
                 $metadata->setSameSite($config);
             }
         }

diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\Stdlib\Cookie\PhpCookieManager">
+    <type name="Magento\Framework\Stdlib\CookieManagerInterface">
         <plugin name="switch_samesite"
                 type="Veriteworks\CookieFix\Plugin\SwitchSameSite"
                 sortOrder="10"/>

diff --git a/etc/webapi_rest/di.xml b/etc/webapi_rest/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\Stdlib\Cookie\PhpCookieManager">
+    <type name="Magento\Framework\Stdlib\CookieManagerInterface">
         <plugin name="switch_samesite"
                 type="Veriteworks\CookieFix\Plugin\SwitchSameSite"
                 sortOrder="10"/>