@osimatic/helpers-js 1.0.102 → 1.0.103

package/duration.js

@@ -116,7 +116,7 @@ class Duration {
 				// pas d'arrondissement
 			}
 			else {
-				var halfRoundPrecision = roundPrecision / 2;
+				let halfRoundPrecision = roundPrecision / 2;
 				hoursRounded = hours;
 				secondsRounded = 0;
 				if (roundMode === 'up' || (roundMode === 'close' && minutesRemainingAndSecondsAsCentieme > halfRoundPrecision)) {
@@ -149,14 +149,10 @@ class Duration {
 		return Math.floor(durationInSeconds / 60);
 	}
 
-	/*
-	static getNbMinutesRemaining(durationInSeconds) {
+	/*static getNbMinutesRemaining(durationInSeconds) {
 		var remander = ( durationInSeconds % 3600 ) - ( durationInSeconds % 60 );
 		return ( remander / 60 );
 	}
-	*/
-
-	/*
 	static getNbHoursOfDurationInSeconds(durationInSeconds) {
 		// return (this.getNbDaysOfDurationInSeconds(durationInSeconds)*24)+this.getNbHoursRemainingOfDurationInSeconds(durationInSeconds);
 		return (durationInSeconds - (durationInSeconds % 3600)) / 3600;
@@ -164,8 +160,7 @@ class Duration {
 	static getNbMinutesOfDurationInSeconds(durationInSeconds) {
 		// return (this.getNbDaysOfDurationInSeconds(durationInSeconds)*24*60)+(this.getNbHoursRemainingOfDurationInSeconds(durationInSeconds)*60)+this.getNbMinutesRemainingOfDurationInSeconds(durationInSeconds);
 		return (durationInSeconds - (durationInSeconds % 60)) / 60;
-	}
-	*/
+	}*/
 
 	static getNbHoursRemainingOfDurationInSeconds(durationInSeconds) {
 		return this.getNbHoursOfDurationInSeconds(durationInSeconds % 86400);

package/flash_message.js

@@ -2,7 +2,9 @@ class FlashMessage {
 	static displaySuccess(message, reload, modal) {
 		this.display('success', message, reload, modal);
 	}
-
+	static displayWarning(message, modal) {
+		this.display('warning', message, false, modal);
+	}
 	static displayError(message, modal) {
 		this.display('danger', message, false, modal);
 	}
@@ -14,7 +16,7 @@ class FlashMessage {
 		if ($('div.snackbar').length !== 0) {
 			$('div.snackbar').remove();
 		}
-		var snackbar = $('<div class="snackbar '+type+'"></div>');
+		let snackbar = $('<div class="snackbar '+type+'"></div>');
 		$('html body').append(snackbar);
 		snackbar.html(message);
 		snackbar.addClass('show');
@@ -27,12 +29,6 @@ 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/http_client.js

@@ -1,23 +1,33 @@
 
 class HTTPClient {
+	// URL appelée pour rafraichir le token. Le token est mis à jour dans JwtSession. En cas de succès, on appelle HTTPClient.onSuccessRefreshTokenCallback et on réexécute toutes les requêtes HTTP en attente de nouveau token. En cas d'échec, on redirige vers HTTPClient.onInvalidRefreshTokenRedirectUrl et/ou on appelle HTTPClient.onInvalidRefreshTokenCallback.
 	static setRefreshTokenUrl(url) {
 		HTTPClient.refreshTokenUrl = url;
 	}
+	// Callback appelé pour remplacer l'appel à HTTPClient.refreshTokenUrl (et donc pas de gestion de la session avec JwtSession)
 	static setRefreshTokenCallback(callback) {
 		HTTPClient.refreshTokenCallback = callback;
 	}
 
+	static setOnSuccessRefreshTokenCallback(callback) {
+		HTTPClient.onSuccessRefreshTokenCallback = callback;
+	}
+	static setOnInvalidRefreshTokenCallback(callback) {
+		HTTPClient.onInvalidRefreshTokenCallback = callback;
+	}
+	static setOnInvalidRefreshTokenRedirectUrl(url) {
+		HTTPClient.onInvalidRefreshTokenRedirectUrl = url;
+	}
+
+	// URL de la page vers laquelle on redirige si le token est invalide apres destruction de la JwtSession.
 	static setOnInvalidTokenRedirectUrl(url) {
 		HTTPClient.onInvalidTokenRedirectUrl = url;
 	}
+	// Callback appelé lorsqu'un token est invalide (destruction de la JwtSession dans tous les cas).
 	static setOnInvalidTokenCallback(callback) {
 		HTTPClient.onInvalidTokenCallback = callback;
 	}
 
-	static setOnInvalidRefreshTokenRedirectUrl(url) {
-		HTTPClient.onInvalidRefreshTokenRedirectUrl = url;
-	}
-
 	static getHeaders(asObject) {
 		HTTPClient.setAuthorizationToken(JwtSession.getToken());
 
@@ -160,12 +170,7 @@ class HTTPClient {
 	}
 
 	static onInvalidToken() {
-		if (typeof HTTPClient.onInvalidTokenCallback == 'function') {
-			HTTPClient.onInvalidTokenCallback();
-			return;
-		}
-
-		JwtSession.logout(HTTPClient.onInvalidTokenRedirectUrl);
+		JwtSession.logout(HTTPClient.onInvalidTokenRedirectUrl, HTTPClient.onInvalidTokenCallback);
 	}
 
 	static async request(method, url, data, successCallback, errorCallback, formErrorCallback) {
@@ -333,12 +338,12 @@ class HTTPClient {
 
 		HTTPClient.request('POST', HTTPClient.refreshTokenUrl, payload,
 			(data) => {
-				JwtSession.updateToken(data['token'], data['refresh_token']);
+				JwtSession.updateToken(data['token'], data['refresh_token'], HTTPClient.onSuccessRefreshTokenCallback);
 				HTTPClient.setAuthorizationToken(JwtSession.getToken());
 				onRefreshTokenComplete();
 			},
 			() => {
-				JwtSession.logout(HTTPClient.onInvalidRefreshTokenRedirectUrl);
+				JwtSession.expireSession(HTTPClient.onInvalidRefreshTokenRedirectUrl, HTTPClient.onInvalidRefreshTokenCallback);
 				errorCallback();
 			}
 		);

package/jwt.js

@@ -32,15 +32,18 @@ class JwtToken {
 }
 
 class JwtSession {
-	static setOnNewTokenCallback(callback) {
-		JwtSession.onNewTokenCallback = callback;
-	}
 	static setOnLoginCallback(callback) {
 		JwtSession.onLoginCallback = callback;
 	}
 	static setOnLogoutCallback(callback) {
 		JwtSession.onLogoutCallback = callback;
 	}
+	static setOnNewTokenCallback(callback) {
+		JwtSession.onNewTokenCallback = callback;
+	}
+	static setOnSessionExpireCallback(callback) {
+		JwtSession.onSessionExpireCallback = callback;
+	}
 
 	static getToken() {
 		return localStorage.getItem('access_token');
@@ -56,7 +59,7 @@ class JwtSession {
 		localStorage.setItem('refresh_token', token);
 	}
 
-	static login(data, redirectUrl) {
+	static login(data, redirectUrl, onComplete) {
 		console.log('JwtSession.login()');
 		JwtSession.setToken(data['access_token'] || data['token']);
 		JwtSession.setRefreshToken(data['refresh_token']);
@@ -66,13 +69,16 @@ class JwtSession {
 		if (typeof JwtSession.onLoginCallback == 'function') {
 			JwtSession.onLoginCallback();
 		}
+		if (typeof onComplete == 'function') {
+			onComplete();
+		}
 
 		if (typeof redirectUrl != 'undefined' && null != redirectUrl) {
 			window.location.href = redirectUrl;
 		}
 	}
 
-	static updateToken(accessToken, refreshToken) {
+	static updateToken(accessToken, refreshToken, onComplete) {
 		console.log('JwtSession.updateToken()');
 		JwtSession.setToken(accessToken);
 
@@ -83,9 +89,12 @@ class JwtSession {
 		if (typeof JwtSession.onNewTokenCallback == 'function') {
 			JwtSession.onNewTokenCallback();
 		}
+		if (typeof onComplete == 'function') {
+			onComplete();
+		}
 	}
 
-	static logout(redirectUrl) {
+	static logout(redirectUrl, onComplete) {
 		console.log('JwtSession.logout()');
 		localStorage.removeItem('access_token');
 		localStorage.removeItem('refresh_token');
@@ -95,6 +104,28 @@ class JwtSession {
 		if (typeof JwtSession.onLogoutCallback == 'function') {
 			JwtSession.onLogoutCallback();
 		}
+		if (typeof onComplete == 'function') {
+			onComplete();
+		}
+
+		if (typeof redirectUrl != 'undefined' && null != redirectUrl) {
+			window.location.href = redirectUrl;
+		}
+	}
+
+	static expireSession(redirectUrl, onComplete) {
+		console.log('JwtSession.expireSession()');
+		localStorage.removeItem('access_token');
+		localStorage.removeItem('refresh_token');
+
+		localStorage.removeItem('real_users');
+
+		if (typeof JwtSession.onSessionExpireCallback == 'function') {
+			JwtSession.onSessionExpireCallback();
+		}
+		if (typeof onComplete == 'function') {
+			onComplete();
+		}
 
 		if (typeof redirectUrl != 'undefined' && null != redirectUrl) {
 			window.location.href = redirectUrl;
@@ -134,7 +165,7 @@ class JwtSession {
 		return realUsers;
 	}
 
-	static simulateLogin(loginData, onSuccess) {
+	static simulateLogin(loginData, redirectUrl, onComplete) {
 		console.log('JwtSession.simulateLogin');
 
 		// on sauvegarde les tokens de l'utilisateur réellement connecté
@@ -149,27 +180,37 @@ class JwtSession {
 		JwtSession.setToken(loginData['access_token'] || loginData['token']);
 		JwtSession.setRefreshToken(loginData['refresh_token']);
 
-		if (typeof onSuccess == 'function') {
-			onSuccess();
+		if (typeof onComplete == 'function') {
+			onComplete();
+		}
+
+		if (typeof redirectUrl != 'undefined' && null != redirectUrl) {
+			window.location.href = redirectUrl;
 		}
 	}
 
-	static cancelSimulatedLogin(onSuccess) {
+	static cancelSimulatedLogin(redirectUrl, onComplete) {
 		console.log('JwtSession.cancelSimulatedLogin');
 
 		// on récupère les tokens de l'utilisateur réellement connecté
 		let realUsers = JwtSession.getRealLoggedUsers();
 		let loginData = realUsers.pop();
 
-		if (typeof loginData != 'undefined' && null != loginData) {
-			localStorage.setItem('real_users', JSON.stringify(realUsers));
+		if (typeof loginData == 'undefined' || null == loginData) {
+			return;
+		}
+
+		localStorage.setItem('real_users', JSON.stringify(realUsers));
 
-			JwtSession.setToken(loginData['access_token'] || loginData['token']);
-			JwtSession.setRefreshToken(loginData['refresh_token']);
+		JwtSession.setToken(loginData['access_token'] || loginData['token']);
+		JwtSession.setRefreshToken(loginData['refresh_token']);
 
-			if (typeof onSuccess == 'function') {
-				onSuccess();
-			}
+		if (typeof onComplete == 'function') {
+			onComplete();
+		}
+
+		if (typeof redirectUrl != 'undefined' && null != redirectUrl) {
+			window.location.href = redirectUrl;
 		}
 	}
 

package/number.js

@@ -22,7 +22,7 @@ if (!Number.format) {
  * @param integer x: length of sections
  */
 Number.prototype.formatForDisplay = Number.prototype.formatForDisplay || function(n, s, c, x) {
-	var re = '\\d(?=(\\d{' + (x || 3) + '})+' + (n > 0 ? '\\D' : '$') + ')',
+	let re = '\\d(?=(\\d{' + (x || 3) + '})+' + (n > 0 ? '\\D' : '$') + ')',
 		num = this.toFixed(Math.max(0, ~~n));
 	return (c ? num.replace('.', c) : num).replace(new RegExp(re, 'g'), '$&' + (s || ','));
 };

package/package.json

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

package/string.js

@@ -4,7 +4,7 @@ String.prototype.copyToClipboard = String.prototype.copyToClipboard || function(
 		window.clipboardData.setData('Text', this);
 	}
 	else if (document.body.createTextRange) {
-		var textRange = document.body.createTextRange();
+		let textRange = document.body.createTextRange();
 		textRange.moveToElementText(this);
 		textRange.execCommand("Copy");
 	}
@@ -18,7 +18,7 @@ String.prototype.copyToClipboard = String.prototype.copyToClipboard || function(
 			alert("Impossible d'accéder au presse-papier.");
 		}
 		// Initialisation du composant fournit par Mozilla.
-		var gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"].getService(Components.interfaces.nsIClipboardHelper);
+		let gClipboardHelper = Components.classes["@mozilla.org/widget/clipboardhelper;1"].getService(Components.interfaces.nsIClipboardHelper);
 		// Copie du texte dans le presse papier.
 		gClipboardHelper.copyString(this);
 	}
@@ -33,14 +33,14 @@ String.prototype.truncateOnWord = String.prototype.truncateOnWord || function(li
 	if (fromLeft) {
 		return this.reverseString(this.truncateOnWord(this.reverseString(), limit));
 	}
-	var TRIM_CHARS = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u2028\u2029\u3000\uFEFF';
-	var words = this.split(RegExp('(?=['+TRIM_CHARS+'])'));
-	var count = 0;
+	let TRIM_CHARS = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u2028\u2029\u3000\uFEFF';
+	let words = this.split(RegExp('(?=['+TRIM_CHARS+'])'));
+	let count = 0;
 
 	function filter(arr, fn) {
-		var result = [];
-		for (var i = 0, len = arr.length; i < len; i++) {
-			var el = arr[i];
+		let result = [];
+		for (let i = 0, len = arr.length; i < len; i++) {
+			let el = arr[i];
 			if (i in arr && fn(el, i)) {
 				result.push(el);
 			}
@@ -105,7 +105,7 @@ String.prototype.escapeRegExp = String.prototype.escapeRegExp || function() {
 	return this.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 };
 String.prototype.format = String.prototype.format || function() {
-	var args = arguments;
+	let args = arguments;
 	return this.replace(/{(\d+)}/g, (match, number) => (typeof args[number] != 'undefined' ? args[number] : match));
 };
 
@@ -136,7 +136,7 @@ String.prototype.isNumeric = String.prototype.isNumeric || function() {
 // s'utilise : "ma chaine {0} de caracteres"
 if (!String.format) {
 	String.format = function(format) {
-		var args = Array.prototype.slice.call(arguments, 1);
+		let args = Array.prototype.slice.call(arguments, 1);
 		return format.replace(/{(\d+)}/g, (match, number) => (typeof args[number] != 'undefined' ? args[number] : match));
 	};
 }