Merge pull request #2373 from blackflux/dev

[Gally]: master <- dev

Author: simlu

src/param/_abstract.js

@@ -58,10 +58,20 @@ class Abstract {
       if (this.nullable !== true) {
         throw ApiErrorFn(`Non-nullable ${this.position}-Parameter "${this.name}" is null.`, 400, 99006);
       }
-    } else if (!this.validate(result)) {
-      throw ApiErrorFn(`Invalid Value for ${this.position}-Parameter "${this.name}" provided.`, 400, 99003, {
-        value: result
-      });
+    } else {
+      let valid = false;
+      let details = null;
+      try {
+        valid = this.validate(result);
+      } catch (e) {
+        details = e.message;
+      }
+      if (valid !== true) {
+        throw ApiErrorFn(`Invalid Value for ${this.position}-Parameter "${this.name}" provided.`, 400, 99003, {
+          value: result,
+          ...(typeof details === 'string' ? { details } : {})
+        });
+      }
     }
     result = this.getter !== null && ![undefined, null].includes(result)
       ? (params) => this.getter(result, params)

src/param/json.js

@@ -21,8 +21,11 @@ class Json extends Abstract {
         valid = false;
       }
     }
-    if (valid && !Joi.test(valueParsed, this.schema)) {
-      valid = false;
+    if (valid) {
+      const { error } = this.schema.validate(valueParsed);
+      if (error !== undefined) {
+        throw error;
+      }
     }
     return valid;
   }

test/param/json.spec.js

@@ -38,11 +38,9 @@ describe('Testing Json Parameter', () => {
     })).to.deep.equal({ key: 'value' });
   });
 
-  it('Testing invalid json parameter', () => {
-    expect(() => jsonParam.get({
-      body: {
-        param: 'string'
-      }
-    })).to.throw('Invalid Value for json-Parameter "param" provided.');
+  it('Testing invalid json parameter', async ({ capture }) => {
+    const err = await capture(() => jsonParam.get({ body: { param: 'string' } }));
+    expect(err.message).to.equal('Invalid Value for json-Parameter "param" provided.');
+    expect(err.context).to.deep.equal({ value: 'string', details: '"value" must be of type object' });
   });
 });