@osimatic/helpers-js 1.1.40 → 1.1.42

package/date_time.js

@@ -91,8 +91,8 @@ class DateTime {
 	static getDateForInputDate(jsDate, timeZone="Europe/Paris") {
 		return this.getSqlDate(jsDate, timeZone);
 	}
-	static getTimeForInputTime(jsDate, timeZone="Europe/Paris") {
-		return jsDate.toLocaleTimeString('en-GB', {hour: 'numeric', timeZone: timeZone, hour12: false}).padStart(2, '0')+':'+jsDate.toLocaleTimeString('en-GB', {minute: 'numeric', timeZone: timeZone, hour12: false}).padStart(2, '0');
+	static getTimeForInputTime(jsDate, timeZone="Europe/Paris", withSeconds=false) {
+		return jsDate.toLocaleTimeString('en-GB', {hour: 'numeric', timeZone: timeZone, hour12: false}).padStart(2, '0')+':'+jsDate.toLocaleTimeString('en-GB', {minute: 'numeric', timeZone: timeZone, hour12: false}).padStart(2, '0')+(withSeconds?':'+jsDate.toLocaleTimeString('en-GB', {second: 'numeric', timeZone: timeZone, hour12: false}).padStart(2, '0'):'');
 	}
 
 	static getTimestamp(jsDate) {
@@ -362,8 +362,8 @@ class TimestampUnix {
 	static getDateForInputDate(timestamp, timeZone="Europe/Paris") {
 		return DateTime.getDateForInputDate(this.parse(timestamp), timeZone);
 	}
-	static getTimeForInputTime(timestamp, timeZone="Europe/Paris") {
-		return DateTime.getTimeForInputTime(this.parse(timestamp), timeZone);
+	static getTimeForInputTime(timestamp, timeZone="Europe/Paris", withSeconds=false) {
+		return DateTime.getTimeForInputTime(this.parse(timestamp), timeZone, withSeconds);
 	}
 
 	static isDateEqual(timestamp1, timestamp2) {

package/http_client.js

@@ -28,14 +28,14 @@ class HTTPClient {
 		HTTPClient.onInvalidTokenCallback = callback;
 	}
 
-	static getHeaders(asObject) {
+	static getHeaders(asObject=false, additionalHeaders={}) {
 		HTTPClient.setAuthorizationToken(JwtSession.getToken());
 
 		if (typeof HTTPClient.headers == 'undefined') {
 			HTTPClient.headers = {};
 		}
 
-		if (typeof asObject != 'undefined' && asObject) {
+		if (asObject) {
 			return HTTPClient.headers;
 		}
 
@@ -44,6 +44,12 @@ class HTTPClient {
 			httpHeaders.append(key, value);
 		});
 
+		if (typeof additionalHeaders == 'object') {
+			for (const [key, value] of Object.entries(additionalHeaders)) {
+				httpHeaders.append(key, value);
+			}
+		}
+
 		return httpHeaders;
 	}
 
@@ -137,6 +143,18 @@ class HTTPClient {
 		return data;
 	}
 
+	static formatJsonData(data) {
+		if (typeof data == 'string') {
+			return data;
+		}
+
+		let formData = HTTPClient.formatFormData(data);
+
+		let object = {};
+		formData.forEach((value, key) => object[key] = value);
+		return JSON.stringify(object);
+	}
+
 	static logRequestFailure(response, json) {
 		console.error('Request failure. Status: '+response.statusText+' ; HTTP Code : '+response.status, json);
 	}
@@ -176,7 +194,7 @@ class HTTPClient {
 		JwtSession.logout(HTTPClient.onInvalidTokenRedirectUrl, HTTPClient.onInvalidTokenCallback);
 	}
 
-	static async request(method, url, data, successCallback, errorCallback, formErrorCallback) {
+	static async request(method, url, data, successCallback=null, errorCallback=null, formErrorCallback=null, additionalHeaders={}) {
 		if (!window.fetch) {
 			return;
 		}
@@ -184,14 +202,20 @@ class HTTPClient {
 		let body = null;
 		method = method.toUpperCase();
 
-		let headers = HTTPClient.getHeaders();
+		let headers = HTTPClient.getHeaders(false, additionalHeaders);
+
 		if ('PATCH' === method) {
 			headers.append('Content-Type', 'application/x-www-form-urlencoded');
 			// 30/01/2023 : ajout encodeURIComponent() sinon les valeurs contenant des "+" pose pb (signe "+" retiré)
 			body = encodeURIComponent(new URLSearchParams(HTTPClient.formatFormData(data)).toString());
 		}
 		else if ('POST' === method) {
-			body = HTTPClient.formatFormData(data);
+			if (headers.get('Content-Type') === 'application/json') {
+				body = HTTPClient.formatJsonData(data);
+			}
+			else {
+				body = HTTPClient.formatFormData(data);
+			}
 		}
 		else {
 			url += (!url.includes('?') ? '?' : '') + HTTPClient.formatQueryString(data);
@@ -199,11 +223,11 @@ class HTTPClient {
 		}
 
 		const requestOptions = {
+			method: method,
 			headers: headers,
+			body: body,
 			mode: 'cors',
-			cache: 'no-cache',
-			method,
-			body
+			cache: 'no-cache'
 		}
 
 		const response = await fetch(url, requestOptions);
@@ -215,7 +239,7 @@ class HTTPClient {
 			}
 
 			if (HTTPClient.isExpiredToken(response, jsonData)) {
-				HTTPClient.refreshToken(() => HTTPClient.request(method, url, data, successCallback, errorCallback, formErrorCallback), errorCallback);
+				HTTPClient.refreshToken(() => HTTPClient.request(method, url, data, successCallback, errorCallback, formErrorCallback, additionalHeaders), errorCallback);
 				return;
 			}
 
@@ -250,15 +274,16 @@ class HTTPClient {
 		}
 	}
 
-	static download(method, url, data, errorCallback, completeCallback) {
+	static download(method, url, data, errorCallback=null, completeCallback=null, additionalHeaders={}) {
 		HTTPClient.requestBlob(method, url, data,
 			(blobData, response) => File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition')),
 			errorCallback,
-			completeCallback
+			completeCallback,
+			additionalHeaders
 		);
 	}
 
-	static async requestBlob(method, url, data, successCallback, errorCallback, completeCallback) {
+	static async requestBlob(method, url, data, successCallback=null, errorCallback=null, completeCallback=null, additionalHeaders={}) {
 		if (!window.fetch) {
 			return;
 		}
@@ -266,13 +291,18 @@ class HTTPClient {
 		let body = null;
 		method = method.toUpperCase();
 
-		let headers = HTTPClient.getHeaders();
+		let headers = HTTPClient.getHeaders(false, additionalHeaders);
 		if ('PATCH' === method) {
 			headers.append('Content-Type', 'application/x-www-form-urlencoded');
 			body = encodeURIComponent(new URLSearchParams(HTTPClient.formatFormData(data)).toString());
 		}
 		else if ('POST' === method) {
-			body = HTTPClient.formatFormData(data);
+			if (headers.get('Content-Type') === 'application/json') {
+				body = HTTPClient.formatJsonData(data);
+			}
+			else {
+				body = HTTPClient.formatFormData(data);
+			}
 		}
 		else {
 			url += (!url.includes('?') ? '?' : '') + HTTPClient.formatQueryString(data);
@@ -290,7 +320,7 @@ class HTTPClient {
 		const response = await fetch(url, requestOptions);
 		try {
 			if (response.status === 401 && response.statusText === 'Expired JWT Token') {
-				HTTPClient.refreshToken(() => HTTPClient.requestBlob(method, url, data, successCallback, errorCallback, completeCallback), errorCallback);
+				HTTPClient.refreshToken(() => HTTPClient.requestBlob(method, url, data, successCallback, errorCallback, completeCallback, additionalHeaders), errorCallback);
 				return;
 			}
 
@@ -323,7 +353,7 @@ class HTTPClient {
 		}
 	}
 
-	static refreshToken(completeCallback, errorCallback) {
+	static refreshToken(completeCallback, errorCallback=null) {
 		if (typeof HTTPClient.listCompleteCallbackAfterRefreshTokenFinished == 'undefined') {
 			HTTPClient.listCompleteCallbackAfterRefreshTokenFinished = [];
 		}

package/network.js

@@ -1,22 +1,22 @@
 class Cookie {
-	static set(cname, cvalue, exdays) {
-		var d = new Date();
-		d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
-		var expires = "expires=" + d.toUTCString();
-		document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
-	}
-
-	static get(cname) {
-		var name = cname + "=";
-		var decodedCookie = decodeURIComponent(document.cookie);
-		var ca = decodedCookie.split(';');
-		for (var i = 0; i < ca.length; i++) {
-			var c = ca[i];
+	static set(name, value, nbValidityDays=30) {
+		let d = new Date();
+		d.setTime(d.getTime() + (nbValidityDays * 24 * 60 * 60 * 1000));
+		let expires = "expires=" + d.toUTCString();
+		document.cookie = name + "=" + value + ";" + expires + ";path=/";
+	}
+
+	static get(name) {
+		let nameWithSeparator = name + "=";
+		let decodedCookie = decodeURIComponent(document.cookie);
+		let ca = decodedCookie.split(';');
+		for (let i = 0; i < ca.length; i++) {
+			let c = ca[i];
 			while (c.charAt(0) == ' ') {
 				c = c.substring(1);
 			}
-			if (c.indexOf(name) === 0) {
-				return c.substring(name.length, c.length);
+			if (c.indexOf(nameWithSeparator) === 0) {
+				return c.substring(nameWithSeparator.length, c.length);
 			}
 		}
 		return null;

package/package.json

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