Merge pull request #11 from SSENSE/bug/number_null

Fix bug where validation is failing when type=number and value=null
SSENSE · Jan 17, 2017 · 7939686 · 7939686
2 parents 5832261 + 7ce9f14
commit 7939686
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 16 deletions.
diff --git a/js/ParamValidation.js.map b/js/ParamValidation.js.map
diff --git a/js/RequestValidator.js b/js/RequestValidator.js
diff --git a/js/RequestValidator.js.map b/js/RequestValidator.js.map
diff --git a/js/index.js b/js/index.js
diff --git a/js/index.js.map b/js/index.js.map
diff --git a/tests/unit/RequestValidator.ts b/tests/unit/RequestValidator.ts
@@ -190,6 +190,48 @@ describe('RequestValidator', () => {
         });
     });
 
+    it('RequestValidator::validate() number', () => {
+        expected = undefined;
+        validator.validate(
+            {
+                route: {
+                    validation: {
+                        query: {
+                            id: {type: 'number', required: false}
+                        }
+                    }
+                }, query: {}
+            },
+            null, test
+        );
+
+        expected = undefined;
+        const req: any = {
+            route: {
+                validation: {
+                    body: {
+                        id: {type: 'number', required: false, min: 0}
+                    }
+                }
+            }, params: {
+                id: null
+            }
+        };
+        validator.validate(
+            {
+                route: {
+                    validation: {
+                        body: {
+                            id: {type: 'number', required: false, min: 0}
+                        }
+                    }
+                }, params: {
+                    id: null
+                }
+            }, null, test
+        );
+    });
+
     it('RequestValidator::validate() min', () => {
         expected = 'Query: Param id must have a minimum length of 2';
         validator.validate(

diff --git a/ts/RequestValidator.ts b/ts/RequestValidator.ts
@@ -234,10 +234,13 @@ export class RequestValidator {
             }
 
             // Check min
-            if (RequestValidator.checkMin(input[key], paramValidation.min) !== true) {
-                errorMessages.push(
-                    this.getErrorMessage(key, 'min', `Param ${key} must have a minimum length of ${paramValidation.min}`)
-                );
+            // Pass if min=0 and value==null
+            if (paramValidation.min !== 0 && input[key] !== null) {
+                if (RequestValidator.checkMin(input[key], paramValidation.min) !== true) {
+                    errorMessages.push(
+                        this.getErrorMessage(key, 'min', `Param ${key} must have a minimum length of ${paramValidation.min}`)
+                    );
+                }
             }
 
             // Check max
@@ -302,7 +305,7 @@ export class RequestValidator {
 
         if (inputType === 'undefined') {
             return true;
-        } else if (typeValidation.type === 'numeric') {
+        } else if (typeValidation.type === 'numeric' || typeValidation.type === 'number') {
             const isNumeric = !isNaN(typeValidation.value);
             if (isNumeric === true) {
                 typeValidation.value = parseInt(typeValidation.value, 10);