Merge 1305882 into 9a18c94

express-joi-validation.d.ts

@@ -1,6 +1,7 @@
 import * as Joi from '@hapi/joi'
 import * as express from 'express'
 import { IncomingHttpHeaders } from 'http'
+import { ParsedQs } from 'qs'
 
 /**
  * Creates an instance of this module that can be used to generate middleware
@@ -43,7 +44,7 @@ export type ValidatedRequestSchema = Record<ContainerTypes, any>
 export interface ValidatedRequest<T extends ValidatedRequestSchema>
   extends express.Request {
   body: T[ContainerTypes.Body]
-  query: T[ContainerTypes.Query]
+  query: T[ContainerTypes.Query] & ParsedQs
   headers: T[ContainerTypes.Headers]
   params: T[ContainerTypes.Params]
 }
@@ -77,6 +78,7 @@ export interface ValidatedRequestWithRawInputsAndFields<
 export interface ExpressJoiConfig {
   statusCode?: number
   passError?: boolean
+  joi?: object
 }
 
 /**

express-joi-validation.js

@@ -72,9 +72,9 @@ module.exports.createValidator = function generateJoiMiddlewareInstance(cfg) {
 
     instance[type] = function(schema, opts) {
       opts = opts || {} // like config, default to empty object
-
+      const computedOpts = { ...container.joi, ...cfg.joi, ...opts.joi }
       return function expressJoiValidator(req, res, next) {
-        const ret = schema.validate(req[type], opts.joi || container.joi)
+        const ret = schema.validate(req[type], computedOpts)
 
         if (!ret.error) {
           req[container.storageProperty] = req[type]

index.test.js

@@ -58,6 +58,24 @@ describe('express joi', function() {
       }
     )
 
+    app.post(
+      '/global-joi-config',
+      require('body-parser').json(),
+      middleware,
+      (req, res) => {
+        expect(req.body).to.exist
+        expect(req.originalBody).to.exist
+
+        expect(req.originalBody.known).to.exist
+        expect(req.originalBody.known).to.exist
+
+        expect(req.originalBody.unknown).to.exist
+        expect(req.originalBody.unknown).to.exist
+
+        res.end('ok')
+      }
+    )
+
     app.post(
       '/fields-check',
       require('express-formidable')(),
@@ -270,4 +288,29 @@ describe('express joi', function() {
       })
     })
   })
+
+  describe('#joiGlobalOptionMerging.', function() {
+    it('should return a 200 since our body is valid', function(done) {
+      const mod = require('./express-joi-validation.js').createValidator({
+        passError: true,
+        joi: {
+          allowUnknown: true
+        }
+      })
+      const schema = Joi.object({
+        known: Joi.boolean().required()
+      })
+
+      const mw = mod.body(schema)
+
+      getRequester(mw)
+        .post('/global-joi-config')
+        .send({
+          known: true,
+          unknown: true
+        })
+        .expect(200)
+        .end(done)
+    })
+  })
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-joi-validation",
-  "version": "4.0.3",
+  "version": "4.0.4-beta.0",
   "description": "validate express application inputs and parameters using joi",
   "main": "express-joi-validation.js",
   "scripts": {
@@ -34,6 +34,7 @@
     "@types/express-formidable": "~1.0.4",
     "@types/hapi__joi": "~16.0.3",
     "@types/node": "~10.14.18",
+    "@types/qs": "~6.9.3",
     "body-parser": "~1.18.3",
     "chai": "~3.5.0",
     "clear-require": "~2.0.0",
@@ -50,6 +51,7 @@
     "nyc": "~14.1.1",
     "prettier": "~1.14.3",
     "proxyquire": "~1.7.11",
+    "qs": "~6.9.4",
     "sinon": "~1.17.7",
     "supertest": "~3.0.0",
     "typescript": "~3.5.2"