Merge pull request #80 from nzzdev/release-2.7.1

v 2.7.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nzz/q-server",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -20,13 +20,13 @@
   },
   "homepage": "https://github.com/nzzdev/Q-server#readme",
   "dependencies": {
+    "ajv": "^5.3.0",
     "boom": "^4.2.0",
     "catbox-memory": "^2.0.4",
     "chai": "^3.5.0",
     "clone": "^2.1.1",
     "confidence": "^3.0.2",
     "deepmerge": "^1.5.0",
-    "enjoi": "^2.2.3",
     "good": "^7.1.0",
     "good-console": "^6.4.0",
     "good-squeeze": "^5.0.2",

routes/item.js

@@ -1,24 +1,26 @@
 const getDb = require('../db.js').getDb;
 const Boom = require('boom');
 const Joi = require('joi');
-const Enjoi = require('enjoi');
+const Ajv = require('ajv');
+const ajv = new Ajv();
+// add draft-04 support explicit
+ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
 
 function validateAgainstSchema(request, doc) {
   return new Promise((resolve, reject) => {
     request.server.inject(`/tools/${doc.tool}/schema.json`, (response) => {
       if (response.statusCode !== 200) {
         reject(Boom.internal(`Error occured while fetching schema of tool ${doc.tool}`));
       }
-  
-      let schema = Enjoi(JSON.parse(response.payload));
-      let result = Joi.validate(doc, schema, {
-         stripUnknown: true
-      });
-
-      if (result.error) {
-        reject(Boom.badRequest(result.error.message));
+
+      const schema = JSON.parse(response.payload);
+
+      const validate = ajv.compile(schema);
+      if (validate(doc)) {
+        resolve(true);
+      } else {
+        reject(Boom.badRequest(JSON.stringify(validate.errors)));
       }
-      resolve(true);
     });
   });
 }