fh-forms - npm Package Compare versions

Comparing version 0.5.7 to 0.5.9

lib/common/forms-rule-engine.js

@@ -945,3 +945,3 @@ (function () {
     function validatorFileObj(fieldValue, fieldDefinition, previousFieldValues, cb) {
-      if ((typeof File !== "function") || !(fieldValue instanceof File)) {
+      if ((typeof File !== "function")) {
         return cb(new Error("Expected File object but got " + typeof(fieldValue)));
@@ -1001,2 +1001,4 @@ }
       var testDate;
+      var valid = false;
+      var parts = [];
 
@@ -1009,4 +1011,24 @@ if (typeof(fieldValue) !== "string") {
         case FIELD_TYPE_DATETIME_DATETIMEUNIT_DATEONLY:
+
+          parts = fieldValue.split("/");
+          valid = parts.length === 3;
+
+          if(valid){
+            valid = isNumberBetween(parts[2], 1, 31);
+          }
+
+          if(valid){
+            valid = isNumberBetween(parts[1], 1, 12);
+          }
+
+          if(valid){
+            valid = isNumberBetween(parts[0], 1000, 9999);
+          }
+
           try {
-            testDate = new Date(fieldValue);
+            if(valid){
+              testDate = new Date(parts[3], parts[1], parts[0]);
+            } else {
+              testDate = new Date(fieldValue);
+            }
             valid = (testDate.toString() !== "Invalid Date");
@@ -1016,10 +1038,11 @@ } catch (e) {
           }
+
           if (valid) {
             return cb();
           } else {
-            return cb(new Error("Invalid date value " + fieldValue));
+            return cb(new Error("Invalid date value " + fieldValue + ". Date format is YYYY/MM/DD"));
           }
           break;
         case FIELD_TYPE_DATETIME_DATETIMEUNIT_TIMEONLY:
-          var parts = fieldValue.split(':');
+          parts = fieldValue.split(':');
           valid = (parts.length === 2) || (parts.length === 3);
@@ -1038,17 +1061,51 @@ if (valid) {
           } else {
-            return cb(new Error("Invalid date value " + fieldValue));
+            return cb(new Error("Invalid time value " + fieldValue + ". Time format is HH:MM:SS"));
           }
           break;
         case FIELD_TYPE_DATETIME_DATETIMEUNIT_DATETIME:
+          parts = fieldValue.split(/[- :]/);
+
+          valid = (parts.length === 6) || (parts.length === 5);
+
+          if(valid){
+            valid = isNumberBetween(parts[2], 1, 31);
+          }
+
+          if(valid){
+            valid = isNumberBetween(parts[1], 1, 12);
+          }
+
+          if(valid){
+            valid = isNumberBetween(parts[0], 1000, 9999);
+          }
+
+          if (valid) {
+            valid = isNumberBetween(parts[3], 0, 23);
+          }
+          if (valid) {
+            valid = isNumberBetween(parts[4], 0, 59);
+          }
+          if (valid && parts.length === 6) {
+            valid = isNumberBetween(parts[5], 0, 59);
+          } else {
+            parts[5] = 0;
+          }
+
           try {
-            testDate = new Date(fieldValue);
-
-            if (testDate.toString() === "Invalid Date") {
-              return cb(new Error("Invalid dateTime string " + fieldValue));
+            if(valid){
+              testDate = new Date(parts[0], parts[1], parts[2], parts[3], parts[4], parts[5]);
             } else {
-              return cb();
+              testDate = new Date(fieldValue);
             }
+
+            valid = (testDate.toString() !== "Invalid Date")
           } catch (e) {
-            return cb(new Error("Invalid dateTime string " + fieldValue));
+            valid = false;
           }
+
+          if(valid){
+            return cb();
+          } else {
+            return cb(new Error("Invalid dateTime string " + fieldValue + ". dateTime format is YYYY/MM/DD HH:MM:SS"));
+          }
           break;
@@ -1055,0 +1112,0 @@ default:

package.json

 {
   "name": "fh-forms",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "description": "Cloud Forms API for form submission",
@@ -5,0 +5,0 @@ "main": "lib/forms.js",

VERSION.txt

@@ -1,1 +0,1 @@
-0.5.7-38
+0.5.9-40

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

278506

increased by0.52%

Lines of code

7321

increased by0.6%

No dependency changes