@osimatic/helpers-js 1.0.67 → 1.0.710

package/file.js

@@ -61,6 +61,16 @@ class File {
 			maximumFractionDigits: fractionDigits
 		}).format(size)) + ' ' + byteUnits[i];
 	}
+
+	static blobToBase64(blob, callback) {
+		let reader = new FileReader();
+		reader.onload = function() {
+			//let dataUrl = reader.result;
+			//let base64 = dataUrl.split(',')[1];
+			callback(reader.result);
+		};
+		reader.readAsDataURL(blob);
+	};
 }
 
 const CSV_FILE_EXTENSION = "csv";

package/media.js

@@ -46,7 +46,7 @@ class AudioMedia {
 			let context = new (window.AudioContext || window.webkitAudioContext)();
 			let request = new XMLHttpRequest();
 			request.open("GET", url, true);
-			Object.entries(HTTPRequest.getHeaders()).forEach(([key, value]) => request.setRequestHeader(key, value));
+			Object.entries(HTTPRequest.getHeaders(true)).forEach(([key, value]) => request.setRequestHeader(key, value));
 			request.responseType = "arraybuffer";
 
 			request.onload = function () {

package/network.js

@@ -154,7 +154,7 @@ class HTTPRequest {
 				jsonData = await response.json();
 
 				if (HTTPRequest.isExpiredToken(response, jsonData)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
 					return;
 				}
 
@@ -192,7 +192,7 @@ class HTTPRequest {
 			},
 			error: (jqxhr, status, errorThrown) => {
 				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
 					return;
 				}
 
@@ -232,7 +232,7 @@ class HTTPRequest {
 				console.log(blobData);*/
 
 				if (response.status === 401 && response.statusText === 'Expired JWT Token') {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
 					return;
 				}
 
@@ -279,7 +279,7 @@ class HTTPRequest {
 			success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
 			error: (jqxhr, status, errorThrown) => {
 				if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
+					HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
 					return;
 				}
 
@@ -316,7 +316,7 @@ class HTTPRequest {
 				//console.log(url, jsonData);
 
 				if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(response, jsonData)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
 					return;
 				}
 
@@ -364,7 +364,7 @@ class HTTPRequest {
 			},
 			error: (jqxhr, status, errorThrown) => {
 				if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
-					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
+					HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
 					return;
 				}
 				if (jqxhr.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
@@ -380,7 +380,7 @@ class HTTPRequest {
 		});
 	}
 
-	static refreshToken(onCompleteCallback) {
+	static refreshToken(onCompleteCallback, errorCallback) {
 		if (typeof this.refreshTokenCallback == 'function') {
 			this.refreshTokenCallback(onCompleteCallback);
 			return;
@@ -405,6 +405,7 @@ class HTTPRequest {
 			}, 
 			() => {
 				JwtSession.logout();
+				errorCallback();
 			}
 		);
 	}

package/package.json

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

package/.idea/helpers-js.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/helpers-js.iml" filepath="$PROJECT_DIR$/.idea/helpers-js.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>