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( 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 +}