fix(ajv): Fix ajv validation when obj is undefined or null

Closes: #254
tsedio · Mar 7, 2018 · d57da29 · d57da29
1 parent 4aae6d2
commit d57da29
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/ajv/services/AjvService.ts b/src/ajv/services/AjvService.ts
@@ -5,7 +5,7 @@ import {
     ServerSettingsService,
     ValidationService
 } from "@tsed/common";
-import {nameOf, Type} from "@tsed/core";
+import {isEmpty, nameOf, Type} from "@tsed/core";
 import * as Ajv from "ajv";
 import {ErrorObject} from "ajv";
 import {BadRequest} from "ts-httpexceptions";
@@ -42,7 +42,7 @@ export class AjvService extends ValidationService {
     public validate(obj: any, targetType: any, baseType?: any): boolean {
         let schema = <any>this.jsonSchemaService.getSchemaDefinition(targetType);
 
-        if (schema) {
+        if (schema && !(obj === null || obj === undefined)) {
             const collection = baseType ? obj : [obj];
             const options = {
                 ignoreCallback: (obj: any, type: any) => type === Date,

diff --git a/src/common/filters/class/FilterBuilder.ts b/src/common/filters/class/FilterBuilder.ts
@@ -114,6 +114,7 @@ export class FilterBuilder {
             try {
                 validationService.validate(value, type, collectionType);
             } catch (err) {
+                console.error(err);
                 throw new ParseExpressionError(param.name, param.expression, err.message);
             }
             return value;

diff --git a/test/integration/app/controllers/RestCtrl.ts b/test/integration/app/controllers/RestCtrl.ts
@@ -1,4 +1,5 @@
-import {Controller, ExpressRouter, Get, Render, RouteService} from "@tsed/common";
+import {Controller, ExpressRouter, Get, PathParams, QueryParams, Render, RouteService} from "@tsed/common";
+import {Returns, Summary} from "@tsed/swagger";
 
 @Controller("/rest")
 export class RestCtrl {

diff --git a/test/units/ajv/services/AjvService.spec.ts b/test/units/ajv/services/AjvService.spec.ts
@@ -54,5 +54,13 @@ describe("AjvService", () => {
 
             return this.ajvService.validate(foo2, JsonFoo2);
         });
+
+        it("should not throws errors (null)", () => {
+            return this.ajvService.validate(null, JsonFoo2);
+        });
+
+        it("should not throws errors (undefined)", () => {
+            return this.ajvService.validate(undefined, JsonFoo2);
+        });
     });
 });