@osimatic/helpers-js 1.0.92 → 1.0.94

package/http_client.js

@@ -3,11 +3,17 @@ class HTTPClient {
 	static setRefreshTokenUrl(url) {
 		HTTPClient.refreshTokenUrl = url;
 	}
-
 	static setRefreshTokenCallback(callback) {
 		HTTPClient.refreshTokenCallback = callback;
 	}
 
+	static setOnInvalidTokenRedirectUrl(url) {
+		HTTPClient.onInvalidTokenRedirectUrl = url;
+	}
+	static setOnInvalidTokenCallback(callback) {
+		HTTPClient.onInvalidTokenCallback = callback;
+	}
+
 	static getHeaders(asObject) {
 		HTTPClient.setAuthorizationToken(JwtSession.getToken());
 
@@ -48,6 +54,10 @@ class HTTPClient {
 			HTTPClient.headers = {};
 		}
 
+		if (typeof authorizationToken == 'undefined' || null == authorizationToken) {
+			return;
+		}
+
 		HTTPClient.headers['Authorization'] = 'Bearer ' + authorizationToken;
 	}
 
@@ -126,12 +136,37 @@ class HTTPClient {
 			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')
+		);
+	}
+
+	static isInvalidToken(response, json) {
+		if (response.status !== 401) {
+			return false;
+		}
+
+		return (
+			response.statusText === 'Invalid JWT Token'
+			|| (typeof json['message'] != 'undefined' && json['message'] === 'Invalid JWT Token')
+			|| (typeof json['error'] != 'undefined' && json['error'] === 'invalid_token')
+			|| (typeof json['error'] != 'undefined' && json['error'] === 'authentification_failure')
+			|| (json === 'invalid_token')
 			|| (json === 'authentification_failure')
 		);
 	}
 
+	static onInvalidToken() {
+		if (typeof HTTPClient.onInvalidTokenCallback == 'function') {
+			HTTPClient.onInvalidTokenCallback();
+			return;
+		}
+
+		JwtSession.logout();
+		if (typeof HTTPClient.onInvalidTokenRedirectUrl != 'undefined') {
+			window.location.href = HTTPClient.onInvalidTokenRedirectUrl;
+		}
+	}
+
 	static async request(method, url, data, successCallback, errorCallback, formErrorCallback) {
 		method = method.toUpperCase();
 
@@ -169,6 +204,11 @@ class HTTPClient {
 				return;
 			}
 
+			if (HTTPClient.isInvalidToken(response, jsonData)) {
+				HTTPClient.onInvalidToken();
+				return;
+			}
+
 			if (response.ok) {
 				if (typeof successCallback != 'undefined' && successCallback != null) {
 					successCallback(jsonData, response);
@@ -225,6 +265,11 @@ class HTTPClient {
 				return;
 			}
 
+			if (response.status === 401 && response.statusText === 'Invalid JWT Token') {
+				HTTPClient.onInvalidToken();
+				return;
+			}
+
 			if (response.ok) {
 				const blobData = await response.blob();
 				File.download(blobData, response.headers.get('content-type'), response.headers.get('content-disposition'));

package/package.json

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