Skip to content

Commit bc5f97e

Browse files
committed
Fix incorrect setting of the SameSite cookie param
1 parent c998238 commit bc5f97e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

app/code/Magento/Cookie/view/base/web/js/jquery.storageapi.extended.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ define([
1616
* @private
1717
*/
1818
function _extend(storage) {
19+
var cookiesConfig = window.cookiesConfig || {};
20+
1921
$.extend(storage, {
20-
_secure: window.cookiesConfig ? window.cookiesConfig.secure : false,
21-
_samesite: window.cookiesConfig ? window.cookiesConfig.samesite : 'lax',
22+
_secure: !!cookiesConfig.secure,
23+
_samesite: cookiesConfig.samesite ? cookiesConfig.samesite : 'lax',
2224

2325
/**
2426
* Set value under name

lib/web/jquery/jquery.cookie.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
options.path ? '; path=' + options.path : '',
4848
options.domain ? '; domain=' + options.domain : '',
4949
options.secure ? '; secure' : '',
50-
options.samesite ? '; samesite=' + options.samesite : 'lax',
50+
'; samesite=' + (options.samesite ? options.samesite : 'lax'),
5151
].join(''));
5252
}
5353

lib/web/mage/cookies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ define([
7676
(path ? '; path=' + path : '') +
7777
(domain ? '; domain=' + domain : '') +
7878
(secure ? '; secure' : '') +
79-
(samesite ? '; samesite=' + samesite : 'lax');
79+
'; samesite=' + (samesite ? samesite : 'lax');
8080
};
8181

8282
/**

0 commit comments

Comments
 (0)