Merge pull request #4266 from LLK/hotfix/cookie-rollback

Hotfix/cookie rollback Revert samesite cookie change

src/lib/jar.js

@@ -78,8 +78,7 @@ const Jar = {
     set: (name, value, opts) => {
         opts = opts || {};
         defaults(opts, {
-            expires: new Date(new Date().setYear(new Date().getFullYear() + 1)),
-            sameSite: 'Strict' // cookie library requires this capitialization of sameSite
+            expires: new Date(new Date().setYear(new Date().getFullYear() + 1))
         });
         opts.path = '/';
         const obj = cookie.serialize(name, value, opts);

test/unit/lib/jar.test.js

-const jar = require('../../../src/lib/jar');
-const cookie = require('cookie');
-
-jest.mock('cookie', () => ({serialize: jest.fn()}));
-describe('unit test lib/jar.js', () => {
-
-    test('simple set test with no opts', () => {
-        jar.set('name', 'value');
-        expect(cookie.serialize).toHaveBeenCalled();
-        expect(cookie.serialize).toHaveBeenCalledWith('name', 'value',
-            expect.objectContaining({
-                path: '/',
-                sameSite: 'Strict',
-                expires: expect.anything() // not specifically matching the date because it is hard to mock
-            }));
-    });
-    test('test with opts', () => {
-        jar.set('a', 'b', {option: 'one'});
-        expect(cookie.serialize).toHaveBeenCalled();
-        expect(cookie.serialize).toHaveBeenCalledWith('a', 'b',
-            expect.objectContaining({
-                option: 'one',
-                path: '/',
-                sameSite: 'Strict',
-                expires: expect.anything() // not specifically matching the date because it is hard to mock
-            }));
-    });
-    test('expires opts overrides default', () => {
-        jar.set('a', 'b', {
-            option: 'one',
-            expires: 'someday'
-        });
-        expect(cookie.serialize).toHaveBeenCalled();
-        expect(cookie.serialize).toHaveBeenCalledWith('a', 'b',
-            expect.objectContaining({
-                option: 'one',
-                path: '/',
-                expires: 'someday'
-            }));
-    });
-    test('sameSite opts overrides default', () => {
-        jar.set('a', 'b', {
-            option: 'one',
-            sameSite: 'override'
-        });
-        expect(cookie.serialize).toHaveBeenCalled();
-        expect(cookie.serialize).toHaveBeenCalledWith('a', 'b',
-            expect.objectContaining({
-                option: 'one',
-                sameSite: 'override'
-            }));
-    });
-});