From dfbcb94cfdb5a48b10e308574a7e012ca5cce54c Mon Sep 17 00:00:00 2001 From: Filip Skokan Date: Thu, 25 Apr 2024 15:20:45 +0200 Subject: [PATCH] refactor: don't use overwrite cookie option by default --- docs/README.md | 2 -- lib/helpers/defaults.js | 2 -- test/test_helper.js | 11 ++++++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/README.md b/docs/README.md index a879ed38e..b1a6ff620 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2094,7 +2094,6 @@ _**default value**_: ```js { httpOnly: true, - overwrite: true, sameSite: 'none' } ``` @@ -2124,7 +2123,6 @@ _**default value**_: ```js { httpOnly: true, - overwrite: true, sameSite: 'lax' } ``` diff --git a/lib/helpers/defaults.js b/lib/helpers/defaults.js index ee09fae83..0a7572057 100644 --- a/lib/helpers/defaults.js +++ b/lib/helpers/defaults.js @@ -755,7 +755,6 @@ function makeDefaults() { */ long: { httpOnly: true, // cookies are not readable by client-side javascript - overwrite: true, sameSite: 'none', }, @@ -767,7 +766,6 @@ function makeDefaults() { */ short: { httpOnly: true, // cookies are not readable by client-side javascript - overwrite: true, sameSite: 'lax', }, diff --git a/test/test_helper.js b/test/test_helper.js index 4c10f9879..d5d8cb4f8 100644 --- a/test/test_helper.js +++ b/test/test_helper.js @@ -93,6 +93,10 @@ Object.defineProperties(Provider.prototype, { }, }); +function getSetCookies(response) { + return response.headers['set-cookie'].filter((val) => !val.includes('Thu, 01 Jan 1970 00:00:00 GMT')); +} + function readCookie(value) { expect(value).to.exist; const parsed = querystring.parse(value, '; '); @@ -290,8 +294,9 @@ export default function testHelper(importMetaUrl, { expect(query).to.be.null; expect(response).to.have.nested.property('headers.set-cookie').that.is.an('array'); - const uid = readCookie(response.headers['set-cookie'][0]); - expect(readCookie(response.headers['set-cookie'][0])).to.equal(readCookie(response.headers['set-cookie'][2])); + const uid = readCookie(getSetCookies(response)[0]); + expect(readCookie(getSetCookies(response)[0])) + .to.equal(readCookie(getSetCookies(response)[2])); const interaction = TestAdapter.for('Interaction').syncFind(uid); @@ -313,7 +318,7 @@ export default function testHelper(importMetaUrl, { AuthorizationRequest.prototype.validateInteraction = (eName, ...eReasons) => { // eslint-disable-line arrow-body-style return (response) => { - const uid = readCookie(response.headers['set-cookie'][0]); + const uid = readCookie(getSetCookies(response)[0]); const { prompt: { name, reasons } } = TestAdapter.for('Interaction').syncFind(uid); expect(name).to.equal(eName); expect(reasons).to.contain.members(eReasons);