Skip to content
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

Jump to bottom

Allow undefined body sent to sendData() #20981

Merged
merged 6 commits into from Jan 26, 2021
Merged

Allow undefined body sent to sendData() #20981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8277e9
Add a check if body is undefined
Jan 11, 2021
b0d3291
Add test for undefined response body
0xroko Jan 15, 2021
30c5cf0
Merge branch 'canary' into canary
timneutkens Jan 25, 2021
2adcc59
Merge branch 'canary' into canary
Timer Jan 25, 2021
87675e5
Merge branch 'canary' into canary
Timer Jan 25, 2021
61a4cb9
Merge branch 'canary' into canary
kodiakhq[bot] Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/next-server/server/api-utils.ts
View file
Open in desktop
Expand Up @@ -229,7 +229,7 @@ export function sendData(
res: NextApiResponse,
body: any
): void {
if (body === null) {
if (body === null || body === undefined) {
res.end()
return
}
Expand Down
3 changes: 3 additions & 0 deletions test/integration/api-support/pages/api/undefined.js
View file
Open in desktop
@@ -0,0 +1,3 @@
export default (req, res) => {
res.json(undefined)
}
6 changes: 6 additions & 0 deletions test/integration/api-support/test/index.test.js
View file
Open in desktop
Expand Up @@ -122,6 +122,12 @@ function runTests(dev = false) {
expect(body).toBe(true)
})

it('should support undefined response body', async () => {
const res = await fetchViaHTTP(appPort, '/api/undefined', null, {})
const body = res.ok ? await res.text() : null
expect(body).toBe('')
})

it('should return error with invalid JSON', async () => {
const data = await fetchViaHTTP(appPort, '/api/parse', null, {
method: 'POST',
Expand Down