Multiple content type support (#102)

Author: msmol

src/middleware.js

@@ -32,7 +32,7 @@ function validate(...args) {
 function _validateRequest(requestOptions) {
     return Promise.all([
         _validateParams(requestOptions.headers, requestOptions.params, requestOptions.query, requestOptions.files, requestOptions.path, requestOptions.method.toLowerCase()).catch(e => e),
-        _validateBody(requestOptions.body, requestOptions.path, requestOptions.method.toLowerCase()).catch(e => e)
+        _validateBody(requestOptions.body, requestOptions.path, requestOptions.method.toLowerCase(), requestOptions.headers['content-type']).catch(e => e)
     ]).then(function (errors) {
         if (errors[0] || errors[1]) {
             return errors[0] && errors[1] ? Promise.reject(errors[0].concat(errors[1])) : errors[0] ? Promise.reject(errors[0]) : Promise.reject(errors[1]);
@@ -52,11 +52,15 @@ function _validateRequest(requestOptions) {
     });
 }
 
-function _validateBody(body, path, method) {
+function _validateBody(body, path, method, contentType) {
     return new Promise(function (resolve, reject) {
-        const methodSchema = schemaEndpointResolver.getMethodSchema(schemas, path, method);
-        if (methodSchema && methodSchema.body && !methodSchema.body.validate(body)) {
-            return reject(methodSchema.body.errors);
+        const methodSchema = schemaEndpointResolver.getMethodSchema(schemas, path, method) || {};
+
+        if (methodSchema.body) {
+            const validator = methodSchema.body[contentType] || methodSchema.body;
+            if (!validator.validate(body)) {
+                return reject(validator.errors);
+            }
         }
         return resolve();
     });

test/openapi3/openapi3-test.js

@@ -68,6 +68,40 @@ describe('input-validation middleware tests', function () {
                     done();
                 });
         });
+        it('validate depending on content-type -- valid dog', function (done) {
+            request(app)
+                .post('/pet')
+                .set('public-key', '1.0')
+                .set('content-type', 'application/x-www-form-urlencoded')
+                .send({
+                    bark: 'foo'
+                })
+                .expect(200, function (err, res) {
+                    if (err) {
+                        throw err;
+                    }
+                    expect(res.body.result).to.equal('OK');
+                    done();
+                });
+        });
+        it('validate depending on content-type -- invalid dog', function (done) {
+            request(app)
+                .post('/pet')
+                .set('public-key', '1.0')
+                .set('content-type', 'application/x-www-form-urlencoded')
+                .send({
+                    bark: 'not foo'
+                })
+                .expect(400, function (err, res) {
+                    if (err) {
+                        throw err;
+                    }
+                    expect(res.body).to.deep.equal({
+                        'more_info': '["body/bark should be equal to one of the allowed values [foo,bar]","body should have required property \'fur\'","body should match exactly one schema in oneOf"]'
+                    });
+                    done();
+                });
+        });
         it('valid cat', function (done) {
             request(app)
                 .post('/pet')

test/openapi3/pets.yaml

@@ -138,6 +138,9 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/pet'
+          application/x-www-form-urlencoded:
+            schema:
+              $ref: '#/components/schemas/pet2'
         description: Create pet
         required: true
   /dog/{id}:
@@ -493,6 +496,12 @@ components:
       oneOf:
         - $ref: '#/components/schemas/dog_object'
         - $ref: '#/components/schemas/cat_object'
+    pet2:
+      description: pet
+      type: object
+      oneOf:
+        - $ref: '#/components/schemas/dog_object2'
+        - $ref: '#/components/schemas/cat_object'
     pets:
       type: array
       items:
@@ -549,6 +558,16 @@ components:
       properties:
         bark:
           type: string
+    dog_object2:
+      type: object
+      required:
+        - bark
+      properties:
+        bark:
+          type: string
+          enum:
+            - foo
+            - bar
     dog_multiple:
       type: object
       required:

test/openapi3/test-server-pet.js

@@ -18,6 +18,7 @@ module.exports = function (options) {
     inputValidation.init(`${__dirname}/pets.yaml`, options || inputValidationOptions);
     const app = express();
     app.use(bodyParser.json());
+    app.use(bodyParser.urlencoded());
 
     app.get('/pets', inputValidation.validate, function (req, res, next) {
         res.json({ result: 'OK' });