Merge pull request #1 from mfahlandt/add-xmltype-as-parameter

add possibility to hand over custom content type as option

Author: fiznool

README.md

@@ -35,12 +35,14 @@ app.use(bodyParser.xml());
 
 This will parse any XML-based request and place it as a JavaScript object on `req.body` for your route handlers to use.
 
-An XML-based request is determined by the value of the `Content-Type` header. If this ends in `xml`, it will be parsed as XML. For example, the following Content-Types will all match:
+An XML-based request is determined by the value of the `Content-Type` header. If this ends in `/xml` or `/+xml`, it will be parsed as XML. For example, the following Content-Types will all match:
 
 - `text/xml`
 - `application/xml`
 - `application/rss+xml`
 
+But you can also set your own see Options:type
+
 ### Options
 
 You can also pass in options:
@@ -63,6 +65,12 @@ When set to `true`, then deflated (compressed) bodies will be inflated; when `fa
 
 Controls the maximum request body size. If this is a number, then the value specifies the number of bytes; if it is a string, the value is passed to the [bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults to `'100kb'`.
 
+
+#### type
+
+set your own valid Content-Type that will be parsed, can be a string or an array, already valid topics are '*/xml', '+xml'
+
+
 #### verify
 
 The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`, where `buf` is a `Buffer` of the raw request body and `encoding` is the encoding of the request. The parsing can be aborted by throwing an error.

index.js

@@ -3,27 +3,36 @@
 var xml2js = require('xml2js');
 
 module.exports = function(bodyParser) {
+  var xmlTypes = ['*/xml', '+xml'];
   if(bodyParser.xml) {
     // We already setup the XML parser.
     // End early.
     return;
   }
 
-  var xmlTypes = ['*/xml', '+xml'];
-
   function xml(options) {
+    var textParser;
     options = options || {};
-    options.type = xmlTypes;
+    if(options.type){
+      if(Array.isArray(options.type)){
+        xmlTypes = options.type.concat(xmlTypes);
+      }else if(typeof options.type === 'string'){
+        xmlTypes.push(options.type);
+      }
+      options.type = xmlTypes;
+    }
 
-    var textParser = bodyParser.text(options);
+    options.type = xmlTypes;
+    textParser= bodyParser.text(options);
     return function xmlParser(req, res, next) {
+      var parser;
       // First, run the body through the text parser.
       textParser(req, res, function(err) {
         if(err) { return next(err); }
         if(typeof req.body !== 'string') { return next(); }
 
         // Then, parse as XML.
-        var parser = new xml2js.Parser(options.xmlParseOptions);
+        parser = new xml2js.Parser(options.xmlParseOptions);
         parser.parseString(req.body, function(err, xml) {
           if(err) {
             err.status = 400;

test.js

@@ -65,10 +65,32 @@ describe('XML Body Parser', function() {
     request(app)
       .post('/')
       .set('Content-Type', 'text/xml')
-      .send('<CUSTOMER><name>  Bob </name></CUSTOMER>')
+      .send('<CUSTOMER><name>Bob</name></CUSTOMER>')
       .expect(200, { parsed: { customer: { name: 'Bob' } } }, done);
   });
 
+  it('should accept custom ContentType as array', function(done) {
+    createServer({
+      type: ['application/custom-xml-type']
+    });
+    request(app)
+        .post('/')
+        .set('Content-Type', 'application/custom-xml-type')
+        .send('<customer><name>Bob</name></customer>')
+        .expect(200, { parsed: { customer: { name: ['Bob'] } } }, done);
+  });
+
+  it('should accept custom ContentType as string', function(done) {
+    createServer({
+      type: 'application/custom-xml-type'
+    });
+    request(app)
+        .post('/')
+        .set('Content-Type', 'application/custom-xml-type')
+        .send('<customer><name>Bob</name></customer>')
+        .expect(200, { parsed: { customer: { name: ['Bob'] } } }, done);
+  });
+
   it('should ignore non-XML', function(done) {
     createServer();