Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
c4ff600e
Unverified
Commit
c4ff600e
authored
Sep 29, 2022
by
JJ Kasper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix middleware/api set-cookie merging
parent
144d7b7b
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
87 additions
and
2 deletions
+87
-2
base-server.ts
packages/next/server/base-server.ts
+23
-0
next-server.ts
packages/next/server/next-server.ts
+15
-2
request-meta.ts
packages/next/server/request-meta.ts
+1
-0
middleware.js
test/e2e/skip-trailing-slash-redirect/app/middleware.js
+6
-0
test-cookie-edge.js
...trailing-slash-redirect/app/pages/api/test-cookie-edge.js
+12
-0
test-cookie.js
...skip-trailing-slash-redirect/app/pages/api/test-cookie.js
+5
-0
index.test.ts
test/e2e/skip-trailing-slash-redirect/index.test.ts
+25
-0
No files found.
packages/next/server/base-server.ts
View file @
c4ff600e
...
@@ -420,6 +420,29 @@ export default abstract class Server<ServerOptions extends Options = Options> {
...
@@ -420,6 +420,29 @@ export default abstract class Server<ServerOptions extends Options = Options> {
parsedUrl
?:
NextUrlWithParsedQuery
parsedUrl
?:
NextUrlWithParsedQuery
):
Promise
<
void
>
{
):
Promise
<
void
>
{
try
{
try
{
// ensure cookies set in middleware are merged and
// not overridden by API routes/getServerSideProps
const
_res
=
(
res
as
any
).
originalResponse
const
origSetHeader
=
_res
.
setHeader
.
bind
(
_res
)
_res
.
setHeader
=
(
name
:
string
,
val
:
string
|
string
[])
=>
{
if
(
name
.
toLowerCase
()
===
'set-cookie'
)
{
const
middlewareValue
=
getRequestMeta
(
req
,
'_nextMiddlewareCookie'
)
if
(
val
!==
middlewareValue
)
{
val
=
[
...(
middlewareValue
||
[]),
...(
typeof
val
===
'string'
?
[
val
]
:
Array
.
isArray
(
val
)
?
val
:
[]),
]
}
}
return
origSetHeader
(
name
,
val
)
}
const
urlParts
=
(
req
.
url
||
''
).
split
(
'?'
)
const
urlParts
=
(
req
.
url
||
''
).
split
(
'?'
)
const
urlNoQuery
=
urlParts
[
0
]
const
urlNoQuery
=
urlParts
[
0
]
...
...
packages/next/server/next-server.ts
View file @
c4ff600e
...
@@ -1304,6 +1304,14 @@ export default class NextNodeServer extends BaseServer {
...
@@ -1304,6 +1304,14 @@ export default class NextNodeServer extends BaseServer {
}
else
{
}
else
{
for
(
let
[
key
,
value
]
of
allHeaders
)
{
for
(
let
[
key
,
value
]
of
allHeaders
)
{
result
.
response
.
headers
.
set
(
key
,
value
)
result
.
response
.
headers
.
set
(
key
,
value
)
if
(
key
.
toLowerCase
()
===
'set-cookie'
)
{
addRequestMeta
(
params
.
request
,
'_nextMiddlewareCookie'
,
Array
.
isArray
(
value
)
?
value
:
[
value
]
)
}
}
}
}
}
...
@@ -1633,8 +1641,13 @@ export default class NextNodeServer extends BaseServer {
...
@@ -1633,8 +1641,13 @@ export default class NextNodeServer extends BaseServer {
params
.
res
.
statusCode
=
result
.
response
.
status
params
.
res
.
statusCode
=
result
.
response
.
status
params
.
res
.
statusMessage
=
result
.
response
.
statusText
params
.
res
.
statusMessage
=
result
.
response
.
statusText
result
.
response
.
headers
.
forEach
((
value
,
key
)
=>
{
result
.
response
.
headers
.
forEach
((
value
:
string
,
key
)
=>
{
// the append handling is special cased for `set-cookie`
if
(
key
.
toLowerCase
()
===
'set-cookie'
)
{
params
.
res
.
setHeader
(
key
,
value
)
}
else
{
params
.
res
.
appendHeader
(
key
,
value
)
params
.
res
.
appendHeader
(
key
,
value
)
}
})
})
if
(
result
.
response
.
body
)
{
if
(
result
.
response
.
body
)
{
...
...
packages/next/server/request-meta.ts
View file @
c4ff600e
...
@@ -21,6 +21,7 @@ export interface RequestMeta {
...
@@ -21,6 +21,7 @@ export interface RequestMeta {
_nextDidRewrite
?:
boolean
_nextDidRewrite
?:
boolean
_nextHadBasePath
?:
boolean
_nextHadBasePath
?:
boolean
_nextRewroteUrl
?:
string
_nextRewroteUrl
?:
string
_nextMiddlewareCookie
?:
string
[]
_protocol
?:
string
_protocol
?:
string
}
}
...
...
test/e2e/skip-trailing-slash-redirect/app/middleware.js
View file @
c4ff600e
...
@@ -17,5 +17,11 @@ export default function handler(req) {
...
@@ -17,5 +17,11 @@ export default function handler(req) {
return
NextResponse
.
redirect
(
'https://example.vercel.sh/somewhere'
,
307
)
return
NextResponse
.
redirect
(
'https://example.vercel.sh/somewhere'
,
307
)
}
}
if
(
req
.
nextUrl
.
pathname
.
startsWith
(
'/api/test-cookie'
))
{
const
res
=
NextResponse
.
next
()
res
.
cookies
.
set
(
'from-middleware'
,
1
)
return
res
}
return
NextResponse
.
next
()
return
NextResponse
.
next
()
}
}
test/e2e/skip-trailing-slash-redirect/app/pages/api/test-cookie-edge.js
0 → 100644
View file @
c4ff600e
import
{
NextResponse
}
from
'next/server'
export
const
config
=
{
runtime
:
'experimental-edge'
,
}
export
default
function
handler
(
req
)
{
console
.
log
(
'setting cookie in api route'
)
const
res
=
NextResponse
.
json
({
name
:
'API'
})
res
.
cookies
.
set
(
'hello'
,
'From API'
)
return
res
}
test/e2e/skip-trailing-slash-redirect/app/pages/api/test-cookie.js
0 → 100644
View file @
c4ff600e
export
default
function
handler
(
req
,
res
)
{
console
.
log
(
'setting cookie in api route'
)
res
.
setHeader
(
'Set-Cookie'
,
'hello=From API'
)
res
.
status
(
200
).
json
({
name
:
'API'
})
}
test/e2e/skip-trailing-slash-redirect/index.test.ts
View file @
c4ff600e
...
@@ -38,6 +38,31 @@ describe('skip-trailing-slash-redirect', () => {
...
@@ -38,6 +38,31 @@ describe('skip-trailing-slash-redirect', () => {
})
})
afterAll
(()
=>
next
.
destroy
())
afterAll
(()
=>
next
.
destroy
())
it
(
'should merge cookies from middleware and API routes correctly'
,
async
()
=>
{
const
res
=
await
fetchViaHTTP
(
next
.
url
,
'/api/test-cookie'
,
undefined
,
{
redirect
:
'manual'
,
})
expect
(
res
.
status
).
toBe
(
200
)
expect
(
res
.
headers
.
get
(
'set-cookie'
)).
toEqual
(
'from-middleware=1; Path=/, hello=From API'
)
})
it
(
'should merge cookies from middleware and edge API routes correctly'
,
async
()
=>
{
const
res
=
await
fetchViaHTTP
(
next
.
url
,
'/api/test-cookie-edge'
,
undefined
,
{
redirect
:
'manual'
,
}
)
expect
(
res
.
status
).
toBe
(
200
)
expect
(
res
.
headers
.
get
(
'set-cookie'
)).
toEqual
(
'from-middleware=1; Path=/, hello=From%20API; Path=/'
)
})
if
((
global
as
any
).
isNextStart
)
{
if
((
global
as
any
).
isNextStart
)
{
it
(
'should not have trailing slash redirects in manifest'
,
async
()
=>
{
it
(
'should not have trailing slash redirects in manifest'
,
async
()
=>
{
const
routesManifest
=
JSON
.
parse
(
const
routesManifest
=
JSON
.
parse
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment