fix: pass nested additionalProperty to validateSchema errors (#712)

Author: ardcore

src/hooks/validate-schema.ts

@@ -83,9 +83,10 @@ function addNewErrorDflt(errorMessages: any, ajvError: any, itemsLen: any, index
     message = `'${leader}${ajvError.dataPath.substring(1)}' ${ajvError.message}`;
   } else {
     message = `${leader}${ajvError.message}`;
-    if (ajvError.params && ajvError.params.additionalProperty) {
-      message += `: '${ajvError.params.additionalProperty}'`;
-    }
+  }
+
+  if (ajvError.params && ajvError.params.additionalProperty) {
+    message += `: '${ajvError.params.additionalProperty}'`;
   }
 
   return (errorMessages || []).concat(message);

test/hooks/validate-schema.test.ts

@@ -11,6 +11,10 @@ ajv.addSchema({
   properties: {
     first: { type: 'string', format: 'startWithJo' },
     last: { type: 'string' },
+    nested: {
+      type: 'object',
+      additionalProperties: false,
+    },
   },
   required: ['first', 'last'],
 });
@@ -55,13 +59,19 @@ describe('services validateSchema', () => {
       properties: {
         first: { type: 'string' },
         last: { type: 'string' },
+        nested: {
+          additionalProperties: false,
+        },
       },
       required: ['first', 'last'],
     };
     schemaForAjvInstance = {
       properties: {
         first: { type: 'string', format: 'startWithJo' },
         last: { type: 'string' },
+        nested: {
+          additionalProperties: false,
+        },
       },
       required: ['first', 'last'],
     };
@@ -161,6 +171,17 @@ describe('services validateSchema', () => {
         ]);
       }
     });
+
+    it('properly displays incorrect additional properties in nested objects', () => {
+      hookBefore.data.nested = { foo: 'bar' };
+
+      try {
+        validateSchema(schemaForAjvInstance, ajv)(hookBefore);
+        assert.fail(true, false, 'test succeeds unexpectedly');
+      } catch (err: any) {
+        assert.deepEqual(err.errors, ["'nested' should NOT have additional properties: 'foo'"]);
+      }
+    });
   });
 
   describe('Async validation', () => {