@osimatic/helpers-js 1.0.61 → 1.0.64

package/index.js

@@ -32,7 +32,7 @@ const { ShoppingCart } = require('./shopping_cart');
 const { FlashMessage } = require('./flash_message');
 const { CountDown } = require('./count_down');
 const { ImportFromCsv } = require('./import_from_csv');
-const { JwtToken, JwtSession } = require('./jwt');
+const { JwtToken, JwtSession, ApiTokenSession } = require('./jwt');
 const { ListBox } = require('./list_box');
 const { WebRTC } = require('./web_rtc');
 const { EventBus } = require('./event_bus');
@@ -47,7 +47,7 @@ const { WebSocket } = require('./web_socket');
 module.exports = {
 	Array, Object, Number, String,
 	HTTPRequest, Cookie, UrlAndQueryString, IBAN, BankCard, AudioMedia, UserMedia, PersonName, Email, TelephoneNumber, DateTime, TimestampUnix, SqlDate, SqlTime, SqlDateTime, Duration, File, CSV, Img, FormHelper, Country, PostalAddress, GeographicCoordinates, SocialNetwork,
-	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ListBox, WebRTC, WebSocket, EventBus,
+	Browser, DataTable, Pagination, Navigation, DetailsSubArray, SelectAll, MultipleActionInTable, FormDate, InputPeriod, ShoppingCart, FlashMessage, CountDown, ImportFromCsv, JwtToken, JwtSession, ApiTokenSession, ListBox, WebRTC, WebSocket, EventBus,
 	sleep, refresh, chr, ord, trim, empty,
 	GoogleCharts, GoogleRecaptcha, GoogleMap, OpenStreetMap
 };

package/jwt.js

@@ -93,4 +93,74 @@ class JwtSession {
 	}
 }
 
-module.exports = { JwtToken, JwtSession };
+class ApiTokenSession {
+	static denyAccessUnlessGranted(roles) {
+		let hasRole = false;
+
+		roles.forEach(role => {
+			if (ApiTokenSession.isGranted(role)) {
+				hasRole = true;
+			}
+		});
+
+		return hasRole;
+	}
+
+	static getToken() {
+		return localStorage.getItem('api_token');
+	}
+	static setToken(token) {
+		localStorage.setItem('api_token', token);
+	}
+
+	static getTokenData() {
+		let tokenData = localStorage.getItem('token_data');
+		if (null == tokenData) {
+			return null;
+		}
+		return JSON.parse(tokenData);
+	}
+	static setTokenData(data) {
+		localStorage.setItem('token_data', JSON.stringify(data));
+	}
+
+	static logout() {
+		localStorage.removeItem('api_token');
+		localStorage.removeItem('token_data');
+	}
+
+	static getData(key) {
+		let tokenData = ApiTokenSession.getTokenData();
+		if (tokenData == null) {
+			return null;
+		}
+
+		if (typeof tokenData[key] != 'undefined') {
+			return tokenData[key];
+		}
+		return null;
+	}
+
+	static isAnonymous() {
+		return ApiTokenSession.getToken() == null;
+	}
+
+	static isGranted(role) {
+		if (ApiTokenSession.getToken() == null) {
+			return false;
+		}
+
+		let roles = [];
+		if (null !== ApiTokenSession.getData('role')) {
+			roles = ApiTokenSession.getData('role');
+		}
+		if (null !== ApiTokenSession.getData('roles')) {
+			roles = ApiTokenSession.getData('roles');
+		}
+		roles = Array.isArray(roles) ? roles : [roles];
+
+		return roles.indexOf(role) !== -1;
+	}
+}
+
+module.exports = { JwtToken, JwtSession, ApiTokenSession };

package/network.js

@@ -1,4 +1,3 @@
-
 class HTTPRequest {
 	static init() {
 		require('whatwg-fetch'); //fetch polyfill loaded in window.fetch
@@ -138,10 +137,8 @@ class HTTPRequest {
 			let jsonData = {};
 			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' || typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token')) {
+				if (response.status === 401 && (response.statusText === 'Expired JWT Token' || (typeof jsonData['message'] != 'undefined' && jsonData['message'] === 'Expired JWT Token') || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
@@ -303,7 +300,7 @@ class HTTPRequest {
 				}
 				//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 jqxhr.responseJSON['message'] != 'undefined' && jqxhr.responseJSON['message'] === 'Expired JWT Token') || (typeof jsonData['error'] != 'undefined' && jsonData['error'] === 'expired_token'))) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -386,6 +383,9 @@ class HTTPRequest {
 			(data) => {
 				JwtSession.setToken(data.token);
 				JwtSession.setRefreshToken(data.refresh_token);
+
+				HTTPRequest.setAuthorizationHeader(JwtSession.getToken());
+
 				onCompleteCallback();
 			}, 
 			() => {

package/number.js

@@ -1,10 +1,6 @@
 
 Number.prototype.format = Number.prototype.format || function(nbDecimal, locale) {
-	nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
-	return new Intl.NumberFormat(locale, {
-		minimumFractionDigits: nbDecimal,
-		maximumFractionDigits: nbDecimal
-	}).format(this);
+	return Number.format(this, nbDecimal, locale);
 }
 
 if (!Number.format) {
@@ -32,32 +28,44 @@ Number.prototype.formatForDisplay = Number.prototype.formatForDisplay || functio
 };
 
 Number.prototype.formatCurrency = Number.prototype.formatCurrency || function(currency, nbDecimal, locale) {
+	return Number.formatCurrency(this, currency, nbDecimal, locale);
+}
+Number.formatCurrency = Number.formatCurrency || function(number, currency, nbDecimal, locale) {
 	nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
 	return new Intl.NumberFormat(locale, {
 		style: 'currency',
 		currency: currency,
 		minimumFractionDigits: nbDecimal,
 		maximumFractionDigits: nbDecimal
-	}).format(this);
+	}).format(number);
 }
 
 Number.prototype.formatPercent = Number.prototype.formatPercent || function(nbDecimal, locale) {
+	return Number.formatPercent(this, nbDecimal, locale);
+}
+Number.formatPercent = Number.formatPercent || function(number, nbDecimal, locale) {
 	nbDecimal = (typeof nbDecimal != 'undefined'?nbDecimal:2);
 	return new Intl.NumberFormat(locale, {
 		style: 'percent',
 		minimumFractionDigits: nbDecimal,
 		maximumFractionDigits: nbDecimal
-	}).format(this);
+	}).format(number);
 }
 
-Number.prototype.padLeft2 = Number.prototype.padLeft2 || function(n) {
-	return this > 9 ? "" + this : "0" + this;
+Number.prototype.padLeft2 = Number.prototype.padLeft2 || function() {
+	return Number.padLeft2(this);
+}
+Number.padLeft2 = Number.padLeft2 || function(n) {
+	return n > 9 ? "" + n : "0" + n;
 }
 
 Number.prototype.roundDecimal = Number.prototype.roundDecimal || function(precision) {
+	return Number.roundDecimal(this, precision);
+}
+Number.roundDecimal = Number.roundDecimal || function(number, precision) {
 	precision = precision || 2;
-	var tmp = Math.pow(10, precision);
-	return Math.round(this*tmp) / tmp;
+	let tmp = Math.pow(10, precision);
+	return Math.round(number*tmp) / tmp;
 }
 
 if (!Number.random) {
@@ -65,24 +73,3 @@ if (!Number.random) {
 		return Math.floor(Math.random() * (max - min + 1)) + min;
 	};
 }
-
-/** @deprecated */
-Number.prototype.formatAsString = function(locale, minimumFractionDigits) {
-	minimumFractionDigits = (typeof minimumFractionDigits != 'undefined'?minimumFractionDigits:0);
-	return new Intl.NumberFormat(locale, {minimumFractionDigits: minimumFractionDigits}).format(this);
-};
-/** @deprecated */
-Number.prototype.formatAsCurrency = function(locale, currency, nbFractionDigits) {
-	nbFractionDigits = (typeof nbFractionDigits != 'undefined'?nbFractionDigits:2);
-	return new Intl.NumberFormat(locale, {
-		style: 'currency',
-		currency: 'EUR',
-		minimumFractionDigits: nbFractionDigits,
-		maximumFractionDigits: nbFractionDigits
-	}).format(this);
-};
-/** @deprecated */
-Number.prototype.formatAsPercent = function(locale, minimumFractionDigits) {
-	minimumFractionDigits = (typeof minimumFractionDigits != 'undefined'?minimumFractionDigits:0);
-	return new Intl.NumberFormat(locale, {style: 'percent', minimumFractionDigits:minimumFractionDigits}).format(this);
-};

package/package.json

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