Remove req.body initialization to {}

HISTORY.md

@@ -1,6 +1,8 @@
 2.x
 ===
 
+  * `req.body` is no longer always initialized to `{}`
+    - it is left `undefined` unless a body is parsed
   * `urlencoded` parser now defaults `extended` to `false`
   * Use `on-finished` to determine when body read
 

README.md

@@ -105,7 +105,7 @@ The `verify` argument, if supplied, is called as `verify(req, res, buf, encoding
 
 ### req.body
 
-A new `body` object containing the parsed data is populated on the `request` object after the middleware.
+A new `body` object containing the parsed data is populated on the `request` object after the middleware. If there was no body to parse or the request was of a type there was no parser for, then `req.body` will just be `undefined`.
 
 ## Examples
 

lib/types/json.js

@@ -74,7 +74,9 @@ function json(options) {
       return next()
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     if (!typeis(req, type)) return next()
 

lib/types/raw.js

@@ -50,7 +50,9 @@ function raw(options) {
       return next()
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     if (!typeis(req, type)) return next()
 

lib/types/text.js

@@ -52,7 +52,9 @@ function text(options) {
       return next()
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     if (!typeis(req, type)) return next()
 

lib/types/urlencoded.js

@@ -65,7 +65,9 @@ function urlencoded(options){
       return next()
     }
 
-    req.body = req.body || {}
+    if (!('body' in req)) {
+      req.body = undefined
+    }
 
     if (!typeis(req, type)) return next();
 

test/body-parser.js

@@ -11,10 +11,10 @@ describe('bodyParser()', function(){
     server = createServer()
   })
 
-  it('should default to {}', function(done){
+  it('should default req.body to undefined', function(done){
     request(server)
     .post('/')
-    .expect(200, '{}', done)
+    .expect(200, 'undefined', done)
   })
 
   it('should parse JSON', function(done){
@@ -105,9 +105,14 @@ function createServer(opts){
   var _bodyParser = bodyParser(opts)
 
   return http.createServer(function(req, res){
-    _bodyParser(req, res, function(err){
-      res.statusCode = err ? (err.status || 500) : 200;
-      res.end(err ? err.message : JSON.stringify(req.body));
+    _bodyParser(req, res, function (err) {
+      if (err) {
+        res.statusCode = err.status || 500
+        res.end(err.message)
+      }
+
+      res.statusCode = 200;
+      res.end(JSON.stringify(req.body) || typeof req.body);
     })
   })
 }

test/json.js

@@ -53,7 +53,7 @@ describe('bodyParser.json()', function(){
     .get('/')
     .set('Content-Type', 'application/json')
     .unset('Transfer-Encoding')
-    .expect(200, '{}', done)
+    .expect(200, 'undefined', done)
   })
 
   it('should 400 on malformed JSON', function(done){
@@ -259,7 +259,7 @@ describe('bodyParser.json()', function(){
       .post('/')
       .set('Content-Type', 'application/json')
       .send('{"user":"tobi"}')
-      .expect(200, '{}', done)
+      .expect(200, 'undefined', done)
     })
   })
 
@@ -460,9 +460,14 @@ function createServer(opts){
   var _bodyParser = bodyParser.json(opts)
 
   return http.createServer(function(req, res){
-    _bodyParser(req, res, function(err){
-      res.statusCode = err ? (err.status || 500) : 200;
-      res.end(err ? err.message : JSON.stringify(req.body));
+    _bodyParser(req, res, function (err) {
+      if (err) {
+        res.statusCode = err.status || 500
+        res.end(err.message)
+      }
+
+      res.statusCode = 200;
+      res.end(JSON.stringify(req.body) || typeof req.body);
     })
   })
 }

test/raw.js

@@ -165,7 +165,7 @@ describe('bodyParser.raw()', function(){
       var test = request(server).post('/')
       test.set('Content-Type', 'application/octet-stream')
       test.write(new Buffer('000102', 'hex'))
-      test.expect(200, '{}', done)
+      test.expect(200, 'undefined', done)
     })
   })
 
@@ -305,7 +305,7 @@ function createServer(opts){
         return
       }
 
-      res.end(JSON.stringify(req.body))
+      res.end(JSON.stringify(req.body) || typeof req.body)
     })
   })
 }

test/text.js

@@ -192,7 +192,7 @@ describe('bodyParser.text()', function(){
       .post('/')
       .set('Content-Type', 'text/plain')
       .send('user is tobi')
-      .expect(200, '{}', done)
+      .expect(200, 'undefined', done)
     })
   })
 
@@ -352,9 +352,14 @@ function createServer(opts){
   var _bodyParser = bodyParser.text(opts)
 
   return http.createServer(function(req, res){
-    _bodyParser(req, res, function(err){
-      res.statusCode = err ? (err.status || 500) : 200;
-      res.end(err ? err.message : JSON.stringify(req.body));
+    _bodyParser(req, res, function (err) {
+      if (err) {
+        res.statusCode = err.status || 500
+        res.end(err.message)
+      }
+
+      res.statusCode = 200;
+      res.end(JSON.stringify(req.body) || typeof req.body);
     })
   })
 }

test/urlencoded.js

@@ -347,7 +347,7 @@ describe('bodyParser.urlencoded()', function(){
       .post('/')
       .set('Content-Type', 'application/x-www-form-urlencoded')
       .send('user=tobi')
-      .expect(200, '{}', done)
+      .expect(200, 'undefined', done)
     })
   })
 
@@ -517,9 +517,14 @@ function createServer(opts){
   var _bodyParser = bodyParser.urlencoded(opts)
 
   return http.createServer(function(req, res){
-    _bodyParser(req, res, function(err){
-      res.statusCode = err ? (err.status || 500) : 200;
-      res.end(err ? err.message : JSON.stringify(req.body));
+    _bodyParser(req, res, function (err) {
+      if (err) {
+        res.statusCode = err.status || 500
+        res.end(err.message)
+      }
+
+      res.statusCode = 200;
+      res.end(JSON.stringify(req.body) || typeof req.body);
     })
   })
 }