monkey-front-core 0.0.369 → 0.0.371
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/esm2020/lib/core/interceptors/monkeyecx-http-config-error.interceptor.mjs +20 -6
- package/esm2020/lib/core/interceptors/monkeyecx-http-config-header.interceptor.mjs +15 -22
- package/esm2020/lib/core/services/error/monkeyecx-error-handling.service.mjs +4 -4
- package/fesm2015/monkey-front-core.mjs +32 -25
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +32 -25
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/lib/core/services/error/monkeyecx-error-handling.service.d.ts +1 -1
- package/monkey-front-core-0.0.371.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.369.tgz +0 -0
|
@@ -11,12 +11,26 @@ export class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
11
11
|
// no to do
|
|
12
12
|
}
|
|
13
13
|
async handle(request, error) {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
console.log('===@');
|
|
15
|
+
console.log('error1');
|
|
16
|
+
try {
|
|
17
|
+
console.log('error2');
|
|
18
|
+
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
19
|
+
console.log('error3');
|
|
20
|
+
await this.monkeyecxAuthenticationService?.refreshToken();
|
|
21
|
+
console.log('error4');
|
|
22
|
+
const headers = await this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
23
|
+
console.log('error5');
|
|
24
|
+
console.log(headers);
|
|
25
|
+
return headers;
|
|
26
|
+
}
|
|
18
27
|
}
|
|
19
|
-
|
|
28
|
+
catch (e) {
|
|
29
|
+
console.log('error6');
|
|
30
|
+
console.log(e);
|
|
31
|
+
return throwError(e);
|
|
32
|
+
}
|
|
33
|
+
return null;
|
|
20
34
|
}
|
|
21
35
|
intercept(request, next) {
|
|
22
36
|
return next.handle(request).pipe(map((event) => {
|
|
@@ -41,4 +55,4 @@ MonkeyEcxHttpConfigErrorInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVer
|
|
|
41
55
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigErrorInterceptor, decorators: [{
|
|
42
56
|
type: Injectable
|
|
43
57
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }]; } });
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWVycm9yLmludGVyY2VwdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbW9ua2V5LWZyb250LWNvcmUvc3JjL2xpYi9jb3JlL2ludGVyY2VwdG9ycy9tb25rZXllY3gtaHR0cC1jb25maWctZXJyb3IuaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsSUFBSSxFQUFjLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7QUFVakUsTUFBTSxPQUFPLG1DQUFtQztJQUM5QyxZQUNVLDhCQUE4RCxFQUM5RCw2QkFBNEQ7UUFENUQsbUNBQThCLEdBQTlCLDhCQUE4QixDQUFnQztRQUM5RCxrQ0FBNkIsR0FBN0IsNkJBQTZCLENBQStCO1FBRXBFLFdBQVc7SUFDYixDQUFDO0lBRU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxPQUF5QixFQUFFLEtBQXdCO1FBQ3RFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDcEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUN0QixJQUFJO1lBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUN0QixJQUFJLElBQUksQ0FBQyw4QkFBOEIsQ0FBQyxtQkFBbUIsQ0FBQyxLQUFLLENBQUMsRUFBRTtnQkFDbEUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQztnQkFDdEIsTUFBTSxJQUFJLENBQUMsOEJBQThCLEVBQUUsWUFBWSxFQUFFLENBQUM7Z0JBQzFELE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQ3RCLE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLDhCQUE4QixDQUFDLDBCQUEwQixDQUNsRixPQUFPLENBQ1IsQ0FBQztnQkFDRixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO2dCQUN0QixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixPQUFPLE9BQU8sQ0FBQzthQUNoQjtTQUNGO1FBQUMsT0FBTyxDQUFDLEVBQUU7WUFDVixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ3RCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDZixPQUFPLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUN0QjtRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQzlCLEdBQUcsQ0FBQyxDQUFDLEtBQXFCLEVBQUUsRUFBRTtZQUM1QixPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEtBQXdCLEVBQUUsRUFBRTtZQUN0QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDM0MsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUNQLEdBQUcsQ0FBQyxDQUFDLEtBQVUsRUFBRSxFQUFFO2dCQUNqQixPQUFPLEtBQUssQ0FBQztZQUNmLENBQUMsQ0FBQyxFQUNGLFFBQVEsQ0FBQyxDQUFDLElBQVMsRUFBRSxFQUFFO2dCQUNyQixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztvQkFDdEIsVUFBVSxFQUFFLElBQUk7aUJBQ2pCLENBQUMsQ0FBQztnQkFDSCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDOUIsQ0FBQyxDQUFDLEVBQ0YsVUFBVSxDQUFDLEdBQUcsRUFBRTtnQkFDZCxJQUFJLENBQUMsNkJBQTZCLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxlQUFlLENBQUMsQ0FBQztnQkFDdkUsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDM0IsQ0FBQyxDQUFDLENBQ0gsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztnSUF6RFUsbUNBQW1DO29JQUFuQyxtQ0FBbUM7MkZBQW5DLG1DQUFtQztrQkFEL0MsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCwgbWVyZ2VNYXAsIHRha2UgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoJztcbmltcG9ydCB7IE1vbmtleUVjeEVycm9ySGFuZGxpbmdTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvZXJyb3InO1xuXG5leHBvcnQgaW50ZXJmYWNlIEhlYWRlcnMge1xuICBuYW1lOiBzdHJpbmc7XG4gIHZhbHVlOiBzdHJpbmc7XG59XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnRXJyb3JJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgbW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBtb25rZXllY3hFcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm8gdG8gZG9cbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgaGFuZGxlKHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIGVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkge1xuICAgIGNvbnNvbGUubG9nKCc9PT1AJyk7XG4gICAgY29uc29sZS5sb2coJ2Vycm9yMScpO1xuICAgIHRyeSB7XG4gICAgICBjb25zb2xlLmxvZygnZXJyb3IyJyk7XG4gICAgICBpZiAodGhpcy5tb25rZXllY3hBdXRoZW50aWNhdGlvblNlcnZpY2UucmVmcmVzaFNob3VsZEhhcHBlbihlcnJvcikpIHtcbiAgICAgICAgY29uc29sZS5sb2coJ2Vycm9yMycpO1xuICAgICAgICBhd2FpdCB0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZT8ucmVmcmVzaFRva2VuKCk7XG4gICAgICAgIGNvbnNvbGUubG9nKCdlcnJvcjQnKTtcbiAgICAgICAgY29uc3QgaGVhZGVycyA9IGF3YWl0IHRoaXMubW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlLmdldFJlcXVlc3RXaXRoSGVhZGVyc0FzeW5jKFxuICAgICAgICAgIHJlcXVlc3RcbiAgICAgICAgKTtcbiAgICAgICAgY29uc29sZS5sb2coJ2Vycm9yNScpO1xuICAgICAgICBjb25zb2xlLmxvZyhoZWFkZXJzKTtcbiAgICAgICAgcmV0dXJuIGhlYWRlcnM7XG4gICAgICB9XG4gICAgfSBjYXRjaCAoZSkge1xuICAgICAgY29uc29sZS5sb2coJ2Vycm9yNicpO1xuICAgICAgY29uc29sZS5sb2coZSk7XG4gICAgICByZXR1cm4gdGhyb3dFcnJvcihlKTtcbiAgICB9XG5cbiAgICByZXR1cm4gbnVsbDtcbiAgfVxuXG4gIGludGVyY2VwdChyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCkucGlwZShcbiAgICAgIG1hcCgoZXZlbnQ6IEh0dHBFdmVudDxhbnk+KSA9PiB7XG4gICAgICAgIHJldHVybiBldmVudDtcbiAgICAgIH0pLFxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgICAgIHJldHVybiBmcm9tKHRoaXMuaGFuZGxlKHJlcXVlc3QsIGVycm9yKSkucGlwZShcbiAgICAgICAgICB0YWtlKDEpLFxuICAgICAgICAgIG1hcCgoZXZlbnQ6IGFueSkgPT4ge1xuICAgICAgICAgICAgcmV0dXJuIGV2ZW50O1xuICAgICAgICAgIH0pLFxuICAgICAgICAgIG1lcmdlTWFwKChyZXNwOiBhbnkpID0+IHtcbiAgICAgICAgICAgIHJlcXVlc3QgPSByZXF1ZXN0LmNsb25lKHtcbiAgICAgICAgICAgICAgc2V0SGVhZGVyczogcmVzcFxuICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCk7XG4gICAgICAgICAgfSksXG4gICAgICAgICAgY2F0Y2hFcnJvcigoKSA9PiB7XG4gICAgICAgICAgICB0aGlzLm1vbmtleWVjeEVycm9ySGFuZGxpbmdTZXJ2aWNlLmhhbmRsZUVycm9yKGVycm9yLCAncmVmcmVzaF90b2tlbicpO1xuICAgICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoZXJyb3IpO1xuICAgICAgICAgIH0pXG4gICAgICAgICk7XG4gICAgICB9KVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { from, throwError } from 'rxjs';
|
|
3
|
-
import { catchError, map, mergeMap, take } from 'rxjs/operators';
|
|
3
|
+
import { catchError, first, map, mergeMap, take } from 'rxjs/operators';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "../services/auth";
|
|
6
6
|
import * as i2 from "../services/error";
|
|
@@ -14,29 +14,22 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
14
14
|
}
|
|
15
15
|
async handle(request) {
|
|
16
16
|
const { url } = request;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
// not to do
|
|
31
|
-
}
|
|
32
|
-
} */
|
|
17
|
+
if (this.authService.isTokenMandatory(url)) {
|
|
18
|
+
try {
|
|
19
|
+
await this.config
|
|
20
|
+
.config()
|
|
21
|
+
.pipe(first((val) => {
|
|
22
|
+
return !!val && JSON.stringify(val) !== '{}';
|
|
23
|
+
}))
|
|
24
|
+
.toPromise();
|
|
25
|
+
}
|
|
26
|
+
catch (e) {
|
|
27
|
+
// not to do
|
|
28
|
+
}
|
|
29
|
+
}
|
|
33
30
|
let resp = null;
|
|
34
|
-
console.log('====> core 2 <====');
|
|
35
31
|
try {
|
|
36
|
-
console.log(url);
|
|
37
32
|
resp = await this.authService.getRequestWithHeadersAsync(request);
|
|
38
|
-
console.log('====> core 3 <====');
|
|
39
|
-
console.log(resp);
|
|
40
33
|
}
|
|
41
34
|
catch (e) {
|
|
42
35
|
this.errorHandlingService.handleError(e);
|
|
@@ -63,4 +56,4 @@ MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVe
|
|
|
63
56
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
64
57
|
type: Injectable
|
|
65
58
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCO1FBQzVDLE1BQU0sRUFBRSxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzFDLElBQUk7Z0JBQ0YsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDZCxNQUFNLEVBQUU7cUJBQ1IsSUFBSSxDQUNILEtBQUssQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFO29CQUNqQixPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUM7Z0JBQy9DLENBQUMsQ0FBQyxDQUNIO3FCQUNBLFNBQVMsRUFBRSxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsWUFBWTthQUNiO1NBQ0Y7UUFDRCxJQUFJLElBQUksR0FBRyxJQUFJLENBQUM7UUFDaEIsSUFBSTtZQUNGLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsMEJBQTBCLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDbkU7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDekMsT0FBTyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDdEI7UUFFRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCxTQUFTLENBQUMsT0FBeUIsRUFBRSxJQUFpQjtRQUNwRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUNwQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQ1AsR0FBRyxDQUFDLENBQUMsS0FBVSxFQUFFLEVBQUU7WUFDakIsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFDRixRQUFRLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRTtZQUNyQixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDdEIsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEtBQXdCLEVBQUUsRUFBRTtZQUN0QyxJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzdDLE9BQU8sVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztpSUFyRFUsb0NBQW9DO3FJQUFwQyxvQ0FBb0M7MkZBQXBDLG9DQUFvQztrQkFEaEQsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIGZpcnN0LCBtYXAsIG1lcmdlTWFwLCB0YWtlIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4Q29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcbmltcG9ydCB7IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGgnO1xuaW1wb3J0IHsgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lcnJvcic7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnSGVhZGVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBlcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UsXG4gICAgcHJpdmF0ZSBjb25maWc6IE1vbmtleUVjeENvbmZpZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBwcml2YXRlIGFzeW5jIGhhbmRsZShyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+KSB7XG4gICAgY29uc3QgeyB1cmwgfSA9IHJlcXVlc3Q7XG4gICAgaWYgKHRoaXMuYXV0aFNlcnZpY2UuaXNUb2tlbk1hbmRhdG9yeSh1cmwpKSB7XG4gICAgICB0cnkge1xuICAgICAgICBhd2FpdCB0aGlzLmNvbmZpZ1xuICAgICAgICAgIC5jb25maWcoKVxuICAgICAgICAgIC5waXBlKFxuICAgICAgICAgICAgZmlyc3QoKHZhbDogYW55KSA9PiB7XG4gICAgICAgICAgICAgIHJldHVybiAhIXZhbCAmJiBKU09OLnN0cmluZ2lmeSh2YWwpICE9PSAne30nO1xuICAgICAgICAgICAgfSlcbiAgICAgICAgICApXG4gICAgICAgICAgLnRvUHJvbWlzZSgpO1xuICAgICAgfSBjYXRjaCAoZSkge1xuICAgICAgICAvLyBub3QgdG8gZG9cbiAgICAgIH1cbiAgICB9XG4gICAgbGV0IHJlc3AgPSBudWxsO1xuICAgIHRyeSB7XG4gICAgICByZXNwID0gYXdhaXQgdGhpcy5hdXRoU2VydmljZS5nZXRSZXF1ZXN0V2l0aEhlYWRlcnNBc3luYyhyZXF1ZXN0KTtcbiAgICB9IGNhdGNoIChlKSB7XG4gICAgICB0aGlzLmVycm9ySGFuZGxpbmdTZXJ2aWNlLmhhbmRsZUVycm9yKGUpO1xuICAgICAgcmV0dXJuIHRocm93RXJyb3IoZSk7XG4gICAgfVxuXG4gICAgcmV0dXJuIHJlc3A7XG4gIH1cblxuICBpbnRlcmNlcHQocmVxdWVzdDogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgcmV0dXJuIGZyb20odGhpcy5oYW5kbGUocmVxdWVzdCkpLnBpcGUoXG4gICAgICB0YWtlKDEpLFxuICAgICAgbWFwKChldmVudDogYW55KSA9PiB7XG4gICAgICAgIHJldHVybiBldmVudDtcbiAgICAgIH0pLFxuICAgICAgbWVyZ2VNYXAoKHJlc3A6IGFueSkgPT4ge1xuICAgICAgICByZXF1ZXN0ID0gcmVxdWVzdC5jbG9uZSh7XG4gICAgICAgICAgc2V0SGVhZGVyczogcmVzcFxuICAgICAgICB9KTtcbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpO1xuICAgICAgfSksXG4gICAgICBjYXRjaEVycm9yKChlcnJvcjogSHR0cEVycm9yUmVzcG9uc2UpID0+IHtcbiAgICAgICAgdGhpcy5lcnJvckhhbmRsaW5nU2VydmljZS5oYW5kbGVFcnJvcihlcnJvcik7XG4gICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcbiAgICAgIH0pXG4gICAgKTtcbiAgfVxufVxuIl19
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
2
1
|
import { HttpErrorResponse } from '@angular/common/http';
|
|
3
|
-
import {
|
|
2
|
+
import { Injectable } from '@angular/core';
|
|
3
|
+
import { MonkeyEcxUtils } from '../../utils/utils';
|
|
4
4
|
import { MonkeyEcxHandlingService } from '../monkeyecx-handling.service';
|
|
5
|
+
import { MonkeyEcxHttpErrorHandlingService } from './monkeyecx-http-error-handling.service';
|
|
5
6
|
import { MonkeyEcxOthersErrorsHandlingService } from './monkeyecx-others-errors-handling.service';
|
|
6
|
-
import { MonkeyEcxUtils } from '../../utils/utils';
|
|
7
7
|
import * as i0 from "@angular/core";
|
|
8
8
|
export class MonkeyEcxErrorHandlingService {
|
|
9
9
|
constructor(injector) {
|
|
@@ -34,4 +34,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
34
34
|
type: Injectable,
|
|
35
35
|
args: [{ providedIn: 'root' }]
|
|
36
36
|
}], ctorParameters: function () { return [{ type: i0.Injector }]; } });
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWVycm9yLWhhbmRsaW5nLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9tb25rZXktZnJvbnQtY29yZS9zcmMvbGliL2NvcmUvc2VydmljZXMvZXJyb3IvbW9ua2V5ZWN4LWVycm9yLWhhbmRsaW5nLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDekQsT0FBTyxFQUFnQixVQUFVLEVBQVksTUFBTSxlQUFlLENBQUM7QUFFbkUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sRUFBRSx3QkFBd0IsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ3pFLE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQzVGLE9BQU8sRUFBRSxvQ0FBb0MsRUFBRSxNQUFNLDRDQUE0QyxDQUFDOztBQUdsRyxNQUFNLE9BQU8sNkJBQTZCO0lBQ3hDLFlBQW9CLFFBQWtCO1FBQWxCLGFBQVEsR0FBUixRQUFRLENBQVU7UUFDcEMsWUFBWTtJQUNkLENBQUM7SUFFRCxXQUFXLENBQUMsS0FBVSxFQUFFLElBQWE7UUFDbkMsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLElBQUksQ0FBQztRQUMxQixNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUM7UUFDL0QsTUFBTSx3QkFBd0IsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7UUFDakYsTUFBTSwyQkFBMkIsR0FBRyxRQUFRLENBQUMsR0FBRyxDQUFDLG9DQUFvQyxDQUFDLENBQUM7UUFFdkYsSUFBSSxLQUFLLFlBQVksaUJBQWlCLEVBQUU7WUFDdEMsTUFBTSxZQUFZLEdBQ2hCLGVBQWUsRUFBRSw4QkFBOEIsRUFBRSxJQUFJLEVBQUUsQ0FBQztZQUMxRCxJQUFJLGNBQWMsQ0FBQyx5QkFBeUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLEtBQUssZUFBZSxFQUFFO2dCQUM5RSx3QkFBd0IsQ0FBQyx1QkFBdUIsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLENBQUM7YUFDdkU7O2dCQUFNLHdCQUF3QixDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsWUFBWSxDQUFDLENBQUM7U0FDbEU7YUFBTTtZQUNMLDJCQUEyQixDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQztTQUNoRDtJQUNILENBQUM7OzBIQXBCVSw2QkFBNkI7OEhBQTdCLDZCQUE2QixjQURoQixNQUFNOzJGQUNuQiw2QkFBNkI7a0JBRHpDLFVBQVU7bUJBQUMsRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSHR0cEVycm9yUmVzcG9uc2UgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBFcnJvckhhbmRsZXIsIEluamVjdGFibGUsIEluamVjdG9yIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBNb25rZXlFY3hTZXJ2aWNlQ3JlZGVudGlhbHMgfSBmcm9tICcuLi8uLi9pbnRlcmZhY2VzJztcbmltcG9ydCB7IE1vbmtleUVjeFV0aWxzIH0gZnJvbSAnLi4vLi4vdXRpbHMvdXRpbHMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4SGFuZGxpbmdTZXJ2aWNlIH0gZnJvbSAnLi4vbW9ua2V5ZWN4LWhhbmRsaW5nLnNlcnZpY2UnO1xuaW1wb3J0IHsgTW9ua2V5RWN4SHR0cEVycm9ySGFuZGxpbmdTZXJ2aWNlIH0gZnJvbSAnLi9tb25rZXllY3gtaHR0cC1lcnJvci1oYW5kbGluZy5zZXJ2aWNlJztcbmltcG9ydCB7IE1vbmtleUVjeE90aGVyc0Vycm9yc0hhbmRsaW5nU2VydmljZSB9IGZyb20gJy4vbW9ua2V5ZWN4LW90aGVycy1lcnJvcnMtaGFuZGxpbmcuc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKHsgcHJvdmlkZWRJbjogJ3Jvb3QnIH0pXG5leHBvcnQgY2xhc3MgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgaW1wbGVtZW50cyBFcnJvckhhbmRsZXIge1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIGluamVjdG9yOiBJbmplY3Rvcikge1xuICAgIC8vIG5vdCB0byBkb1xuICB9XG5cbiAgaGFuZGxlRXJyb3IoZXJyb3I6IGFueSwgdHlwZT86IHN0cmluZykge1xuICAgIGNvbnN0IHsgaW5qZWN0b3IgfSA9IHRoaXM7XG4gICAgY29uc3QgaGFuZGxpbmdTZXJ2aWNlID0gaW5qZWN0b3IuZ2V0KE1vbmtleUVjeEhhbmRsaW5nU2VydmljZSk7XG4gICAgY29uc3QgaHR0cEVycm9ySGFuZGxpbmdTZXJ2aWNlID0gaW5qZWN0b3IuZ2V0KE1vbmtleUVjeEh0dHBFcnJvckhhbmRsaW5nU2VydmljZSk7XG4gICAgY29uc3Qgb3RoZXJzRXJyb3JzSGFuZGxpbmdTZXJ2aWNlID0gaW5qZWN0b3IuZ2V0KE1vbmtleUVjeE90aGVyc0Vycm9yc0hhbmRsaW5nU2VydmljZSk7XG5cbiAgICBpZiAoZXJyb3IgaW5zdGFuY2VvZiBIdHRwRXJyb3JSZXNwb25zZSkge1xuICAgICAgY29uc3Qgc0NyZWRlbnRpYWxzOiBNb25rZXlFY3hTZXJ2aWNlQ3JlZGVudGlhbHMgPVxuICAgICAgICBoYW5kbGluZ1NlcnZpY2U/LmdldE1vbmtleUVjeFNlcnZpY2VDcmVkZW50aWFscygpIHx8IHt9O1xuICAgICAgaWYgKE1vbmtleUVjeFV0aWxzLnBlcnNpc3ROdWxsRW1wdHlVbmRlZmluZWQodHlwZSkgJiYgdHlwZSA9PT0gJ3JlZnJlc2hfdG9rZW4nKSB7XG4gICAgICAgIGh0dHBFcnJvckhhbmRsaW5nU2VydmljZS5oYW5kbGVFcnJvclJlZnJlc2hUb2tlbihlcnJvciwgc0NyZWRlbnRpYWxzKTtcbiAgICAgIH0gZWxzZSBodHRwRXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IsIHNDcmVkZW50aWFscyk7XG4gICAgfSBlbHNlIHtcbiAgICAgIG90aGVyc0Vycm9yc0hhbmRsaW5nU2VydmljZS5oYW5kbGVFcnJvcihlcnJvcik7XG4gICAgfVxuICB9XG59XG4iXX0=
|
|
@@ -5302,12 +5302,26 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5302
5302
|
handle(request, error) {
|
|
5303
5303
|
var _a;
|
|
5304
5304
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5305
|
-
|
|
5306
|
-
|
|
5307
|
-
|
|
5308
|
-
|
|
5305
|
+
console.log('===@');
|
|
5306
|
+
console.log('error1');
|
|
5307
|
+
try {
|
|
5308
|
+
console.log('error2');
|
|
5309
|
+
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
5310
|
+
console.log('error3');
|
|
5311
|
+
yield ((_a = this.monkeyecxAuthenticationService) === null || _a === void 0 ? void 0 : _a.refreshToken());
|
|
5312
|
+
console.log('error4');
|
|
5313
|
+
const headers = yield this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
5314
|
+
console.log('error5');
|
|
5315
|
+
console.log(headers);
|
|
5316
|
+
return headers;
|
|
5317
|
+
}
|
|
5309
5318
|
}
|
|
5310
|
-
|
|
5319
|
+
catch (e) {
|
|
5320
|
+
console.log('error6');
|
|
5321
|
+
console.log(e);
|
|
5322
|
+
return throwError(e);
|
|
5323
|
+
}
|
|
5324
|
+
return null;
|
|
5311
5325
|
});
|
|
5312
5326
|
}
|
|
5313
5327
|
intercept(request, next) {
|
|
@@ -5344,29 +5358,22 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5344
5358
|
handle(request) {
|
|
5345
5359
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5346
5360
|
const { url } = request;
|
|
5347
|
-
|
|
5348
|
-
|
|
5349
|
-
|
|
5350
|
-
|
|
5351
|
-
|
|
5352
|
-
|
|
5353
|
-
|
|
5354
|
-
|
|
5355
|
-
|
|
5356
|
-
|
|
5357
|
-
|
|
5358
|
-
|
|
5359
|
-
|
|
5360
|
-
// not to do
|
|
5361
|
-
}
|
|
5362
|
-
} */
|
|
5361
|
+
if (this.authService.isTokenMandatory(url)) {
|
|
5362
|
+
try {
|
|
5363
|
+
yield this.config
|
|
5364
|
+
.config()
|
|
5365
|
+
.pipe(first((val) => {
|
|
5366
|
+
return !!val && JSON.stringify(val) !== '{}';
|
|
5367
|
+
}))
|
|
5368
|
+
.toPromise();
|
|
5369
|
+
}
|
|
5370
|
+
catch (e) {
|
|
5371
|
+
// not to do
|
|
5372
|
+
}
|
|
5373
|
+
}
|
|
5363
5374
|
let resp = null;
|
|
5364
|
-
console.log('====> core 2 <====');
|
|
5365
5375
|
try {
|
|
5366
|
-
console.log(url);
|
|
5367
5376
|
resp = yield this.authService.getRequestWithHeadersAsync(request);
|
|
5368
|
-
console.log('====> core 3 <====');
|
|
5369
|
-
console.log(resp);
|
|
5370
5377
|
}
|
|
5371
5378
|
catch (e) {
|
|
5372
5379
|
this.errorHandlingService.handleError(e);
|