Skip to content

Commit af341b0

Browse files
committed
deps: body-parser@2.0.0-beta.1
1 parent 1574925 commit af341b0

File tree

8 files changed

+23
-14
lines changed

8 files changed

+23
-14
lines changed

History.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
This incorporates all changes after 4.17.1 up to 4.17.2.
55

6+
* deps: body-parser@2.0.0-beta.1
7+
- `req.body` is no longer always initialized to `{}`
8+
- `urlencoded` parser now defaults `extended` to `false`
9+
- Use `on-finished` to determine when body read
610
* deps: router@2.0.0-beta.1
711
- Add new `?`, `*`, and `+` parameter modifiers
812
- Internalize private `router.process_params` method

examples/auth/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ app.set('views', path.join(__dirname, 'views'));
1616

1717
// middleware
1818

19-
app.use(express.urlencoded({ extended: false }))
19+
app.use(express.urlencoded())
2020
app.use(session({
2121
resave: false, // don't save session if unmodified
2222
saveUninitialized: false, // don't create session until something stored
@@ -100,6 +100,7 @@ app.get('/login', function(req, res){
100100
});
101101

102102
app.post('/login', function(req, res){
103+
if (!req.body) return res.sendStatus(400)
103104
authenticate(req.body.username, req.body.password, function(err, user){
104105
if (user) {
105106
// Regenerate session when signing in

examples/cookies/index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if (process.env.NODE_ENV !== 'test') app.use(logger(':method :url'))
1717
app.use(cookieParser('my secret here'));
1818

1919
// parses x-www-form-urlencoded
20-
app.use(express.urlencoded({ extended: false }))
20+
app.use(express.urlencoded())
2121

2222
app.get('/', function(req, res){
2323
if (req.cookies.remember) {
@@ -36,7 +36,11 @@ app.get('/forget', function(req, res){
3636

3737
app.post('/', function(req, res){
3838
var minute = 60000;
39-
if (req.body.remember) res.cookie('remember', 1, { maxAge: minute });
39+
40+
if (req.body && req.body.remember) {
41+
res.cookie('remember', 1, { maxAge: minute })
42+
}
43+
4044
res.redirect('back');
4145
});
4246

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"dependencies": {
3131
"accepts": "~1.3.7",
3232
"array-flatten": "2.1.1",
33-
"body-parser": "1.19.1",
33+
"body-parser": "2.0.0-beta.1",
3434
"content-disposition": "0.5.4",
3535
"content-type": "~1.0.4",
3636
"cookie": "0.4.1",

test/express.json.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ describe('express.json()', function () {
312312
.post('/')
313313
.set('Content-Type', 'application/json')
314314
.send('{"user":"tobi"}')
315-
.expect(200, '{}', done)
315+
.expect(200, '', done)
316316
})
317317
})
318318

@@ -344,7 +344,7 @@ describe('express.json()', function () {
344344
.post('/')
345345
.set('Content-Type', 'application/x-json')
346346
.send('{"user":"tobi"}')
347-
.expect(200, '{}', done)
347+
.expect(200, '', done)
348348
})
349349
})
350350

test/express.raw.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ describe('express.raw()', function () {
182182
var test = request(this.app).post('/')
183183
test.set('Content-Type', 'application/octet-stream')
184184
test.write(Buffer.from('000102', 'hex'))
185-
test.expect(200, '{}', done)
185+
test.expect(200, '', done)
186186
})
187187
})
188188

@@ -211,7 +211,7 @@ describe('express.raw()', function () {
211211
var test = request(this.app).post('/')
212212
test.set('Content-Type', 'application/x-foo')
213213
test.write(Buffer.from('000102', 'hex'))
214-
test.expect(200, '{}', done)
214+
test.expect(200, '', done)
215215
})
216216
})
217217

test/express.text.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ describe('express.text()', function () {
195195
.post('/')
196196
.set('Content-Type', 'text/plain')
197197
.send('user is tobi')
198-
.expect(200, '{}', done)
198+
.expect(200, '', done)
199199
})
200200
})
201201

@@ -225,7 +225,7 @@ describe('express.text()', function () {
225225
.post('/')
226226
.set('Content-Type', 'text/xml')
227227
.send('<user>tobi</user>')
228-
.expect(200, '{}', done)
228+
.expect(200, '', done)
229229
})
230230
})
231231

test/express.urlencoded.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ describe('express.urlencoded()', function () {
7373
.expect(200, '{"user":"tobi"}', done)
7474
})
7575

76-
it('should parse extended syntax', function (done) {
76+
it('should not parse extended syntax', function (done) {
7777
request(this.app)
7878
.post('/')
7979
.set('Content-Type', 'application/x-www-form-urlencoded')
8080
.send('user[name][first]=Tobi')
81-
.expect(200, '{"user":{"name":{"first":"Tobi"}}}', done)
81+
.expect(200, '{"user[name][first]":"Tobi"}', done)
8282
})
8383

8484
describe('with extended option', function () {
@@ -441,7 +441,7 @@ describe('express.urlencoded()', function () {
441441
.post('/')
442442
.set('Content-Type', 'application/x-www-form-urlencoded')
443443
.send('user=tobi')
444-
.expect(200, '{}', done)
444+
.expect(200, '', done)
445445
})
446446
})
447447

@@ -473,7 +473,7 @@ describe('express.urlencoded()', function () {
473473
.post('/')
474474
.set('Content-Type', 'application/x-foo')
475475
.send('user=tobi')
476-
.expect(200, '{}', done)
476+
.expect(200, '', done)
477477
})
478478
})
479479

0 commit comments

Comments
 (0)