@osimatic/helpers-js 1.2.8 → 1.3.1

package/CHANGELOG

@@ -73,4 +73,6 @@ Toutes les fonctions des classes SqlTime, SqlDate et SqlDateTime prennent mainte
 1.1.66
 Duration.convertToDurationAsCentieme() -> Duration.convertToDurationAsHundredthOfAnHour()
 
+1.3.0
+HTTPRequest -> HTTPClient
 

package/chartjs.js

@@ -0,0 +1,309 @@
+class Chartjs {
+	static init() {
+		if (typeof Chartjs.initialized == 'undefined' || Chartjs.initialized) {
+			return;
+		}
+
+		Chartjs.initialized = true;
+
+		const centerTextPlugin = {
+			id: 'centerText',
+			afterDraw(chart) {
+				if (typeof chart.config.options.centerText == 'undefined' || !chart.config.options.centerText.display) {
+					return;
+				}
+
+				const { ctx, chartArea: { width, height } } = chart;
+				ctx.save();
+				const total = chart.data.datasets[0].data.reduce((a,b) => a+b, 0);
+				const label = chart.config.options.centerText.label || '';
+				const fontSize = chart.config.options.centerText.fontSize || 16;
+				const textColor = chart.config.options.centerText.color || '#333';
+
+				ctx.font = `bold ${fontSize}px sans-serif`;
+				ctx.fillStyle = textColor;
+				ctx.textAlign = 'center';
+				ctx.textBaseline = 'middle';
+				ctx.fillText(`${total}`, width / 2, height / 2);
+				if (label) {
+					ctx.font = `12px sans-serif`;
+					ctx.fillText(label, width / 2, height / 2 + 20);
+				}
+				ctx.restore();
+			}
+		};
+
+		Chart.register(centerTextPlugin);
+	}
+
+	static createStackedChart(chartDiv, chartData, title=null, options={}) {
+		chartDiv.empty();
+		new Chart(chartDiv.get(0).getContext("2d"), $.extend(true, {}, {
+			type: "bar",
+			data: {
+				labels: chartData.labels,
+				datasets: chartData.datasets
+			},
+			options: {
+				responsive: true,
+				scales: {
+					x: {
+						stacked: true
+					},
+					y: {
+						stacked: true,
+						beginAtZero: true,
+						ticks: {
+							precision: 0
+						},
+					}
+				},
+				plugins: {
+					title: {
+						display: null !== title,
+						text: title || '',
+						font: { size: 14 },
+						color: "#333",
+						padding: { top: 10, bottom: 20 }
+					},
+					legend: {
+						position: "bottom",
+						labels: {
+							usePointStyle: true,
+							padding: 15
+						}
+					},
+					tooltip: {
+						callbacks: {
+							label: function(context) {
+								return `${context.dataset.label}: ${context.parsed.y}`;
+							}
+						}
+					}
+				}
+			}
+		}, options));
+	}
+
+	static createBarChart(chartDiv, chartData, title=null, options={}) {
+		chartDiv.empty();
+		new Chart(chartDiv.get(0).getContext("2d"), $.extend(true, {}, {
+			type: "bar",
+			data: {
+				labels: chartData.labels,
+				datasets: chartData.datasets
+			},
+			options: {
+				responsive: false,
+				maintainAspectRatio: false,
+				aspectRatio: 2,
+				scales: {
+					x: {
+						grid: {
+							display: false
+						},
+						/*ticks: {
+							font: { size: 12 }
+						}*/
+					},
+					y: {
+						beginAtZero: true,
+						ticks: {
+							precision: 0
+							//stepSize: 10, font: { size: 12 }
+						},
+						grid: {
+							color: "#eee"
+						}
+					}
+				},
+				plugins: {
+					title: {
+						display: null !== title,
+						text: title || '',
+						font: { size: 14 },
+						color: "#333",
+						padding: { top: 10, bottom: 20 }
+					},
+					legend: {
+						display: chartData.datasets.length > 1,
+						position: "bottom",
+					},
+					tooltip: {
+						callbacks: {
+							label: context => context.dataset.label + ' : ' + context.parsed.y
+							//label: (context) => `${context.formattedValue} pointages`
+						}
+					}
+				},
+				animation: {
+					duration: 1200,
+					easing: "easeOutQuart"
+				}
+			}
+		}, options));
+	}
+
+	static createLineChart(chartDiv, chartData, title=null, options={}) {
+		Chartjs.init();
+
+		chartDiv.empty();
+		new Chart(chartDiv.get(0).getContext("2d"), $.extend(true, {}, {
+			type: "line",
+			data: {
+				labels: chartData.labels,
+				datasets: chartData.datasets
+			},
+			options: {
+				responsive: false,
+				maintainAspectRatio: false,
+				aspectRatio: 2,
+				scales: {
+					y: {
+						beginAtZero: true,
+						ticks: {
+							precision: 0
+						},
+						grid: {
+							color: "#eee"
+						}
+					},
+					x: {
+						grid: {
+							display: false
+						}
+					}
+				},
+				plugins: {
+					title: {
+						display: null !== title,
+						text: title || '',
+						font: { size: 14 },
+						color: "#333",
+						padding: { top: 10, bottom: 20 }
+					},
+					legend: {
+						display: chartData.datasets.length > 1,
+						position: "bottom",
+					},
+					tooltip: {
+						callbacks: {
+							label: context => context.dataset.label + ' : ' + context.parsed.y
+						}
+					}
+				}
+			}
+		}, options));
+	}
+
+	static createDoughnutChart(chartDiv, chartData, title=null, options={}) {
+		Chartjs.init();
+
+		chartDiv.empty();
+		new Chart(chartDiv.get(0).getContext("2d"), $.extend(true, {}, {
+			type: "doughnut",
+			data: {
+				labels: chartData.labels,
+				datasets: [{
+					data: chartData.values,
+					backgroundColor: chartData.colors,
+					borderWidth: 0,
+					hoverOffset: 10
+				}]
+			},
+			options: {
+				cutout: "65%",
+				responsive: false,
+				maintainAspectRatio: false,
+				aspectRatio: 2,
+				plugins: {
+					title: {
+						display: null !== title,
+						text: title || ''
+					},
+					legend: {
+						position: "right",
+						labels: {
+							boxWidth: 12,
+							font: { size: 12 },
+							usePointStyle: true
+						}
+					},
+					tooltip: {
+						callbacks: {
+							label: function(context) {
+								const total = context.dataset.data.reduce((a,b)=>a+b,0);
+								const value = context.raw;
+								const percent = ((value / total) * 100).toFixed(1);
+								return `${context.label}: ${value} (${percent}%)`;
+							}
+						}
+					}
+				},
+				animation: {
+					animateRotate: true,
+					animateScale: true
+				},
+				centerText: {
+					display: false,
+					fontSize: 18,
+					color: "#000"
+				}
+			}
+		}, options));
+	}
+
+	static groupByPeriod(data, period, metrics) {
+		const grouped = {};
+
+		//data = Object.entries(dataObj).map(([date, values]) => ({ date, ...values }));
+
+		Object.entries(data).forEach(([date, values]) => {
+			//data.forEach(entry => {
+			const d = new Date(date);
+			let key;
+
+			if (period === 'week') {
+				const week = Math.ceil((d.getDate() - d.getDay() + 1) / 7);
+				key = `${d.getFullYear()}-S${week}`;
+			}
+			else if (period === 'month') {
+				key = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}`;
+			}
+			else {
+				key = date;
+			}
+
+			if (!grouped[key]) {
+				grouped[key] = {};
+				metrics.forEach(m => grouped[key][m] = []);
+			}
+
+			metrics.forEach(m => {
+				if (values[m] !== undefined) grouped[key][m].push(values[m]);
+			});
+		});
+
+		return Object.entries(grouped).map(([label, vals]) => {
+			const aggregated = {};
+			metrics.forEach(m => {
+				aggregated[m] = vals[m].reduce((a, b) => a + b, 0) / vals[m].length;
+			});
+			return { label, ...aggregated };
+		});
+	}
+
+	static getPeriodLabels(data, period, locale = 'fr-FR', timeZone = 'Europe/Paris') {
+		return DatePeriod.getPeriodLabels(Object.keys(data), period, locale, timeZone);
+	}
+
+	static getAutoGranularity(data) {
+		const dates = Object.keys(data);
+		const days = (new Date(dates[dates.length - 1]) - new Date(dates[0])) / (1000 * 60 * 60 * 24);
+		if (days > 90) return 'month';
+		if (days > 30) return 'week';
+		return 'day_of_month';
+	}
+}
+
+module.exports = { Chartjs };

package/date_time.js

@@ -122,7 +122,7 @@ class DateTime {
 	static getTimeDisplayWithNbDays(jsDate, jsPreviousDate, locale="fr-FR", timeZone="Europe/Paris") {
 		let str = this.getTimeDisplay(jsDate, locale, timeZone);
 		if (jsPreviousDate !== 0 && jsPreviousDate != null) {
-			let nbDaysDiff = this.getNbDayBetweenTwo(jsPreviousDate, jsDate, false);
+			let nbDaysDiff = DatePeriod.getNbDayBetweenTwo(jsPreviousDate, jsDate, false);
 			if (nbDaysDiff > 0) {
 				str += ' (J+'+nbDaysDiff+')';
 			}
@@ -277,6 +277,27 @@ class DateTime {
 		return jsDateTime > today;
 	}
 
+	static addDays(date, days) {
+		date.setUTCDate(date.getUTCDate() + days);
+		return date;
+	}
+
+	static addMonths(date, months) {
+		let d = date.getDate();
+		date.setMonth(date.getMonth() + +months);
+		if (date.getDate() !== d) {
+			date.setDate(0);
+		}
+		return date;
+	}
+
+	/** @deprecated use DatePeriod.getNbDayBetweenTwo instead */
+	static getNbDayBetweenTwo(jsDate1, jsDate2, asPeriod=false, timeZone="Europe/Paris") {
+		return DatePeriod.getNbDayBetweenTwo(jsDate1, jsDate2, asPeriod, timeZone);
+	}
+}
+
+class DatePeriod {
 	static getNbDayBetweenTwo(jsDate1, jsDate2, asPeriod=false, timeZone="Europe/Paris") {
 		//jsDate1.set
 		if (jsDate1 == null || jsDate2 == null) {
@@ -299,18 +320,34 @@ class DateTime {
 		return parseInt(Math.round((timestamp2-timestamp1)/86400));
 	}
 
-	static addDays(date, days) {
-		date.setUTCDate(date.getUTCDate() + days);
-		return date;
-	}
+	static getPeriodLabels(data, period, locale = 'fr-FR', timeZone = 'Europe/Paris') {
+		if (!data || data.length === 0) {
+			return [];
+		}
 
-	static addMonths(date, months) {
-		let d = date.getDate();
-		date.setMonth(date.getMonth() + +months);
-		if (date.getDate() !== d) {
-			date.setDate(0);
+		if (period === 'month') {
+			data.map(yearAndMonth => {
+				const [year, month] = yearAndMonth.split('-').map(Number);
+				return DateTime.getMonthNameByMonth(month, locale).capitalize()+' '+year;
+			});
 		}
-		return date;
+		if (period === 'week') {
+			return data.map(yearAndWeek => {
+				const [year, weekStr] = yearAndWeek.split('-S');
+				const week = parseInt(weekStr, 10);
+				return 'S'+week+' '+year;
+			});
+		}
+		if (period === 'day_of_week') {
+			return data.map(weekDay => DateTime.getDayNameByDayOfWeek(weekDay, locale).capitalize());
+		}
+		if (period === 'day_of_month') {
+			return data.map(sqlDate => SqlDate.getDateDigitalDisplay(sqlDate, locale, timeZone));
+		}
+		if (period === 'hour') {
+			return data.map(hour => String(hour).padStart(2, '0')+'h');
+		}
+		return data;
 	}
 }
 
@@ -386,7 +423,7 @@ class TimestampUnix {
 	}
 
 	static getNbDayBetweenTwo(timestamp1, timestamp2, asPeriod=false, timeZone="Europe/Paris") {
-		return DateTime.getNbDayBetweenTwo(this.parse(timestamp1), this.parse(timestamp2), asPeriod, timeZone);
+		return DatePeriod.getNbDayBetweenTwo(this.parse(timestamp1), this.parse(timestamp2), asPeriod, timeZone);
 	}
 
 	static isDateInThePast(timestamp) {
@@ -452,7 +489,7 @@ class SqlDate {
 		return DateTime.isDateInTheFuture(SqlDateTime.parse(sqlDate + " 00:00:00"));
 	}
 	static getNbDayBetweenTwo(sqlDate1, sqlDate2, asPeriod=false) {
-		return DateTime.getNbDayBetweenTwo(SqlDateTime.parse(sqlDate1 + " 00:00:00"), SqlDateTime.parse(sqlDate2 + " 00:00:00"), asPeriod);
+		return DatePeriod.getNbDayBetweenTwo(SqlDateTime.parse(sqlDate1 + " 00:00:00"), SqlDateTime.parse(sqlDate2 + " 00:00:00"), asPeriod);
 	}
 }
 
@@ -585,9 +622,9 @@ class SqlDateTime {
 	}
 
 	static getNbDayBetweenTwo(sqlDateTime1, sqlDateTime2, asPeriod=false) {
-		return DateTime.getNbDayBetweenTwo(this.parse(sqlDateTime1), this.parse(sqlDateTime2), asPeriod);
+		return DatePeriod.getNbDayBetweenTwo(this.parse(sqlDateTime1), this.parse(sqlDateTime2), asPeriod);
 	}
 
 }
 
-module.exports = { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime };
+module.exports = { DateTime, DatePeriod, TimestampUnix, SqlDate, SqlTime, SqlDateTime };

package/duration.js

@@ -69,9 +69,8 @@ class Duration {
 		
 		// Minutes
 		let strMinute = '';
-		let nbMinutes = 0;
 		if (withMinutes) {
-			nbMinutes = this.getNbMinutesRemainingOfDurationInSeconds(durationInSeconds);
+			let nbMinutes = this.getNbMinutesRemainingOfDurationInSeconds(durationInSeconds);
 			strMinute += ' ';
 			//strMinute += sprintf('%02d', nbMinutes);
 			strMinute += nbMinutes.toString().padStart(2, '0');

package/index.js

@@ -8,11 +8,11 @@ require('./number');
 
 // exports d'ojets non natif
 const { HTTPClient } = require('./http_client');
-const { HTTPRequest, Cookie, UrlAndQueryString } = require('./network');
+const { Cookie, UrlAndQueryString } = require('./network');
 const { IBAN, BankCard } = require('./bank');
 const { AudioMedia, VideoMedia, UserMedia } = require('./media');
 const { PersonName, Email, TelephoneNumber } = require('./contact_details');
-const { DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = require('./date_time');
+const { DateTime, DatePeriod, TimestampUnix, SqlDate, SqlTime, SqlDateTime } = require('./date_time');
 const { Duration } = require('./duration');
 const { File, CSV, Img } = require('./file');
 const { FormHelper, EditValue } = require('./form_helper');
@@ -22,6 +22,7 @@ const { SocialNetwork } = require('./social_network');
 const { sleep, refresh } = require('./util');
 const { chr, ord, trim, empty } = require('./php.min');
 const { NumberFormatter } = require('./number');
+const { Password } = require('./user');
 
 // exports plugins "maison"
 const { Browser, UserAgent } = require('./visitor');
@@ -41,6 +42,7 @@ const { WebRTC } = require('./web_rtc');
 const { EventBus } = require('./event_bus');
 
 // exports surcouche lib externe
+const { Chartjs } = require('./chartjs');
 const { GoogleCharts } = require('./google_charts');
 const { GoogleRecaptcha } = require('./google_recaptcha');
 const { GoogleMap } = require('./google_maps');
@@ -49,8 +51,8 @@ const { WebSocket } = require('./web_socket');
 
 module.exports = {
 	Array, Object, Number, String,
-	HTTPClient, HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, VideoMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, HexColor, RgbColor, SocialNetwork, NumberFormatter
+	HTTPClient, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, VideoMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, DatePeriod, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, HexColor, RgbColor, SocialNetwork, NumberFormatter, Password,
 	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, MultipleActionInDivList, EditValue, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ApiTokenSession, ListBox, WebRTC, WebSocket, EventBus,
 	sleep, refresh, chr, ord, trim, empty,
-	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
+	Chartjs, GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
 };

package/network.js

@@ -221,7 +221,7 @@ class UrlAndQueryString {
 			if (typeof (object) == 'object') {
 				for (var name in object) {
 					value = object[name];
-					// 06/06/2022 : ajout de ce if pour éviter bug sur fonction HTTPRequest.formatQueryString
+					// 06/06/2022 : ajout de ce if pour éviter bug sur fonction HTTPClient.formatQueryString
 					if (typeof (value) == 'undefined') {
 						continue;
 					}
@@ -231,7 +231,7 @@ class UrlAndQueryString {
 					if (typeof (value) == 'object') {
 						buildStringFromParam(value, p + name);
 					}
-					// 06/06/2022 : ajout null !== value pour éviter bug sur fonction HTTPRequest.formatQueryString
+					// 06/06/2022 : ajout null !== value pour éviter bug sur fonction HTTPClient.formatQueryString
 					else if (null !== value && typeof (value) != 'function' && name != '') {
 						// 27/01/2020 : correction bug boolean affiché en string true/false
 						if (typeof (value) == 'boolean') {
@@ -309,448 +309,4 @@ class UrlAndQueryString {
 
 }
 
-/** @deprecated */
-class HTTPRequest {
-	static init() {
-		require('whatwg-fetch'); //fetch polyfill loaded in window.fetch
-	}
-
-	static setRefreshTokenUrl(url) {
-		this.refreshTokenUrl = url;
-	}
-
-	static setRefreshTokenCallback(callback) {
-		this.refreshTokenCallback = callback;
-	}
-
-	static getHeaders(asObject) {
-		if (typeof this.headers == 'undefined') {
-			this.headers = {};
-		}
-
-		if (typeof asObject != 'undefined' && asObject) {
-			return this.headers;
-		}
-
-		let httpHeaders = new Headers();
-		Object.entries(this.headers).forEach(([key, value]) => {
-			httpHeaders.append(key, value);
-		});
-
-		return httpHeaders;
-	}
-
-	static getHeader(key) {
-		if (typeof this.headers == 'undefined') {
-			this.headers = {};
-		}
-
-		return this.headers[key];
-	}
-
-	static setHeader(key, value) {
-		if (typeof this.headers == 'undefined') {
-			this.headers = {};
-		}
-
-		this.headers[key] = value;
-	}
-
-	static setAuthorizationHeader(accessToken) {
-		if (typeof this.headers == 'undefined') {
-			this.headers = {};
-		}
-
-		this.headers['Authorization'] = 'Bearer ' + accessToken;
-	}
-
-	static convertObjectToFormData(obj) {
-		// 30/05/2022 : ancienne version, qui ne fonctionne pas avec des tableaux
-		// let formData = new FormData();
-		// Object.entries(data).forEach(([key, value]) => formData.append(key, value));
-		// return formData;
-
-		var formData = new FormData();
-
-		function appendFormData(data, root) {
-			//console.log('appendFormData', data, root);
-			root = root || '';
-			if (data instanceof File) {
-				formData.append(root, data);
-			} else if (Array.isArray(data)) {
-				for (var i = 0; i < data.length; i++) {
-					appendFormData(data[i], root + '[' + i + ']');
-				}
-			} else if (typeof data === 'object' && data) {
-				for (var key in data) {
-					if (data.hasOwnProperty(key)) {
-						if (root === '') {
-							appendFormData(data[key], key);
-						} else {
-							appendFormData(data[key], root + '.' + key);
-						}
-					}
-				}
-			} else {
-				if (data !== null && typeof data !== 'undefined') {
-					formData.append(root, data);
-				}
-			}
-		}
-
-		appendFormData(obj);
-
-		return formData;
-	}
-
-	static formatQueryString(data) {
-		if (data == null) {
-			return '';
-		}
-		if (typeof data == 'object') {
-			data = UrlAndQueryString.buildQuery(data);
-		}
-		if (data !== '' && data.substring(0, 1) !== '&') {
-			data = '&' + data;
-		}
-		return data;
-	}
-
-	static formatFormData(data) {
-		if (!(data instanceof FormData)) {
-			return HTTPRequest.convertObjectToFormData(data);
-		}
-		return data;
-	}
-
-	static logRequestFailure(response, json) {
-		console.error('Request failure. Status: ' + response.statusText + ' ; HTTP Code : ' + response.status, json);
-	}
-
-	static logJqueryRequestFailure(jqxhr, status, errorThrown) {
-		console.error('Request failure. Status: ' + status + ' ; HTTP Code: ' + jqxhr.status + (null != errorThrown && '' !== errorThrown ? ' ; Error message: ' + errorThrown : ''), jqxhr.responseJSON);
-	}
-
-	static isExpiredToken(response, json) {
-		if (response.status !== 401) {
-			return false;
-		}
-
-		return (
-			response.statusText === 'Expired JWT Token'
-			|| (typeof json['message'] != 'undefined' && json['message'] === 'Expired JWT Token')
-			|| (typeof json['error'] != 'undefined' && json['error'] === 'expired_token')
-			|| (typeof json['error'] != 'undefined' && json['error'] === 'authentification_failure')
-			|| (json === 'expired_token')
-			|| (json === 'authentification_failure')
-		);
-	}
-
-	static async get(url, data, successCallback, errorCallback) {
-		url += (!url.includes('?') ? '?' : '') + this.formatQueryString(data);
-		data = null;
-
-		if (window.fetch) {
-			const response = await fetch(url, {
-				method: 'GET',
-				headers: HTTPRequest.getHeaders(),
-				mode: 'cors',
-				cache: 'no-cache'
-			});
-
-			let jsonData = {};
-			try {
-				jsonData = await response.json();
-
-				if (HTTPRequest.isExpiredToken(response, jsonData)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
-					return;
-				}
-
-				if (response.ok) {
-					successCallback(jsonData, response);
-					return;
-				}
-			} catch (e) {
-				console.error(e);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response);
-				}
-				return;
-			}
-
-			HTTPRequest.logRequestFailure(response, jsonData);
-			if (typeof errorCallback != 'undefined' && errorCallback != null) {
-				errorCallback(response, jsonData);
-			}
-			return;
-		}
-
-		//l'api fetch n'est pas dispo pour ce navigateur => normalement ce cas ne devrait pas arriver car le polyfill est chargé dans la méthode init
-		$.ajax({
-			type: 'GET',
-			url: url,
-			headers: HTTPRequest.getHeaders(true),
-			dataType: 'json',
-			cache: false,
-			success: (data, status, jqxhr) => {
-				if (typeof successCallback != 'undefined' && successCallback != null) {
-					successCallback(data, jqxhr);
-				}
-			},
-			error: (jqxhr, status, errorThrown) => {
-				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
-					return;
-				}
-
-				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, jqxhr.responseJSON);
-				}
-			}
-		});
-	}
-
-	static async download(url, data, errorCallback, completeCallback, method) {
-		method = typeof method == 'undefined' || null == method ? 'GET' : method;
-
-		if ('POST' !== method) {
-			url += (!url.includes('?') ? '?' : '') + this.formatQueryString(data);
-			data = null;
-		}
-
-		if (window.fetch) {
-			let requestInit = {
-				method: 'GET',
-				headers: HTTPRequest.getHeaders(),
-				mode: 'cors',
-				cache: 'no-cache'
-			}
-
-			if ('POST' === method) {
-				requestInit['method'] = 'POST';
-				requestInit['body'] = this.formatFormData(data);
-			}
-
-			const response = await fetch(url, requestInit);
-			try {
-				if (response.status === 401 && response.statusText === 'Expired JWT Token') {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
-					return;
-				}
-
-				if (response.ok) {
-					const blobData = await response.blob();
-					File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition'));
-				} else {
-					HTTPRequest.logRequestFailure(response, null);
-					if (typeof errorCallback != 'undefined' && errorCallback != null) {
-						errorCallback(response);
-					}
-				}
-			} catch (e) {
-				console.error(e);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response);
-				}
-			}
-			if (typeof completeCallback != 'undefined' && completeCallback != null) {
-				completeCallback(response);
-			}
-			return;
-		}
-
-		//l'api fetch n'est pas dispo pour ce navigateur => normalement ce cas ne devrait pas arriver car le polyfill est chargé dans la méthode init
-		let ajaxOptions = {
-			type: 'GET',
-			url: url,
-			headers: HTTPRequest.getHeaders(true),
-			cache: false,
-			xhrFields: {
-				responseType: 'blob'
-			},
-		};
-		if ('POST' === method) {
-			ajaxOptions['type'] = 'POST';
-			ajaxOptions['data'] = this.formatFormData(data);
-			ajaxOptions['contentType'] = false;
-			ajaxOptions['processData'] = false;
-		}
-
-		$.ajax(Object.assign({...ajaxOptions}, {
-			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
-			error: (jqxhr, status, errorThrown) => {
-				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
-					return;
-				}
-
-				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr);
-				}
-			},
-			complete: (jqxhr) => {
-				if (typeof completeCallback != 'undefined' && completeCallback != null) {
-					completeCallback(jqxhr);
-				}
-			}
-		}));
-	}
-
-	static async post(url, formData, successCallback, errorCallback, formErrorCallback) {
-		formData = this.formatFormData(formData);
-
-		if (window.fetch) {
-			const response = await fetch(url, {
-				method: 'POST',
-				body: formData,
-				headers: HTTPRequest.getHeaders(),
-				mode: 'cors',
-				cache: 'no-cache'
-			});
-
-			let jsonData = {};
-			try {
-				if (response.status !== 204 && response.statusText !== 'No Content') {
-					jsonData = await response.json();
-				}
-				//console.log(url, jsonData);
-
-				if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(response, jsonData)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
-					return;
-				}
-
-				if (response.ok) {
-					if (typeof successCallback != 'undefined' && successCallback != null) {
-						successCallback(jsonData, response);
-					}
-					return;
-				}
-
-				if (response.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
-					formErrorCallback(jsonData, response);
-					return;
-				}
-			} catch (e) {
-				console.error(e);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response);
-				}
-				return;
-			}
-
-			HTTPRequest.logRequestFailure(response, jsonData);
-			if (typeof errorCallback != 'undefined' && errorCallback != null) {
-				errorCallback(response, jsonData);
-			}
-			return;
-		}
-
-		//l'api fetch n'est pas dispo pour ce navigateur => normalement ce cas ne devrait pas arriver car le polyfill est chargé dans la méthode init
-		$.ajax({
-			type: 'POST',
-			url: url,
-			headers: HTTPRequest.getHeaders(true),
-			dataType: 'json', // 22/09/2020 : à voir si cette ligne pose pb (utilisé pour requete import et peut être d'autres
-			data: formData,
-			cache: false,
-			contentType: false,
-			processData: false,
-			success: (data, status, jqxhr) => {
-				if (typeof successCallback != 'undefined' && successCallback != null) {
-					successCallback(data, jqxhr);
-				}
-			},
-			error: (jqxhr, status, errorThrown) => {
-				if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
-					return;
-				}
-				if (jqxhr.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
-					formErrorCallback(jqxhr.responseJSON, jqxhr);
-					return;
-				}
-
-				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
-				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, jqxhr.responseJSON);
-				}
-			}
-		});
-	}
-
-	static refreshToken(onCompleteCallback, errorCallback) {
-		if (typeof this.refreshTokenCallback == 'function') {
-			this.refreshTokenCallback(onCompleteCallback);
-			return;
-		}
-
-		if (typeof this.refreshTokenUrl == 'undefined') {
-			console.error('URL refresh token non définie. Appeler HTTPRequest.setRefreshTokenUrl(url)');
-			return;
-		}
-
-		let payload = new FormData();
-		payload.append('refresh_token', JwtSession.getRefreshToken());
-
-		HTTPRequest.post(this.refreshTokenUrl, payload,
-			(data) => {
-				JwtSession.setToken(data.token);
-				JwtSession.setRefreshToken(data.refresh_token);
-
-				HTTPRequest.setAuthorizationHeader(JwtSession.getToken());
-
-				onCompleteCallback();
-			},
-			() => {
-				JwtSession.logout();
-				errorCallback();
-			}
-		);
-	}
-
-	static doRequest(url, strParam, methode, formatRetour, callback) {
-		var xhr = null;
-
-		if (window.XMLHttpRequest || window.ActiveXObject) {
-			if (window.ActiveXObject) {
-				try {
-					xhr = new ActiveXObject('Msxml2.XMLHTTP');
-				} catch (e) {
-					xhr = new ActiveXObject('Microsoft.XMLHTTP');
-				}
-			} else {
-				xhr = new XMLHttpRequest();
-			}
-		} else {
-			// Votre navigateur ne supporte pas l'objet XMLHTTPRequest!
-			return null;
-		}
-
-		xhr.onreadystatechange = function () {
-			if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) {
-				let data;
-				if (formatRetour == 'xml') {
-					data = xhr.responseXML;
-				} else {
-					data = eval('(' + xhr.responseText + ')');
-				}
-				callback(data);
-			}
-		};
-
-		if (methode === 'POST') {
-			xhr.open('POST', url, true);
-			xhr.send();
-		} else {
-			xhr.open('GET', url + '?' + strParam, true);
-			xhr.send(null);
-		}
-		return false;
-	}
-}
-
-module.exports = {HTTPRequest, Cookie, UrlAndQueryString};
+module.exports = { Cookie, UrlAndQueryString };

package/package.json

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

package/user.js

@@ -0,0 +1,36 @@
+class Password {
+	static getPasswordStrength(password) {
+		let score = 0;
+
+		if (password.length >= 8) score++;
+		if (/[A-Z]/.test(password)) score++;
+		if (/[a-z]/.test(password)) score++;
+		if (/[0-9]/.test(password)) score++;
+		if (/[^A-Za-z0-9]/.test(password)) score++;
+
+		if (password.length > 12 && score >= 4) score++; // Bonus pour long mot de passe
+
+		return score;
+	}
+
+	static updatePasswordStrengthUI(div, password) {
+		const score = Password.getPasswordStrength(password);
+
+		const strengthBar = div.find('.password_strength_bar');
+		const strengthText = div.find('.password_strength_text');
+
+		let width = (score / 6) * 100;
+		let color = 'bg-danger';
+		let text = 'Très faible';
+
+		if (score >= 2) { color = 'bg-warning'; text = 'Faible'; }
+		if (score >= 4) { color = 'bg-info'; text = 'Moyen'; }
+		if (score >= 5) { color = 'bg-success'; text = 'Fort'; }
+
+		strengthBar.className = `progress-bar ${color}`;
+		strengthBar.style.width = `${width}%`;
+		strengthText.textContent = text;
+	}
+}
+
+module.exports = { Password };