@osimatic/helpers-js 1.0.69 → 1.0.710
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/network.js +8 -7
- package/package.json +1 -1
- package/.idea/helpers-js.iml +0 -8
- package/.idea/modules.xml +0 -8
- package/.idea/vcs.xml +0 -6
package/network.js
CHANGED
|
@@ -154,7 +154,7 @@ class HTTPRequest {
|
|
|
154
154
|
jsonData = await response.json();
|
|
155
155
|
|
|
156
156
|
if (HTTPRequest.isExpiredToken(response, jsonData)) {
|
|
157
|
-
HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
|
|
157
|
+
HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
|
|
158
158
|
return;
|
|
159
159
|
}
|
|
160
160
|
|
|
@@ -192,7 +192,7 @@ class HTTPRequest {
|
|
|
192
192
|
},
|
|
193
193
|
error: (jqxhr, status, errorThrown) => {
|
|
194
194
|
if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
|
|
195
|
-
HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback));
|
|
195
|
+
HTTPRequest.refreshToken(() => HTTPRequest.get(url, data, successCallback, errorCallback), errorCallback);
|
|
196
196
|
return;
|
|
197
197
|
}
|
|
198
198
|
|
|
@@ -232,7 +232,7 @@ class HTTPRequest {
|
|
|
232
232
|
console.log(blobData);*/
|
|
233
233
|
|
|
234
234
|
if (response.status === 401 && response.statusText === 'Expired JWT Token') {
|
|
235
|
-
HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
|
|
235
|
+
HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
|
|
236
236
|
return;
|
|
237
237
|
}
|
|
238
238
|
|
|
@@ -279,7 +279,7 @@ class HTTPRequest {
|
|
|
279
279
|
success: (data, status, jqxhr) => File.download(data, jqxhr.getResponseHeader('Content-Type'), jqxhr.getResponseHeader('Content-Disposition')),
|
|
280
280
|
error: (jqxhr, status, errorThrown) => {
|
|
281
281
|
if (HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
|
|
282
|
-
HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method));
|
|
282
|
+
HTTPRequest.refreshToken(() => HTTPRequest.download(url, data, errorCallback, completeCallback, method), errorCallback);
|
|
283
283
|
return;
|
|
284
284
|
}
|
|
285
285
|
|
|
@@ -316,7 +316,7 @@ class HTTPRequest {
|
|
|
316
316
|
//console.log(url, jsonData);
|
|
317
317
|
|
|
318
318
|
if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(response, jsonData)) {
|
|
319
|
-
HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
|
|
319
|
+
HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
|
|
320
320
|
return;
|
|
321
321
|
}
|
|
322
322
|
|
|
@@ -364,7 +364,7 @@ class HTTPRequest {
|
|
|
364
364
|
},
|
|
365
365
|
error: (jqxhr, status, errorThrown) => {
|
|
366
366
|
if (url !== HTTPRequest.refreshTokenUrl && HTTPRequest.isExpiredToken(jqxhr, jqxhr.responseJSON)) {
|
|
367
|
-
HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback));
|
|
367
|
+
HTTPRequest.refreshToken(() => HTTPRequest.post(url, formData, successCallback, errorCallback, formErrorCallback), errorCallback);
|
|
368
368
|
return;
|
|
369
369
|
}
|
|
370
370
|
if (jqxhr.status === 400 && typeof formErrorCallback != 'undefined' && formErrorCallback != null) {
|
|
@@ -380,7 +380,7 @@ class HTTPRequest {
|
|
|
380
380
|
});
|
|
381
381
|
}
|
|
382
382
|
|
|
383
|
-
static refreshToken(onCompleteCallback) {
|
|
383
|
+
static refreshToken(onCompleteCallback, errorCallback) {
|
|
384
384
|
if (typeof this.refreshTokenCallback == 'function') {
|
|
385
385
|
this.refreshTokenCallback(onCompleteCallback);
|
|
386
386
|
return;
|
|
@@ -405,6 +405,7 @@ class HTTPRequest {
|
|
|
405
405
|
},
|
|
406
406
|
() => {
|
|
407
407
|
JwtSession.logout();
|
|
408
|
+
errorCallback();
|
|
408
409
|
}
|
|
409
410
|
);
|
|
410
411
|
}
|
package/package.json
CHANGED
package/.idea/helpers-js.iml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module type="WEB_MODULE" version="4">
|
|
3
|
-
<component name="NewModuleRootManager">
|
|
4
|
-
<content url="file://$MODULE_DIR$" />
|
|
5
|
-
<orderEntry type="inheritedJdk" />
|
|
6
|
-
<orderEntry type="sourceFolder" forTests="false" />
|
|
7
|
-
</component>
|
|
8
|
-
</module>
|
package/.idea/modules.xml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<project version="4">
|
|
3
|
-
<component name="ProjectModuleManager">
|
|
4
|
-
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR$/.idea/helpers-js.iml" filepath="$PROJECT_DIR$/.idea/helpers-js.iml" />
|
|
6
|
-
</modules>
|
|
7
|
-
</component>
|
|
8
|
-
</project>
|