@carecard/validate 2.0.3 → 2.0.5

package/lib/validate.js

@@ -65,7 +65,7 @@ const isPasswordString = password => {
 
 const isSimplePasswordString = password => {
     if (password === undefined || typeof password !== "string" || password.length === 0) return false;
-    const regExPassword = /^[a-zA-Z0-9!@#$%^&*_-]{6,32}$/;
+    const regExPassword = /^[a-zA-Z0-9!@#$%^&*_-]{8,24}$/;
     return regExPassword.test(String(password));
 }
 
@@ -161,6 +161,13 @@ const isCountryCodeString = (str) => {
     return postalCodeRegex.test(str);
 };
 
+const isValidDomainName = (domain) => {
+    if (domain === undefined || typeof domain !== "string" || domain.length === 0 || domain.length > 253) return false;
+
+    const domainRegex = /^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$/i;
+    return domainRegex.test(domain);
+};
+
 module.exports = {
     isImageUrl,
     isInteger,
@@ -186,5 +193,6 @@ module.exports = {
     isPostalCodeString,
     isSafeString,
     isInStringArray,
-    isCountryCodeString
+    isCountryCodeString,
+    isValidDomainName
 };

package/lib/validateProperties.js

@@ -1,106 +1,112 @@
 // Validate the property values format.
 const {
-    isEmailString,
-    isPhoneNumber,
-    isUrlSafeString,
-    isValidUuidString,
-    isSimplePasswordString,
-    isPasswordString,
-    isString6To16CharacterLong,
-    isNameString,
-    isSafeSearchString,
-    isCharactersString,
-    isValidIntegerString,
-    isValidJsonString, isImageUrl
-} = require( "./validate" );
+  isEmailString,
+  isPhoneNumber,
+  isUrlSafeString,
+  isValidUuidString,
+  isSimplePasswordString,
+  isPasswordString,
+  isNameString,
+  isSafeSearchString,
+  isCharactersString,
+  isValidIntegerString,
+  isValidJsonString,
+  isImageUrl,
+  isValidDomainName,
+} = require('./validate');
 
-function validateProperties( obj ) {
-    let returnObj = {};
+function validateProperties(obj) {
+  let returnObj = {};
 
-    for ( let [ key, value ] of Object.entries( obj || {} ) ) {
+  for (let [key, value] of Object.entries(obj || {})) {
 
-        switch ( key ) {
-            case "first_name" :
-            case "username" :
-            case "newStatus":
-            case "description":
-            case "comment":
-            case "status":
-            case "name":
-            case "title" :
-            case "brand":
-            case "short_description" :
-                isNameString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "search_string":
-            case "searchString":
-                isSafeSearchString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "password" :
-            case "new_password" :
-                isString6To16CharacterLong( value ) && isSimplePasswordString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "strong_password" :
-                isString6To16CharacterLong( value ) && isPasswordString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "email" :
-                isEmailString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "phone_number":
-                isPhoneNumber( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "token":
-            case "email_confirm_token":
-            case "verification_token":
-                isUrlSafeString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "uuid":
-            case "item_id":
-            case "user_id":
-            case "userId":
-            case "image_id":
-            case "itemId":
-            case "userId":
-            case "orderId":
-            case "category_id":
-            case "parent_id":
-                isValidUuidString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "period":
-                isCharactersString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "offset_number":
-            case "number_of_orders":
-            case "price":
-                isValidIntegerString( value ) ?
-                    returnObj[ key ] = value : null;
-                break;
-            case "about":
-                isValidJsonString( value ) ? returnObj[ key ] = value.trim() : null;
-                break;
-            case "weight":
-            case "dimensions":
-            case "permission":
-                isValidJsonString( JSON.stringify( value ) ) ? returnObj[ key ] = value : null;
-                break;
-            case "image_url":
-                isImageUrl( value ) ? returnObj[ key ] = value : null;
-                break;
-        }
+    switch (key) {
+      case 'first_name' :
+      case 'username' :
+      case 'newStatus':
+      case 'description':
+      case 'comment':
+      case 'status':
+      case 'name':
+      case 'title' :
+      case 'brand':
+      case 'short_description' :
+        isNameString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'search_string':
+      case 'searchString':
+        isSafeSearchString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'password' :
+      case 'new_password' :
+        isSimplePasswordString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'strong_password' :
+        isPasswordString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'email' :
+        isEmailString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'phone_number':
+        isPhoneNumber(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'token':
+      case 'email_confirm_token':
+      case 'verification_token':
+        isUrlSafeString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'uuid':
+      case 'item_id':
+      case 'user_id':
+      case 'userId':
+      case 'image_id':
+      case 'itemId':
+      case 'orderId':
+      case 'category_id':
+      case 'parent_id':
+        isValidUuidString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'period':
+        isCharactersString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'offset_number':
+      case 'number_of_orders':
+      case 'price':
+        isValidIntegerString(value) ?
+          returnObj[key] = value : null;
+        break;
+      case 'about':
+        isValidJsonString(value) ? returnObj[key] = value.trim() : null;
+        break;
+      case 'weight':
+      case 'dimensions':
+      case 'permission':
+        isValidJsonString(JSON.stringify(value)) ? returnObj[key] = value : null;
+        break;
+      case 'image_url':
+        isImageUrl(value) ? returnObj[key] = value : null;
+        break;
+      case 'domain_name':
+      case 'domain':
+      case 'email_domain':
+      case 'email_domain_name':
+        isValidDomainName(value) ? returnObj[key] = value : null;
+        break;
     }
+  }
 
-    return returnObj;
+  return returnObj;
 }
 
 module.exports = {
-    validateProperties
+  validateProperties,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carecard/validate",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/CareCard-ca/pkg-validate.git"