@osimatic/helpers-js 1.0.33 → 1.0.34

package/changelog.txt

@@ -39,4 +39,7 @@ remplacer l'utilisation des variables httpHeaders / _httpHeaders par HTTPRequest
 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)
 
-Location.checkCoordinates(...) -> GeographicCoordinates.check(...) (car Location est déjà défini en javascript natif)
+Location.checkCoordinates(...) -> GeographicCoordinates.check(...) (car Location est déjà défini en javascript natif)
+
+FormHelper.getFormErrorTextBis(...) -> FormHelper.getFormErrorText(...)
+FormHelper.displayFormErrorsFromXhr(form, btnSubmit, xhr) -> FormHelper.displayFormErrors(form, btnSubmit, xhr.responseJSON)

package/form_helper.js

@@ -183,16 +183,6 @@ class FormHelper {
 	}
 
 	static getFormErrorText(errors) {
-		let errorLabels = '';
-		for (let property in errors) {
-			if (typeof errors[property] != 'function') {
-				errorLabels += '<span>' + errors[property] + '</span><br>';
-			}
-		}
-		return errorLabels;
-	}
-
-	static getFormErrorTextBis(errors) {
 		let errorLabels = '';
 		for (let property in errors) {
 			// console.log(property);
@@ -208,7 +198,7 @@ class FormHelper {
 	}
 
 	static displayFormErrors(form, btnSubmit, errors, errorWrapperDiv) {
-		this.displayFormErrorsFromText(form, this.getFormErrorTextBis(errors), errorWrapperDiv);
+		this.displayFormErrorsFromText(form, this.getFormErrorText(errors), errorWrapperDiv);
 		if (btnSubmit != null) {
 			if (btnSubmit.buttonLoader != null) {
 				btnSubmit.buttonLoader('reset');
@@ -218,10 +208,6 @@ class FormHelper {
 		}
 	}
 
-	static displayFormErrorsFromXhr(form, btnSubmit, xhr) {
-		this.displayFormErrors(form, btnSubmit, xhr.responseJSON);
-	}
-
 	static displayFormErrorsFromText(form, errorLabels, errorWrapperDiv) {
 		let errorDiv = '<div class="alert alert-danger form_errors">'+errorLabels+'</div>';
 
@@ -292,6 +278,11 @@ class FormHelper {
 		console.log('request failure. Status: '+status+' ; Exception: '+exception);
 	}
 
+	/** @deprecated **/
+	static displayFormErrorsFromXhr(form, btnSubmit, xhr) {
+		this.displayFormErrors(form, btnSubmit, xhr.responseJSON);
+	}
+
 }
 
 module.exports = { FormHelper };

package/network.js

@@ -82,27 +82,27 @@ class HTTPRequest {
 				//console.log(url, jsonData);
 				//console.log(response.status, response.statusText, jsonData['error']);
 
-				if (response.status == 401 && (response.statusText === "Expired JWT Token" || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
+				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;
 				}
 
 				if (response.ok) {
-					successCallback(jsonData);
+					successCallback(jsonData, response);
 					return;
 				}
 			}
 			catch (e) {
 				console.error(e);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response, response.status, e);
+					errorCallback(response);
 				}
 				return;
 			}
 
 			HTTPRequest.logRequestFailure(response, jsonData);
 			if (typeof errorCallback != 'undefined' && errorCallback != null) {
-				errorCallback(response, response.status, null, jsonData);
+				errorCallback(response, jsonData);
 			}
 			return;
 		}
@@ -115,16 +115,20 @@ class HTTPRequest {
 			headers: HTTPRequest.getHeaders(true),
 			dataType: 'json',
 			cache: false,
-			success: (data) => successCallback(data),
+			success: (data, status, jqxhr) => {
+				if (typeof successCallback != 'undefined' && successCallback != null) {
+					successCallback(data, jqxhr);
+				}
+			},
 			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' ))) {
+				if (jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token'  || (typeof jqxhr.responseJSON['message'] != 'undefined' && 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);
+					errorCallback(jqxhr, jqxhr.responseJSON);
 				}
 			}
 		});
@@ -157,7 +161,7 @@ class HTTPRequest {
 				/*console.log(url);
 				console.log(blobData);*/
 
-				if (response.status == 401 && response.statusText === "Expired JWT Token") {
+				if (response.status == 401 && response.statusText === 'Expired JWT Token') {
 					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
 					return;
 				}
@@ -168,18 +172,18 @@ class HTTPRequest {
 				else {
 					HTTPRequest.logRequestFailure(response, null);
 					if (typeof errorCallback != 'undefined' && errorCallback != null) {
-						errorCallback(response, response.status, null);
+						errorCallback(response);
 					}
 				}
 			}
 			catch (e) {
 				console.error(e);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response, response.status, e);
+					errorCallback(response);
 				}
 			}
 			if (typeof completeCallback != 'undefined' && completeCallback != null) {
-				completeCallback(response, response.status);
+				completeCallback(response);
 			}
 			return;
 		}
@@ -187,7 +191,6 @@ class HTTPRequest {
 		//l'api fetch n'est pas dispo pour ce navigateur => normalement ce cas ne devrait pas arriver car le polyfill est chargé
 		console.error('fetch\'s polyfill used');
 
-
 		let ajaxOptions = {
 			type: 'GET',
 			url: url,
@@ -207,19 +210,19 @@ class HTTPRequest {
 		$.ajax(Object.assign({...ajaxOptions}, {
 			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
 			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' ))) {
+				if (jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
 					return;
 				}
 
 				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, status, errorThrown);
+					errorCallback(jqxhr);
 				}
 			},
-			complete: (jqxhr, status) => {
+			complete: (jqxhr) => {
 				if (typeof completeCallback != 'undefined' && completeCallback != null) {
-					completeCallback(jqxhr, status);
+					completeCallback(jqxhr);
 				}
 			}
 		}));
@@ -228,7 +231,7 @@ class HTTPRequest {
 	static async post(url, formData, successCallback, errorCallback, formErrorCallback) {
 		formData = this.formatFormData(formData);
 
-		if (window.fetch && false) {
+		if (window.fetch) {
 			const response = await fetch(url, {
 				method: 'POST',
 				body: formData,
@@ -239,37 +242,39 @@ class HTTPRequest {
 
 			let jsonData = {};
 			try {
-				jsonData = await response.json();
+				if (response.statusText !== 'No Content') {
+					jsonData = await response.json();
+				}
 				//console.log(url, jsonData);
 
-				if (response.status == 401 && url !== HTTPRequest.refreshTokenUrl && (response.statusText === "Expired JWT Token" || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
+				if (response.status == 401 && url !== HTTPRequest.refreshTokenUrl && (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) {
 					if (typeof successCallback != 'undefined' && successCallback != null) {
-						successCallback(jsonData);
+						successCallback(jsonData, response);
 					}
 					return;
 				}
 
 				if (response.status == 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
-					formErrorCallback(response, response.status, jsonData);
+					formErrorCallback(jsonData, response);
 					return;
 				}
 			}
 			catch (e) {
 				console.error(e);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(response, response.status, e);
+					errorCallback(response);
 				}
 				return;
 			}
 
 			HTTPRequest.logRequestFailure(response, jsonData);
 			if (typeof errorCallback != 'undefined' && errorCallback != null) {
-				errorCallback(response, response.status, null, jsonData);
+				errorCallback(response, jsonData);
 			}
 			return;
 		}
@@ -285,24 +290,24 @@ class HTTPRequest {
 			cache: false,
 			contentType: false,
 			processData: false,
-			success: (data) => {
+			success: (data, status, jqxhr) => {
 				if (typeof successCallback != 'undefined' && successCallback != null) {
-					successCallback(data);
+					successCallback(data, jqxhr);
 				}
 			},
 			error: (jqxhr, status, errorThrown) => {
-				if (typeof jqxhr.responseJSON != 'undefined' && jqxhr.responseJSON.code == 401 && url !== HTTPRequest.refreshTokenUrl && (jqxhr.responseJSON.message === "Expired JWT Token"  || (typeof jqxhr.responseJSON['error'] != 'undefined' && jqxhr.responseJSON['error'] === 'expired_token' ))) {
+				if (url !== HTTPRequest.refreshTokenUrl && jqxhr.status == 401 && (jqxhr.statusText === 'Expired JWT Token' || (typeof jqxhr.responseJSON['message'] != 'undefined' && 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);
+					formErrorCallback(jqxhr.responseJSON, jqxhr);
 					return;
 				}
 
 				HTTPRequest.logJqueryRequestFailure(jqxhr, status, errorThrown);
 				if (typeof errorCallback != 'undefined' && errorCallback != null) {
-					errorCallback(jqxhr, status, errorThrown);
+					errorCallback(jqxhr, jqxhr.responseJSON);
 				}
 			}
 		});

package/package.json

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