@osimatic/helpers-js 1.0.95 → 1.0.97

package/CHANGELOG

@@ -48,4 +48,7 @@ FormHelper.displayFormErrorsFromXhr(form, btnSubmit, xhr) -> FormHelper.displayF
 ajout méthode HTTPRequest.init() (charge le polyfill de fetch)
 
 1.0.61
-DataTable.displayErrorFromXhr -> DataTable.displayError
+DataTable.displayErrorFromXhr -> DataTable.displayError
+
+1.0.96
+var intlTelInputUtilsPath = 'xxx'; -> TelephoneNumber.setIntlTelInputUtilsPath('xxx');

package/contact_details.js

@@ -2,7 +2,7 @@
 class PersonName {
 
 	static format(firstName, lastName) {
-		var str = '';
+		let str = '';
 		if (firstName != null && firstName != '') {
 			str += ' '+firstName;
 		}
@@ -17,12 +17,8 @@ class PersonName {
 			return false;
 		}
 
-		var regEx = /^([a-zA-Z'àâäéèêëìîïòôöùûüçÀÂÄÉÈÊËÌÎÏÒÔÖÙÛÜÇ\s-]+)$/;
-		if (regEx.exec(firstName) == null) {
-			return false;
-		}
-
-		return true;
+		let regEx = /^([a-zA-Z'àâäéèêëìîïòôöùûüçÀÂÄÉÈÊËÌÎÏÒÔÖÙÛÜÇ\s-]+)$/;
+		return regEx.exec(firstName) != null;
 	}
 
 	static checkLastName(lastName) {
@@ -30,30 +26,30 @@ class PersonName {
 			return false;
 		}
 
-		var regEx = /^([a-zA-Z'àâäéèêëìîïòôöùûüçÀÂÄÉÈÊËÌÎÏÒÔÖÙÛÜÇ\s-]+)$/;
-		if (regEx.exec(lastName) == null) {
-			return false;
-		}
-
-		return true;
+		let regEx = /^([a-zA-Z'àâäéèêëìîïòôöùûüçÀÂÄÉÈÊËÌÎÏÒÔÖÙÛÜÇ\s-]+)$/;
+		return regEx.exec(lastName) != null;
 	}
 }
 
 class Email {
 	static validateEmail(email) {
-		var re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+		let re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 		return re.test(email);
 	}
 
 	static checkEmail(email) {
-		var regExEmail = /^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$/;
-		return (regExEmail.exec(email) != null);
+		let regExEmail = /^[\w.-]+@[\w.-]+\.[a-zA-Z]{2,5}$/;
+		return regExEmail.exec(email) != null;
 	}
 }
 
 class TelephoneNumber {
 	//this class works with libphonenumber-max.min.js
-	
+
+	static setIntlTelInputUtilsPath(path) {
+		TelephoneNumber.intlTelInputUtilsPath = path;
+	}
+
 	static getCountryIsoCode(phoneNumber, localCountryIsoCode) {
 		localCountryIsoCode = (typeof localCountryIsoCode != 'undefined' ? localCountryIsoCode.toUpperCase() : serviceCountry);
 		return libphonenumber.parsePhoneNumber(phoneNumber, localCountryIsoCode).country || '';
@@ -99,19 +95,12 @@ class TelephoneNumber {
 	}
 
 	static checkSyntaxe(phoneNumber) {
-		var verifPhoneFr = /^(0)[1-9]{1}[ \.\-]?[0-9]{2}[ \.\-]?[0-9]{2}[ \.\-]?[0-9]{2}[ \.\-]?[0-9]{2}$/;
-		var verifPhoneInt = /^((\+)|(00))[1-9]{1}[0-9]{0,3}([ \.\-\/]?[0-9]{1}){4,20}$/;
-		// var verifPhoneInt = /^((\+)|(00))([ \.\-\/]?[0-9]{1}){6-20}$/;
-		//var verifPhone = /^[0-9+() .-]{6,32}$/;
+		let verifPhoneFr = /^(0)[1-9]{1}[ \.\-]?[0-9]{2}[ \.\-]?[0-9]{2}[ \.\-]?[0-9]{2}[ \.\-]?[0-9]{2}$/;
+		let verifPhoneInt = /^((\+)|(00))[1-9]{1}[0-9]{0,3}([ \.\-\/]?[0-9]{1}){4,20}$/;
 		if (verifPhoneFr.exec(phoneNumber) != null) {
 			return true;
 		}
-		if (verifPhoneInt.exec(phoneNumber) != null) {
-			return true;
-		}
-		//console.log(verifPhoneInt);
-		// console.log('"'+phoneNumber+'" not valid');
-		return false;
+		return verifPhoneInt.exec(phoneNumber) != null;
 	}
 	
 	static getType(phoneNumber, localCountryIsoCode) {
@@ -150,7 +139,7 @@ class TelephoneNumber {
 		return window.intlTelInput(input[0], {
 			initialCountry: serviceCountry,
 			placeholderNumberType: placeholderNumberType || 'FIXED_LINE_OR_MOBILE',
-			utilsScript: intlTelInputUtilsPath
+			utilsScript: typeof TelephoneNumber.intlTelInputUtilsPath != 'undefined' ? TelephoneNumber.intlTelInputUtilsPath : null
 		});
 	}
 
@@ -159,7 +148,7 @@ class TelephoneNumber {
 	}
 
 	static formatNumberFromIntlTelInput(intlTelInput) {
-		var number = intlTelInput.getNumber();
+		let number = intlTelInput.getNumber();
 		if (number != '' && number.substr(0, 1) !== '+') {
 			number = '+' + intlTelInput.getSelectedCountryData().dialCode + number;
 		}

package/jwt.js

@@ -1,8 +1,8 @@
 class JwtToken {
 	static parseJwt (token) {
-		var base64Url = token.split('.')[1];
-		var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
-		var jsonPayload = decodeURIComponent(atob(base64).split('').map(function(c) {
+		let base64Url = token.split('.')[1];
+		let base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+		let jsonPayload = decodeURIComponent(atob(base64).split('').map(function(c) {
 			return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
 		}).join(''));
 
@@ -15,7 +15,19 @@ class JwtToken {
 		}
 
 		let payload = JwtToken.parseJwt(token);
-		return payload.roles.indexOf(role) !== -1;
+		return typeof payload['roles'] != 'undefined' && payload['roles'].indexOf(role) !== -1;
+	}
+
+	static getData(token, key) {
+		if (token == null) {
+			return null;
+		}
+
+		let payload = JwtToken.parseJwt(token);
+		if (typeof payload[key] != 'undefined') {
+			return payload[key];
+		}
+		return null;
 	}
 }
 
@@ -66,16 +78,7 @@ class JwtSession {
 	}
 
 	static getData(key) {
-		let token = JwtSession.getToken();
-		if (token == null) {
-			return null;
-		}
-
-		let payload = JwtToken.parseJwt(token);
-		if (typeof payload[key] != 'undefined') {
-			return payload[key];
-		}
-		return null;
+		return JwtToken.getData(JwtSession.getToken(), key);
 	}
 
 	static isAnonymous() {
@@ -83,13 +86,7 @@ class JwtSession {
 	}
 
 	static isGranted(role) {
-		let token = localStorage.getItem('access_token');
-		if (token == null) {
-			return false;
-		}
-
-		let payload = JwtToken.parseJwt(token);
-		return payload.roles.indexOf(role) !== -1;
+		return JwtToken.hasRole(JwtSession.getToken(), role);
 	}
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osimatic/helpers-js",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"