Merge pull request #11 from tinacious/upgrade-joi

Upgrade Joi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-joi-validate",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Simple route validation middleware for Express using Joi",
   "main": "validate.js",
   "scripts": {
@@ -33,6 +33,6 @@
     "handlebars": "v4.1.2"
   },
   "dependencies": {
-    "@hapi/joi": "^v15.0.3"
+    "@hapi/joi": "^v17.1.1"
   }
 }

tests/validate-test.js

@@ -11,51 +11,51 @@ describe('validate() middleware', () => {
         .get('/posts')
         .expect(400, done)
     });
-    
+
     it('returns 200 for successful query validation', (done) => {
       request(server)
         .get('/posts?limit=10')
         .expect(200, 'ok', done)
     });
   });
-  
+
   describe('params validation', () => {
     it('returns 400 for failed params validation', (done) => {
       request(server)
         .get('/contacts/tina')
         .expect(400, done)
     });
-    
+
     it('returns 200 for successful params validation', (done) => {
       request(server)
         .get('/contacts/7')
         .expect(200, 'ok', done)
     });
   });
-  
+
   describe('body validation', () => {
     it('returns 400 for failed body validation', (done) => {
       request(server)
         .post('/contacts')
         .send({ firstName: 'Tina' })
         .expect(400)
         .end((err, res) => {
-          assert.equal(res.body.field, 'email');
+          assert.equal(res.body.field, 'body.email');
           done();
         })
     });
-    
+
     it('returns 200 for successful body validation', (done) => {
       request(server)
         .post('/contacts')
         .send({ firstName: 'Tina', email: '[email protected]' })
         .expect(200, 'ok', done)
     });
   });
-  
+
   it('skips validation if no schema provided', (done) => {
     request(server)
       .get('/health')
       .expect(200, 'ok', done)
   });
-});
+});

validate.js

@@ -25,16 +25,17 @@ const validate = (schema) => (
         }
       });
 
-    return Joi.validate(obj, schema, (err) => {
-      if (err) {
-        const message = `${err.details[0].message.replace(/"/g, "'")} at ${err.details[0].path}`;
-        const field = err.details[0].context.key;
-        res.status(400).json({ message, field }).end();
-        return;
-      }
+    const joiSchema = Joi.object(schema);
+    const { error } = joiSchema.validate(obj);
 
-      return next();
-    });
+    if (error) {
+      const field = error.details[0].path.join('.');
+      const message = error.details[0].message.replace(/"/g, "'");
+
+      return res.status(400).json({ message, field }).end();
+    }
+
+    return next();
   }
 );