@stbmoz-onboarding/core 1.0.32 → 1.0.35

package/Functions/functions.js

@@ -1,4 +1,4 @@
-const { isAboveMaxLength, isMinLength, notIncludes, isIn } = require("./../Validations")
+const { isAboveMaxLength, isMinLength, allowedCharsOnly, isIn } = require("./../Validations")
 
 const feedbacks = {
   oversized: "Ultrapassou o limite de caracteres",
@@ -53,13 +53,11 @@ module.exports.Sanitize = (values, key, errors, isRequired, failMessage, _minLen
 
     if (!values[key] && isRequired) {
         errors[key] = feedbacks.required
-    } else if (!notIncludes(values[key], allowedChars)) {
+    } else if (allowedCharsOnly(values[key], allowedChars)) {
         if (!isMinLength(values[key], _minLength)) {
             errors[key] = failMessage
-        } else {
-            if (!isAboveMaxLength(values[key], _maxLength)) {
+        } else if (isAboveMaxLength(values[key], _maxLength)) {
                 errors[key] = feedbacks.oversized
-            }
         }
     } else {
         errors[key] = feedbacks.invalidChars

package/Validations/rules.js

@@ -2,6 +2,15 @@
 //Allowed prefixes
 const AllowedPrefixes = ['25884', '25885', '25886', '25887', '25882', '25883']
 
+
+module.exports.isIn = (value, optionsArray) => {
+    try {
+        return optionsArray.includes(value)
+    } catch (error) {
+        return false
+    }
+}
+
 // Check is a guiven email is valid
 module.exports.isEmailValid = (email) => {
     if (/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(email)) {
@@ -59,18 +68,16 @@ module.exports.isLength = (value, length) => {
 module.exports.allowedCharsOnly = (stringToTest, charSet) => {
     try {
         let stringToCheck = stringToTest.toString()
-        const dictionary = charSet.split('')
-
+        const dictionary = charSet
+      
         if (stringToCheck.length > 0) {
-            let phrase = stringToCheck.toLowerCase()
-            phrase = phrase.replace(/(\r\n|\n|\r)/gm, " ");
-            phrase = phrase.split('');
-            return !(phrase.some(function (item) {
-                if (!dictionary.includes(item)) {
-                    return true
-                }
-            }
-            ))
+          let phrase = stringToCheck.toLowerCase()
+          phrase = phrase.replace(/(\r\n|\n|\r)/gm, " ");
+          phrase = phrase.split('')
+          return !(phrase.some(item => {
+            return !(dictionary.includes(item))
+          }
+          ))
         }
     } catch (e) {
         return false
@@ -87,14 +94,6 @@ module.exports.isInteger = (number) => {
     if (Number.isInteger(number)) return true
 }
 
-module.exports.isIn = (value, optionsArray) => {
-    try {
-        return optionsArray.includes(value)
-    } catch (error) {
-        return false
-    }
-}
-
 module.exports.isContactValid = (number) => {
     if (!number) {
         return false
@@ -104,7 +103,7 @@ module.exports.isContactValid = (number) => {
             if (/^([0-9]{12})$/.test(number)) {
                 const prefix = numb.slice(0, 5)
 
-                if (isIn(prefix, AllowedPrefixes)) {
+                if (this.isIn(prefix, AllowedPrefixes)) {
                     return true
                 }
                 return false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stbmoz-onboarding/core",
   "type": "commonjs",
-  "version": "1.0.32",
+  "version": "1.0.35",
   "description": "\"core module\"",
   "main": "index.js",
   "scripts": {