@osimatic/helpers-js 1.0.25 → 1.0.28

package/changelog.txt

@@ -31,3 +31,10 @@ getDateObjectSelected(lien) -> getSelectedDate(lien.closest('.form-group')
 selectFormDate(lien) -> setSelectedDate(lien.closest('.form-group')
 majSelectPeriode() / majSelectCompare() -> updatePeriodSelect(form)
 
+let URL_REFRESH = ... -> HTTPRequest.setRefreshTokenUrl(URL_REFRESH)
+let _httpHeaders = {...} -> HTTPRequest.setHeader(key, value);
+let httpHeaders = {...} -> HTTPRequest.setHeader(key, value);
+remplacer l'utilisation des variables httpHeaders / _httpHeaders par HTTPRequest.getHeaders()
+
+FlashMessage.displayRequestFailure(status, exception, modal) -> FlashMessage.displayError(labelErrorOccured, modal)
+FormHelper.logRequestFailure(status, exception) -> HTTPRequest.logJqueryRequestFailure(jqxhr, status, exception) (le log de l'erreur est devenu inutile car fait de base dans la classe HTTPRequest)

package/flash_message.js

@@ -1,9 +1,4 @@
 class FlashMessage {
-	static displayRequestFailure(status, exception, modal) {
-		console.log('request failure. Status: ', status, ' Exception: ', exception);
-		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  "Une erreur s'est produite.", false, modal);
-	}
-
 	static displaySuccess(message, reload, modal) {
 		this.display('success', message, reload, modal);
 	}
@@ -32,6 +27,13 @@ class FlashMessage {
 			document.location.reload();
 		}
 	}
+
+	/** @deprecated **/
+	static displayRequestFailure(status, exception, modal) {
+		console.log('request failure. Status: ', status, ' Exception: ', exception);
+		this.display('danger', typeof labelErrorOccured != 'undefined' ? labelErrorOccured :  "Une erreur s'est produite.", false, modal);
+	}
+
 }
 
 module.exports = { FlashMessage };

package/form_helper.js

@@ -1,8 +1,4 @@
 class FormHelper {
-	static logRequestFailure(status, exception) {
-		console.log('request failure. Status: '+status+' ; Exception: '+exception);
-	}
-
 	static resetSelectOption(form, selectName) {
 		form.find('select[name="'+selectName+'"] option').prop('disabled', false).prop('selected', false);
 	}
@@ -257,6 +253,14 @@ class FormHelper {
 
 		errorsParentDiv.prepend(errorDiv);
 	}
+
+
+
+	/** @deprecated **/
+	static logRequestFailure(status, exception) {
+		console.log('request failure. Status: '+status+' ; Exception: '+exception);
+	}
+
 }
 
 module.exports = { FormHelper };

package/network.js

@@ -1,20 +1,63 @@
 
 class HTTPRequest {
-	static async get(url, data, successCallback, errorCallback) {
+	static setRefreshTokenUrl(url) {
+		this.refreshTokenUrl = url;
+	}
+	static setRefreshTokenCallback(callback) {
+		this.refreshTokenCallback = callback;
+	}
+
+	static setHeader(key, value) {
+		if (typeof this.headers == 'undefined') {
+			this.headers = {};
+		}
+		this.headers[key] = value;
+	}
+
+	static getHeaders() {
+		//if (typeof httpHeaders != 'undefined') {
+		//	return httpHeaders;
+		//}
+
+		if (typeof this.headers == 'undefined') {
+			this.headers = {};
+		}
+
+		let httpHeaders = new Headers();
+		Object.entries(this.headers).forEach(([key, value]) => {
+			httpHeaders.append(key, value);
+		});
+		return httpHeaders;
+	}
+
+	static formatQueryString(data) {
 		if (data == null) {
-			data = '';
+			return '';
 		}
-		else if (typeof data == 'object') {
+		if (typeof data == 'object') {
 			data = UrlAndQueryString.buildQuery(data);
 		}
 		if (data !== '' && data.substring(0, 1) !== '&') {
 			data = '&' + 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.responseJSON.code+(null!=errorThrown && ''!==errorThrown ? ' ; Error message: '+errorThrown : ''), jqxhr.responseJSON);
+	}
+
+	static async get(url, data, successCallback, errorCallback) {
+		data = this.formatQueryString(data);
 
 		if (window.fetch) {
 			let requestInit = {
 				method: 'GET',
-				headers: _httpHeaders,		
+				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
 			}
@@ -24,9 +67,10 @@ class HTTPRequest {
 			try {
 				jsonData = await response.json();
 				//console.log(url, jsonData);
+				//console.log(response.status, response.statusText, jsonData['error']);
 
-				if (response.status == 401 && response.statusText == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.get(url, data, successCallback, errorCallback));
+				if (response.status == 401 && (response.statusText === "Expired JWT Token" || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
 
@@ -36,11 +80,17 @@ class HTTPRequest {
 				}
 			}
 			catch (e) {
-				console.log(e);
-				errorCallback(response, response.status, e);
+				console.error(e);
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+					errorCallback(response, response.status, e);
+				}
 				return;
 			}
-			errorCallback(response, response.status, null, jsonData);
+
+			HTTPRequest.logRequestFailure(response, jsonData);
+			if (typeof errorCallback != 'undefined' && errorCallback != null) {
+				errorCallback(response, response.status, null, jsonData);
+			}
 			return;
 		}
 
@@ -49,36 +99,31 @@ class HTTPRequest {
 		$.ajax({
 			type: 'GET',
 			url: url + (!url.includes('?') ? '?' : '') + data,
-			headers: httpHeaders,
+			headers: HTTPRequest.getHeaders(),
 			dataType: 'json',
 			cache: false,
 			success: (data) => successCallback(data),
-			error: (jqxhr, status, exception) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && jqxhr.responseJSON.message == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.get(url, data, successCallback, errorCallback));
-				} else {
-					errorCallback(jqxhr, status, exception);
+			error: (jqxhr, status, errorThrown) => {
+				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
+					return;
+				}
+
+				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+					errorCallback(jqxhr, status, errorThrown);
 				}
 			}
 		});
 	}
 
 	static async download(url, data, errorCallback, completeCallback) {
-		if (data == null) {
-			data = '';
-		}
-		else if (typeof data == 'object') {
-			data = UrlAndQueryString.buildQuery(data);
-		}
-		if (data !== '' && data.substring(0, 1) !== '&') {
-			data = '&' + data;
-		}
-
+		data = this.formatQueryString(data);
 
 		if (window.fetch) {
 			let requestInit = {
 				method: 'GET',
-				headers: _httpHeaders,
+				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
 			}
@@ -89,20 +134,23 @@ class HTTPRequest {
 				/*console.log(url);
 				console.log(blobData);*/
 
-				if (response.status == 401 && response.statusText == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.download(url, data, errorCallback, completeCallback));
+				if (response.status == 401 && response.statusText === "Expired JWT Token") {
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback));
 					return;
 				}
 
 				if (response.ok) {
 					File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition'));
 				}
-				else if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response, response.status, null);
+				else {
+					HTTPRequest.logRequestFailure(response, null);
+					if (typeof errorCallback != 'undefined' && errorCallback != null) {
+						errorCallback(response, response.status, null);
+					}
 				}
 			}
 			catch (e) {
-				console.log(e);
+				console.error(e);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
 					errorCallback(response, response.status, e);
 				}
@@ -118,17 +166,21 @@ class HTTPRequest {
 		$.ajax({
 			type: 'GET',
 			url: url + (!url.includes('?') ? '?' : '') + data,
-			headers: httpHeaders,
+			headers: HTTPRequest.getHeaders(),
 			cache: false,
 			xhrFields: {
 				responseType: 'blob'
 			},
 			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
-			error: (jqxhr, status, exception) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && jqxhr.responseJSON.message == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.download(url, data, errorCallback, completeCallback));
-				} else if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, status, exception);
+			error: (jqxhr, status, errorThrown) => {
+				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback));
+					return;
+				}
+
+				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+					errorCallback(jqxhr, status, errorThrown);
 				}
 			},
 			complete: (jqxhr, status) => {
@@ -140,11 +192,17 @@ class HTTPRequest {
 	}
 
 	static async post(url, formData, successCallback, errorCallback, formErrorCallback) {
+		if (!(formData instanceof FormData)) {
+			let formDataObject = new FormData();
+			Object.entries(formData).forEach(([key, value]) => formDataObject.append(key, value));
+			formData = formDataObject;
+		}
+
 		if (window.fetch && false) {
 			let requestInit = {
 				method: 'POST',
 				body: formData,
-				headers: _httpHeaders,		
+				headers: HTTPRequest.getHeaders(),
 				mode: 'cors',
 				cache: 'no-cache'
 			};
@@ -156,13 +214,15 @@ class HTTPRequest {
 				jsonData = await response.json();
 				//console.log(url, jsonData);
 
-				if (response.status == 401 && response.statusText == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+				if (response.status == 401 && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
 
 				if (response.ok) {
-					successCallback(jsonData);
+					if (typeof successCallback != 'undefined' && successCallback != null) {
+						successCallback(jsonData);
+					}
 					return;
 				}
 
@@ -172,12 +232,17 @@ class HTTPRequest {
 				}
 			}
 			catch (e) {
-				console.log(e);
-				errorCallback(response, response.status, e);
+				console.error(e);
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+					errorCallback(response, response.status, e);
+				}
 				return;
 			}
 
-			errorCallback(response, response.status, null, jsonData);
+			HTTPRequest.logRequestFailure(response, jsonData);
+			if (typeof errorCallback != 'undefined' && errorCallback != null) {
+				errorCallback(response, response.status, null, jsonData);
+			}
 			return;
 		}
 
@@ -186,35 +251,56 @@ class HTTPRequest {
 		$.ajax({
 			type: 'POST',
 			url: url,
-			headers: httpHeaders,
+			headers: HTTPRequest.getHeaders(),
 			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) => successCallback(data),
-			error: (jqxhr, status, exception) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && jqxhr.responseJSON.message == "Expired JWT Token") {
-					HTTPRequest.refreshToken(URL_REFRESH, () => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
-				} else if (jqxhr.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
-					formErrorCallback(jqxhr, status, exception);
-				} else {
-					errorCallback(jqxhr, status, exception);
+			success: (data) => {
+				if (typeof successCallback != 'undefined' && successCallback != null) {
+					successCallback(data);
+				}
+			},
+			error: (jqxhr, status, errorThrown) => {
+				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+					return;
+				}
+				if (jqxhr.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
+					formErrorCallback(jqxhr, status, errorThrown);
+					return;
+				}
+
+				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
+				if (typeof errorCallback != 'undefined' && errorCallback != null) {
+					errorCallback(jqxhr, status, errorThrown);
 				}
 			}
 		});
 	}
 
-	static refreshToken(url, onCompleteCallback) {
+	static refreshToken(onCompleteCallback) {
+		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(url, payload,
+		HTTPRequest.post(this.refreshTokenUrl, payload,
 			(data) => {
 				JwtSession.setToken(data.token);
 				JwtSession.setRefreshToken(data.refresh_token);
 				onCompleteCallback();
-			}, (jqxhr, status, exception) => {
+			}, 
+			(jqxhr, status, exception) => {
 				console.log(exception);
 				JwtSession.logout();
 			}

package/package.json

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