@osimatic/helpers-js 1.0.91 → 1.0.93

package/google_charts.js

@@ -13,7 +13,7 @@ class GoogleCharts {
 		// on supprime du tableau la liste des graphiques dont l'id div n'a pas été trouvé (le graphique ne pourra pas être généré)
 		chartsList = chartsList.filter(chartData => typeof chartData.div_id != 'undefined' && $('#'+chartData.div_id).length);
 
-		var nbChartsCompleted = 0;
+		let nbChartsCompleted = 0;
 		chartsList.forEach(chartData => {
 			//console.log(chartData);
 			GoogleCharts.draw(
@@ -41,17 +41,18 @@ class GoogleCharts {
 
 	static draw(div, typeGraph, titre, libelleAbs, tabDataAbsParam, listeLibelleOrd, listeTabDataOrd, tabColor, formatData, height, width, onComplete) {
 		if (typeof div == 'undefined' || !div.length) {
+			console.error('div not found');
 			return;
 		}
 
 		height = height || null;
 		width = width || null;
 
-		var htmlDomDiv = div[0];
+		let htmlDomDiv = div[0];
 
-		var afficherLibelleOrd = false;
+		let afficherLibelleOrd = false;
 
-		var isStacked = false;
+		let isStacked = false;
 		if (typeGraph === 'stacked_bar_chart') {
 			typeGraph = 'bar_chart';
 			isStacked = true;
@@ -65,7 +66,7 @@ class GoogleCharts {
 			isStacked = true;
 		}
 
-		var isDualChart = false;
+		let isDualChart = false;
 		if (typeGraph === 'dual_column_chart') {
 			typeGraph = 'column_chart';
 			isDualChart = true;
@@ -75,7 +76,7 @@ class GoogleCharts {
 			isDualChart = true;
 		}
 
-		var data = null;
+		let data = null;
 		if (typeGraph === 'pie_chart') {
 			//data = google.visualization.arrayToDataTable(tabDataAbsParam);
 
@@ -83,7 +84,7 @@ class GoogleCharts {
 			data.addColumn('string', libelleAbs);
 			data.addColumn('number', '');
 
-			var numRow = 0;
+			let numRow = 0;
 			$.each(tabDataAbsParam, function(idx, value) {
 				data.addRows(1);
 				data.setCell(numRow, 0, idx);
@@ -100,8 +101,8 @@ class GoogleCharts {
 			});
 
 			// Remplissage des données
-			var nbCells = 0;
-			var numRow = 0;
+			let nbCells = 0;
+			let numRow = 0;
 			$.each(tabDataAbsParam, function(idx, dataAbs) {
 				// dataOrd = tabDataOrd[idx];
 				// data.addRow([dataAbs, dataOrd]);
@@ -109,7 +110,7 @@ class GoogleCharts {
 
 				data.setCell(numRow, 0, dataAbs);
 
-				var numCell = 1;
+				let numCell = 1;
 				$.each(listeTabDataOrd, function(idx2, tabDataOrd) {
 					data.setCell(numRow, numCell, tabDataOrd[idx]);
 					//data.setCell(numRow, numCell, Math.round(tabDataOrd[idx], 2));
@@ -126,7 +127,7 @@ class GoogleCharts {
 		// console.log('drawGraph : '+div+' ; type : '+typeGraph);
 
 		// Options générales
-		var options = {
+		let options = {
 			colors: tabColor,
 			fontName: 'Trebuchet MS',
 			fontSize: 12,
@@ -221,7 +222,7 @@ class GoogleCharts {
 				// console.log(idx);
 				if (idx <= 1) {
 					// key = 'series_'+idx;
-					var key = idx;
+					let key = idx;
 					// options.series[idx] = {axis: key, targetAxisIndex: key};
 					options.series[idx] = {axis: key, targetAxisIndex: idx};
 					if (typeGraph === 'column_chart') {
@@ -278,7 +279,7 @@ class GoogleCharts {
 		// console.log(options);
 
 		// Création du graphique
-		var chart = null;
+		let chart = null;
 		if (typeGraph === 'column_chart') {
 			// chart = new google.visualization.ColumnChart(htmlDomDiv);
 			chart = new google.charts.Bar(htmlDomDiv);
@@ -301,7 +302,7 @@ class GoogleCharts {
 		div.removeClass('loading');
 
 		if (chart === null) {
-			console.log('erreur graphique');
+			console.error('error during creating chart');
 			div.addClass('graphique_error');
 			htmlDomDiv.innerHTML = 'Une erreur s\'est produite lors du chargement du graphique.';
 			return;
@@ -317,7 +318,7 @@ class GoogleCharts {
 			tabPaneDiv = div.closest('.tab-pane');
 		}
 
-		var hasClassActive = tabPaneDiv.hasClass('active');
+		let hasClassActive = tabPaneDiv.hasClass('active');
 		if (!hasClassActive) {
 			tabPaneDiv.addClass('active');
 		}

package/http_client.js

@@ -3,11 +3,17 @@ class HTTPClient {
 	static setRefreshTokenUrl(url) {
 		HTTPClient.refreshTokenUrl = url;
 	}
-
 	static setRefreshTokenCallback(callback) {
 		HTTPClient.refreshTokenCallback = callback;
 	}
 
+	static setOnInvalidTokenRedirectUrl(url) {
+		HTTPClient.onInvalidTokenRedirectUrl = url;
+	}
+	static setOnInvalidTokenCallback(callback) {
+		HTTPClient.onInvalidTokenCallback = callback;
+	}
+
 	static getHeaders(asObject) {
 		HTTPClient.setAuthorizationToken(JwtSession.getToken());
 
@@ -48,6 +54,10 @@ class HTTPClient {
 			HTTPClient.headers = {};
 		}
 
+		if (typeof authorizationToken == 'undefined' || null == authorizationToken) {
+			return;
+		}
+
 		HTTPClient.headers['Authorization'] = 'Bearer ' + authorizationToken;
 	}
 
@@ -126,12 +136,37 @@ class HTTPClient {
 			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')
+		);
+	}
+
+	static isInvalidToken(response, json) {
+		if (response.status !== 401) {
+			return false;
+		}
+
+		return (
+			response.statusText === 'Invalid JWT Token'
+			|| (typeof json['message'] != 'undefined' && json['message'] === 'Invalid JWT Token')
+			|| (typeof json['error'] != 'undefined' && json['error'] === 'invalid_token')
+			|| (typeof json['error'] != 'undefined' && json['error'] === 'authentification_failure')
+			|| (json === 'invalid_token')
 			|| (json === 'authentification_failure')
 		);
 	}
 
+	static onInvalidToken() {
+		if (typeof HTTPClient.onInvalidTokenCallback == 'function') {
+			HTTPClient.onInvalidTokenCallback();
+			return;
+		}
+
+		JwtSession.logout();
+		if (typeof HTTPClient.onInvalidTokenRedirectUrl != 'undefined') {
+			window.location.href = HTTPClient.onInvalidTokenRedirectUrl;
+		}
+	}
+
 	static async request(method, url, data, successCallback, errorCallback, formErrorCallback) {
 		method = method.toUpperCase();
 
@@ -169,6 +204,11 @@ class HTTPClient {
 				return;
 			}
 
+			if (HTTPClient.isInvalidToken(response, jsonData)) {
+				HTTPClient.onInvalidToken();
+				return;
+			}
+
 			if (response.ok) {
 				if (typeof successCallback != 'undefined' && successCallback != null) {
 					successCallback(jsonData, response);
@@ -225,6 +265,11 @@ class HTTPClient {
 				return;
 			}
 
+			if (response.status === 401 && response.statusText === 'Invalid JWT Token') {
+				HTTPClient.onInvalidToken();
+				return;
+			}
+
 			if (response.ok) {
 				const blobData = await response.blob();
 				File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition'));

package/package.json

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