Unverified Commit feabd54f authored by Dominik Ferber's avatar Dominik Ferber Committed by GitHub

avoid mutating response.cookie options (#31679)

Previously `response.cookie(name, value, options)` would mutate the passed in `options` which lead to unexpected behaviour as described in #31666.

This PR clones the `options` argument before mutating it.

## Bug

- [x] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [x] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [x] Make sure the linting passes by running `yarn lint`
parent c2e73ead
...@@ -46,16 +46,20 @@ export class NextResponse extends Response { ...@@ -46,16 +46,20 @@ export class NextResponse extends Response {
const val = const val =
typeof value === 'object' ? 'j:' + JSON.stringify(value) : String(value) typeof value === 'object' ? 'j:' + JSON.stringify(value) : String(value)
if (opts.maxAge) { const options = { ...opts }
opts.expires = new Date(Date.now() + opts.maxAge) if (options.maxAge) {
opts.maxAge /= 1000 options.expires = new Date(Date.now() + options.maxAge)
options.maxAge /= 1000
} }
if (opts.path == null) { if (options.path == null) {
opts.path = '/' options.path = '/'
} }
this.headers.append('Set-Cookie', cookie.serialize(name, String(val), opts)) this.headers.append(
'Set-Cookie',
cookie.serialize(name, String(val), options)
)
return this return this
} }
......
...@@ -52,3 +52,14 @@ it('automatically parses and formats JSON', async () => { ...@@ -52,3 +52,14 @@ it('automatically parses and formats JSON', async () => {
body: '', body: '',
}) })
}) })
it('response.cookie does not modify options', async () => {
const { NextResponse } = await import(
'next/dist/server/web/spec-extension/response'
)
const options = { maxAge: 10000 }
const response = NextResponse.json(null)
response.cookie('cookieName', 'cookieValue', options)
expect(options).toEqual({ maxAge: 10000 })
})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment