@osimatic/helpers-js 1.0.62 → 1.0.65

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
@@ -123,6 +122,21 @@ class HTTPRequest {
 		console.error('Request failure. Status: '+status+' ; HTTP Code: '+jqxhr.responseJSON.code+(null!=errorThrown && ''!==errorThrown ? ' ; Error message: '+errorThrown : ''), jqxhr.responseJSON);
 	}
 
+	static isExpiredToken(response, json) {
+		if (response.status !== 401) {
+			return false;
+		}
+
+		return (
+			response.statusText === 'Expired JWT Token'
+			|| (typeof json['message'] != 'undefined' && json['message'] === 'Expired JWT Token')
+			|| (typeof json['error'] != 'undefined' && json['error'] === 'expired_token')
+			|| (typeof json['error'] != 'undefined' && json['error'] === 'authentification_failure')
+			|| (json === 'expired_token')
+			|| (json === 'authentification_failure')
+		);
+	}
+
 	static async get(url, data, successCallback, errorCallback) {
 		url += (!url.includes('?') ? '?' : '') + this.formatQueryString(data);
 		data = null;
@@ -138,10 +152,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 (HTTPRequest.isExpiredToken(response, jsonData)) {
 					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
@@ -179,7 +191,7 @@ class HTTPRequest {
 				}
 			},
 			error: (jqxhr, status, errorThrown) => {
-				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' ))) {
+				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
 					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
 					return;
 				}
@@ -266,7 +278,7 @@ 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 (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' ))) {
+				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
 					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
 					return;
 				}
@@ -303,7 +315,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 (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(response, jsonData)) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -351,7 +363,7 @@ class HTTPRequest {
 				}
 			},
 			error: (jqxhr, status, errorThrown) => {
-				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' ))) {
+				if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
 					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
 					return;
 				}
@@ -386,6 +398,9 @@ class HTTPRequest {
 			(data) => {
 				JwtSession.setToken(data.token);
 				JwtSession.setRefreshToken(data.refresh_token);
+
+				HTTPRequest.setAuthorizationHeader(JwtSession.getToken());
+
 				onCompleteCallback();
 			}, 
 			() => {

package/package.json

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