-
Notifications
You must be signed in to change notification settings - Fork 12
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.
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
fix: parse multipart/form-data requests correctly #39
Open
c0per
wants to merge
5
commits into
mswjs:main
Choose a base branch
from
c0per:fix/request.body
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4f85d57
fix: pass raw body to Request
c0per 46c6bd5
test: with-express-json
c0per 768987c
test: multipart/form-data with Express.js
c0per c1e6578
feat: raise default body size limit
c0per fdf0767
feat: custom bodyParser options in `createServer`
c0per File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/** | ||
* @jest-environment node | ||
*/ | ||
import express from 'express' | ||
import { HttpResponse, http } from 'msw' | ||
import { createMiddleware } from '../src' | ||
|
||
import httpModule from 'http' | ||
import { AddressInfo } from 'net' | ||
|
||
const app = express() | ||
|
||
app.use(express.raw({ type: '*/*' })) | ||
|
||
app.use( | ||
createMiddleware( | ||
http.post<never, { firstName: string }>('/user', async ({ request }) => { | ||
const form = await request.formData() | ||
|
||
const field1 = form.get('field1') | ||
const field2 = form.get('field2') | ||
|
||
if (!field1 || typeof field1 !== 'string') return HttpResponse.error() | ||
if (!field2 || typeof field2 !== 'string') return HttpResponse.error() | ||
|
||
return HttpResponse.json( | ||
{ field1, field2 }, | ||
{ | ||
headers: { | ||
'x-my-header': 'value', | ||
}, | ||
}, | ||
) | ||
}), | ||
), | ||
) | ||
|
||
app.use((_req, res) => { | ||
res.status(404).json({ | ||
error: 'Mock not found', | ||
}) | ||
}) | ||
|
||
const httpServer = httpModule.createServer(app) | ||
|
||
beforeAll(() => { | ||
httpServer.listen({ port: 0 }) | ||
}) | ||
|
||
afterAll(async () => { | ||
httpServer.close() | ||
}) | ||
|
||
it('supports usage with multipart/form-data payload', async () => { | ||
const form = new FormData() | ||
|
||
form.append('field1', 'value1') | ||
form.append('field2', 'value2') | ||
|
||
const { port } = httpServer.address() as AddressInfo | ||
const res = await fetch(`http://localhost:${port}/user`, { | ||
method: 'POST', | ||
body: form, | ||
}) | ||
|
||
expect(res.status).toBe(200) | ||
expect(res.headers.get('x-my-header')).toBe('value') | ||
expect(await res.json()).toEqual({ field1: 'value1', field2: 'value2' }) | ||
}) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you think if we bake in
express.raw()
intocreateMiddleware()
itself?Applying it to the entire server is too much anyway since people can attach handlers-based routes to an existing Express server.
In other words, having the raw body parser is a prerequisite of the middleware. So it must be defined there, next to the middleware.