monkey-front-core 0.0.370 → 0.0.372
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/services/error/monkeyecx-error-handling.service.mjs +4 -4
- package/esm2020/lib/core/services/error/monkeyecx-http-error-handling.service.mjs +3 -2
- package/fesm2015/monkey-front-core.mjs +21 -6
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +21 -6
- 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.372.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.370.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,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=
|
|
@@ -118,7 +118,8 @@ export class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
118
118
|
}, timeout);
|
|
119
119
|
}
|
|
120
120
|
handleErrorRefreshToken(error, mkc) {
|
|
121
|
-
|
|
121
|
+
const hasToRefresh = this.monkeyecxAuthenticationService.refreshShouldHappen(error);
|
|
122
|
+
if ((error.status === 401 || error.status === 400) && hasToRefresh) {
|
|
122
123
|
NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});
|
|
123
124
|
}
|
|
124
125
|
else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {
|
|
@@ -134,4 +135,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
134
135
|
providedIn: 'root'
|
|
135
136
|
}]
|
|
136
137
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxService }, { type: i2.MonkeyEcxTokenStorageService }, { type: i3.MonkeyEcxAuthenticationService }, { type: i4.Router }, { type: i5.MonkeyStyleGuideSnackbarService }, { type: i6.TranslateService }]; } });
|
|
137
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monkeyecx-http-error-handling.service.js","sourceRoot":"","sources":["../../../../../../../projects/monkey-front-core/src/lib/core/services/error/monkeyecx-http-error-handling.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\nimport { Injectable, NgZone } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { TranslateService } from '@ngx-translate/core';\nimport { MonkeyStyleGuideSnackbarService } from 'monkey-style-guide';\nimport { MonkeyEcxServiceCredentials } from '../../interfaces';\nimport { MonkeyEcxUtils } from '../../utils/utils';\nimport { MonkeyEcxAuthenticationService } from '../auth';\nimport { MonkeyEcxCommonsService } from '../commons';\nimport { MonkeyEcxService } from '../monkeyecx-service.service';\nimport { MonkeyEcxTokenStorageService } from '../storage';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {\n  constructor(\n    monkeyecxService: MonkeyEcxService,\n    tokenStorage: MonkeyEcxTokenStorageService,\n    private monkeyecxAuthenticationService: MonkeyEcxAuthenticationService,\n    private router: Router,\n    private snackbarService: MonkeyStyleGuideSnackbarService,\n    private translateService: TranslateService\n  ) {\n    super(monkeyecxService, tokenStorage);\n\n    super.resolve(null, null);\n\n    this.geti18n(this.translateService, 'SERVICES.WARNING');\n  }\n\n  private isHttpCodeIgnoreMessage(tp: MonkeyEcxServiceCredentials, httpCode: number): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnore || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private isHttpCodeIgnoreRedirect(\n    tp: MonkeyEcxServiceCredentials,\n    httpCode: number\n  ): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnoreRedirect || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private getMessageType(status: number): 'theme' | 'warning' | 'success' | 'error' | 'question' {\n    if (status === 409 || status === 400) {\n      return 'warning';\n    }\n\n    return 'error';\n  }\n\n  private showMessage(\n    message: string,\n    error: HttpErrorResponse,\n    mkc: MonkeyEcxServiceCredentials\n  ) {\n    const { snackbarService } = this;\n    if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      snackbarService.show({\n        title: this.__i18n?.TITLE,\n        message,\n        type: this.getMessageType(error.status),\n        duration: 4000,\n        horizontalPosition: 'center',\n        verticalPosition: 'top'\n      });\n    }\n  }\n\n  private handleMessage(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    // eslint-disable-next-line camelcase\n    const { notifications, error_description, message } = error?.error || {\n      notifications: '', error_description: '', message: ''\n    };\n\n    let customMessage = '';\n\n    if (message) {\n      customMessage = message;\n    }\n\n    // eslint-disable-next-line camelcase\n    if (error_description) {\n      // eslint-disable-next-line camelcase\n      customMessage = error_description;\n    }\n\n    if (notifications) {\n      customMessage = notifications;\n    }\n\n    if (!customMessage) {\n      if (error.error instanceof Blob) {\n        const blob = new Blob([error.error], {\n          type: 'application/json'\n        });\n        const reader = new FileReader();\n        reader.addEventListener('loadend', (e) => {\n          const text = e?.target?.result;\n          const jsonResp = JSON.parse(text as string);\n          customMessage = jsonResp.notifications;\n          this.showMessage(customMessage, error, mkc);\n        });\n        reader.readAsText(blob);\n      } else {\n        this.showMessage(this.__i18n['ERROR-HANDLING']?.ERROR, error, mkc);\n      }\n    } else {\n      this.showMessage(customMessage, error, mkc);\n    }\n  }\n\n  public async handleError(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const { router, tokenStorage } = this;\n    const { status } = error;\n    const { companyType } = await tokenStorage?.getToken() || { companyType: '' };\n\n    const routes: any = {\n      403: 'forbidden',\n      500: 'service-problems',\n      503: 'service-problems'\n    };\n\n    let route = '/app';\n    if (companyType) {\n      route = `${route}/${companyType}/pages`;\n    } else {\n      route = `${route}/pages`;\n    }\n\n    const found = routes[status];\n    let timeout = 0;\n\n    if (found && !this.isHttpCodeIgnoreRedirect(mkc, error?.status)) {\n      route = `${route}/${found}`.toLowerCase();\n      timeout = 800;\n      router.navigate([route]);\n    }\n\n    setTimeout(() => {\n      this.handleMessage(error, mkc);\n    }, timeout);\n  }\n\n  public handleErrorRefreshToken(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    if (error.status === 401 || error.status === 400) {\n      NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});\n    } else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      this.handleMessage(error, mkc);\n    }\n  }\n}\n"]}
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monkeyecx-http-error-handling.service.js","sourceRoot":"","sources":["../../../../../../../projects/monkey-front-core/src/lib/core/services/error/monkeyecx-http-error-handling.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\nimport { Injectable, NgZone } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { TranslateService } from '@ngx-translate/core';\nimport { MonkeyStyleGuideSnackbarService } from 'monkey-style-guide';\nimport { MonkeyEcxServiceCredentials } from '../../interfaces';\nimport { MonkeyEcxUtils } from '../../utils/utils';\nimport { MonkeyEcxAuthenticationService } from '../auth';\nimport { MonkeyEcxCommonsService } from '../commons';\nimport { MonkeyEcxService } from '../monkeyecx-service.service';\nimport { MonkeyEcxTokenStorageService } from '../storage';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {\n  constructor(\n    monkeyecxService: MonkeyEcxService,\n    tokenStorage: MonkeyEcxTokenStorageService,\n    private monkeyecxAuthenticationService: MonkeyEcxAuthenticationService,\n    private router: Router,\n    private snackbarService: MonkeyStyleGuideSnackbarService,\n    private translateService: TranslateService\n  ) {\n    super(monkeyecxService, tokenStorage);\n\n    super.resolve(null, null);\n\n    this.geti18n(this.translateService, 'SERVICES.WARNING');\n  }\n\n  private isHttpCodeIgnoreMessage(tp: MonkeyEcxServiceCredentials, httpCode: number): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnore || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private isHttpCodeIgnoreRedirect(\n    tp: MonkeyEcxServiceCredentials,\n    httpCode: number\n  ): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnoreRedirect || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private getMessageType(status: number): 'theme' | 'warning' | 'success' | 'error' | 'question' {\n    if (status === 409 || status === 400) {\n      return 'warning';\n    }\n\n    return 'error';\n  }\n\n  private showMessage(\n    message: string,\n    error: HttpErrorResponse,\n    mkc: MonkeyEcxServiceCredentials\n  ) {\n    const { snackbarService } = this;\n    if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      snackbarService.show({\n        title: this.__i18n?.TITLE,\n        message,\n        type: this.getMessageType(error.status),\n        duration: 4000,\n        horizontalPosition: 'center',\n        verticalPosition: 'top'\n      });\n    }\n  }\n\n  private handleMessage(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    // eslint-disable-next-line camelcase\n    const { notifications, error_description, message } = error?.error || {\n      notifications: '', error_description: '', message: ''\n    };\n\n    let customMessage = '';\n\n    if (message) {\n      customMessage = message;\n    }\n\n    // eslint-disable-next-line camelcase\n    if (error_description) {\n      // eslint-disable-next-line camelcase\n      customMessage = error_description;\n    }\n\n    if (notifications) {\n      customMessage = notifications;\n    }\n\n    if (!customMessage) {\n      if (error.error instanceof Blob) {\n        const blob = new Blob([error.error], {\n          type: 'application/json'\n        });\n        const reader = new FileReader();\n        reader.addEventListener('loadend', (e) => {\n          const text = e?.target?.result;\n          const jsonResp = JSON.parse(text as string);\n          customMessage = jsonResp.notifications;\n          this.showMessage(customMessage, error, mkc);\n        });\n        reader.readAsText(blob);\n      } else {\n        this.showMessage(this.__i18n['ERROR-HANDLING']?.ERROR, error, mkc);\n      }\n    } else {\n      this.showMessage(customMessage, error, mkc);\n    }\n  }\n\n  public async handleError(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const { router, tokenStorage } = this;\n    const { status } = error;\n    const { companyType } = await tokenStorage?.getToken() || { companyType: '' };\n\n    const routes: any = {\n      403: 'forbidden',\n      500: 'service-problems',\n      503: 'service-problems'\n    };\n\n    let route = '/app';\n    if (companyType) {\n      route = `${route}/${companyType}/pages`;\n    } else {\n      route = `${route}/pages`;\n    }\n\n    const found = routes[status];\n    let timeout = 0;\n\n    if (found && !this.isHttpCodeIgnoreRedirect(mkc, error?.status)) {\n      route = `${route}/${found}`.toLowerCase();\n      timeout = 800;\n      router.navigate([route]);\n    }\n\n    setTimeout(() => {\n      this.handleMessage(error, mkc);\n    }, timeout);\n  }\n\n  public handleErrorRefreshToken(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const hasToRefresh = this.monkeyecxAuthenticationService.refreshShouldHappen(error);\n    if ((error.status === 401 || error.status === 400) && hasToRefresh) {\n      NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});\n    } else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      this.handleMessage(error, mkc);\n    }\n  }\n}\n"]}
|
|
@@ -4442,7 +4442,8 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
4442
4442
|
});
|
|
4443
4443
|
}
|
|
4444
4444
|
handleErrorRefreshToken(error, mkc) {
|
|
4445
|
-
|
|
4445
|
+
const hasToRefresh = this.monkeyecxAuthenticationService.refreshShouldHappen(error);
|
|
4446
|
+
if ((error.status === 401 || error.status === 400) && hasToRefresh) {
|
|
4446
4447
|
NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});
|
|
4447
4448
|
}
|
|
4448
4449
|
else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {
|
|
@@ -5302,12 +5303,26 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5302
5303
|
handle(request, error) {
|
|
5303
5304
|
var _a;
|
|
5304
5305
|
return __awaiter(this, void 0, void 0, function* () {
|
|
5305
|
-
|
|
5306
|
-
|
|
5307
|
-
|
|
5308
|
-
|
|
5306
|
+
console.log('===@');
|
|
5307
|
+
console.log('error1');
|
|
5308
|
+
try {
|
|
5309
|
+
console.log('error2');
|
|
5310
|
+
if (this.monkeyecxAuthenticationService.refreshShouldHappen(error)) {
|
|
5311
|
+
console.log('error3');
|
|
5312
|
+
yield ((_a = this.monkeyecxAuthenticationService) === null || _a === void 0 ? void 0 : _a.refreshToken());
|
|
5313
|
+
console.log('error4');
|
|
5314
|
+
const headers = yield this.monkeyecxAuthenticationService.getRequestWithHeadersAsync(request);
|
|
5315
|
+
console.log('error5');
|
|
5316
|
+
console.log(headers);
|
|
5317
|
+
return headers;
|
|
5318
|
+
}
|
|
5319
|
+
}
|
|
5320
|
+
catch (e) {
|
|
5321
|
+
console.log('error6');
|
|
5322
|
+
console.log(e);
|
|
5323
|
+
return throwError(e);
|
|
5309
5324
|
}
|
|
5310
|
-
return
|
|
5325
|
+
return null;
|
|
5311
5326
|
});
|
|
5312
5327
|
}
|
|
5313
5328
|
intercept(request, next) {
|