Skip to content

fix(res): handle null maxAge gracefully in res.cookie() and updated the dependency "cookie" to the 1.0.2 latest version #6875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(res): handle null maxAge gracefully in res.cookie() and updated the dependency "cookie" to the 1.0.2 latest version #6875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions lib/response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ res.clearCookie = function clearCookie(name, options) {
*
* Options:
*
* - `maxAge` max-age in milliseconds, converted to `expires`
* - `maxAge` max-age in milliseconds (number), converted to `expires`
* - `signed` sign the cookie
* - `path` defaults to "/"
*
Expand Down Expand Up @@ -763,12 +763,17 @@ res.cookie = function (name, value, options) {
val = 's:' + sign(val, secret);
}

if (opts.maxAge != null) {
var maxAge = opts.maxAge - 0
if (opts.maxAge === null) {
// Treat null as "unset" (session cookie)
opts.maxAge = undefined;
}

if (typeof opts.maxAge !== 'undefined') {
var maxAge = Number(opts.maxAge);

if (!isNaN(maxAge)) {
opts.expires = new Date(Date.now() + maxAge)
opts.maxAge = Math.floor(maxAge / 1000)
if (Number.isFinite(maxAge)) {
opts.expires = new Date(Date.now() + maxAge);
opts.maxAge = Math.floor(maxAge / 1000);
}
}

Expand All @@ -777,10 +782,11 @@ res.cookie = function (name, value, options) {
}

this.append('Set-Cookie', cookie.serialize(name, String(val), opts));

return this;
};



/**
* Set the location header to `url`.
*
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"body-parser": "^2.2.0",
"content-disposition": "^1.0.0",
"content-type": "^1.0.5",
"cookie": "^0.7.1",
"cookie": "^1.0.2",
"cookie-signature": "^1.2.1",
"debug": "^4.4.0",
"depd": "^2.0.0",
Expand Down