@osimatic/helpers-js 1.0.98 → 1.0.99

package/CHANGELOG

@@ -52,3 +52,8 @@ DataTable.displayErrorFromXhr -> DataTable.displayError
 
 1.0.96
 var intlTelInputUtilsPath = 'xxx'; -> TelephoneNumber.setIntlTelInputUtilsPath('xxx');
+
+1.0.99
+JwtSession.isSimulationConnexion() -> non remplacé
+JwtSession.cancelSimulationConnexion() -> non remplacé
+HTTPRequest -> HTTPClient

package/http_client.js

@@ -332,13 +332,9 @@ class HTTPClient {
 
 		HTTPClient.request('POST', HTTPClient.refreshTokenUrl, payload,
 			(data) => {
-				JwtSession.setToken(data['token']);
-				JwtSession.setRefreshToken(data['refresh_token']);
-
+				JwtSession.updateToken(data['token'], data['refresh_token']);
 				HTTPClient.setAuthorizationToken(JwtSession.getToken());
-
 				onRefreshTokenComplete();
-
 			},
 			() => {
 				JwtSession.logout();

package/jwt.js

@@ -9,15 +9,6 @@ class JwtToken {
 		return JSON.parse(jsonPayload);
 	}
 
-	static hasRole(token, role) {
-		if (token == null) {
-			return false;
-		}
-
-		let payload = JwtToken.parseJwt(token);
-		return typeof payload['roles'] != 'undefined' && payload['roles'].indexOf(role) !== -1;
-	}
-
 	static getData(token, key) {
 		if (token == null) {
 			return null;
@@ -29,52 +20,70 @@ class JwtToken {
 		}
 		return null;
 	}
-}
 
-class JwtSession {
-	static denyAccessUnlessGranted(roles) {
-		let hasRole = false;
-		
-		roles.forEach(role => {
-			if (JwtSession.isGranted(role)) {
-				hasRole = true;
-			}
-		});
+	static hasRole(token, role) {
+		if (token == null) {
+			return false;
+		}
 
-		return hasRole;
+		let payload = JwtToken.parseJwt(token);
+		return typeof payload['roles'] != 'undefined' && payload['roles'].indexOf(role) !== -1;
 	}
+}
 
-	static setToken(token) {
-		localStorage.setItem('access_token', token);
+class JwtSession {
+	static setOnNewTokenCallback(callback) {
+		JwtSession.onNewTokenCallback = callback;
+	}
+	static setOnLogoutCallback(callback) {
+		JwtSession.onLogoutCallback = callback;
 	}
 
 	static getToken() {
 		return localStorage.getItem('access_token');
 	}
-
-	static setRefreshToken(token) {
-		localStorage.setItem('refresh_token', token);
+	static setToken(token) {
+		localStorage.setItem('access_token', token);
 	}
 
 	static getRefreshToken() {
 		return localStorage.getItem('refresh_token');
 	}
+	static setRefreshToken(token) {
+		localStorage.setItem('refresh_token', token);
+	}
 
-	static isSimulationConnexion() {
-		return localStorage.getItem('admin_refresh_token') != null && localStorage.getItem('admin_access_token') != null;
+	static login(accessToken, refreshToken) {
+		console.log('JwtSession.login()');
+		JwtSession.setToken(accessToken);
+		JwtSession.setRefreshToken(refreshToken);
 	}
 
-	static cancelSimulationConnexion() {
-		localStorage.setItem('refresh_token', localStorage.getItem('admin_refresh_token'));
-		localStorage.setItem('access_token', localStorage.getItem('admin_access_token'));
+	static updateToken(accessToken, refreshToken) {
+		console.log('JwtSession.updateToken()');
+		JwtSession.setToken(accessToken);
+
+		if (typeof refreshToken != 'undefined' && null != refreshToken) {
+			JwtSession.setRefreshToken(refreshToken);
+		}
 
-		localStorage.removeItem('admin_refresh_token');
-		localStorage.removeItem('admin_access_token');
+		if (typeof JwtSession.onNewTokenCallback == 'function') {
+			JwtSession.onNewTokenCallback();
+		}
 	}
 
-	static logout() {
+	static logout(redirectUrl) {
+		console.log('JwtSession.logout()');
 		localStorage.removeItem('access_token');
 		localStorage.removeItem('refresh_token');
+
+		if (typeof JwtSession.onLogoutCallback == 'function') {
+			JwtSession.onLogoutCallback();
+		}
+
+		if (typeof redirectUrl != 'undefined' && null != redirectUrl) {
+			window.location.href = redirectUrl;
+		}
 	}
 
 	static getData(key) {
@@ -88,21 +97,21 @@ class JwtSession {
 	static isGranted(role) {
 		return JwtToken.hasRole(JwtSession.getToken(), role);
 	}
-}
 
-class ApiTokenSession {
 	static denyAccessUnlessGranted(roles) {
 		let hasRole = false;
 
 		roles.forEach(role => {
-			if (ApiTokenSession.isGranted(role)) {
+			if (JwtSession.isGranted(role)) {
 				hasRole = true;
 			}
 		});
 
 		return hasRole;
 	}
+}
 
+class ApiTokenSession {
 	static getToken() {
 		return localStorage.getItem('api_token');
 	}
@@ -158,6 +167,18 @@ class ApiTokenSession {
 
 		return roles.indexOf(role) !== -1;
 	}
+
+	static denyAccessUnlessGranted(roles) {
+		let hasRole = false;
+
+		roles.forEach(role => {
+			if (ApiTokenSession.isGranted(role)) {
+				hasRole = true;
+			}
+		});
+
+		return hasRole;
+	}
 }
 
 module.exports = { JwtToken, JwtSession, ApiTokenSession };

package/network.js

@@ -1,3 +1,4 @@
+/** @deprecated */
 class HTTPRequest {
 	static init() {
 		require('whatwg-fetch'); //fetch polyfill loaded in window.fetch

package/package.json

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