monkey-front-core 0.0.364 → 0.0.366
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 +4 -4
- package/esm2020/lib/core/interceptors/monkeyecx-http-config-header.interceptor.mjs +5 -3
- package/esm2020/lib/core/services/error/monkeyecx-http-error-handling.service.mjs +6 -2
- package/fesm2015/monkey-front-core.mjs +12 -6
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +12 -6
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/monkey-front-core-0.0.366.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.364.tgz +0 -0
|
@@ -19,11 +19,11 @@ export class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
19
19
|
return throwError(null);
|
|
20
20
|
}
|
|
21
21
|
intercept(request, next) {
|
|
22
|
-
console.log('interceptor error =====');
|
|
22
|
+
console.log('interceptor error ===== 1');
|
|
23
23
|
return next.handle(request).pipe(map((event) => {
|
|
24
24
|
return event;
|
|
25
25
|
}), catchError((error) => {
|
|
26
|
-
console.log('interceptor error =====
|
|
26
|
+
console.log('interceptor error ===== 2');
|
|
27
27
|
console.log(error);
|
|
28
28
|
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
29
29
|
return event;
|
|
@@ -33,7 +33,7 @@ export class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
33
33
|
});
|
|
34
34
|
return next.handle(request);
|
|
35
35
|
}), catchError(() => {
|
|
36
|
-
console.log('interceptor error =====');
|
|
36
|
+
console.log('interceptor error ===== 3');
|
|
37
37
|
console.log(error);
|
|
38
38
|
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
39
39
|
return throwError(error);
|
|
@@ -46,4 +46,4 @@ MonkeyEcxHttpConfigErrorInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVer
|
|
|
46
46
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigErrorInterceptor, decorators: [{
|
|
47
47
|
type: Injectable
|
|
48
48
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }]; } });
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWVycm9yLmludGVyY2VwdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvbW9ua2V5LWZyb250LWNvcmUvc3JjL2xpYi9jb3JlL2ludGVyY2VwdG9ycy9tb25rZXllY3gtaHR0cC1jb25maWctZXJyb3IuaW50ZXJjZXB0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBT0EsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsSUFBSSxFQUFjLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7QUFVakUsTUFBTSxPQUFPLG1DQUFtQztJQUM5QyxZQUNVLDhCQUE4RCxFQUM5RCw2QkFBNEQ7UUFENUQsbUNBQThCLEdBQTlCLDhCQUE4QixDQUFnQztRQUM5RCxrQ0FBNkIsR0FBN0IsNkJBQTZCLENBQStCO1FBRXBFLFdBQVc7SUFDYixDQUFDO0lBRU8sS0FBSyxDQUFDLE1BQU0sQ0FBQyxPQUF5QixFQUFFLEtBQXdCO1FBQ3RFLElBQUksSUFBSSxDQUFDLDhCQUE4QixDQUFDLG1CQUFtQixDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ2xFLE1BQU0sSUFBSSxDQUFDLDhCQUE4QixFQUFFLFlBQVksRUFBRSxDQUFDO1lBQzFELE1BQU0sT0FBTyxHQUFHLE1BQU0sSUFBSSxDQUFDLDhCQUE4QixDQUFDLDBCQUEwQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQzlGLE9BQU8sT0FBTyxDQUFDO1NBQ2hCO1FBQ0QsT0FBTyxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMsMkJBQTJCLENBQUMsQ0FBQztRQUN6QyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUM5QixHQUFHLENBQUMsQ0FBQyxLQUFxQixFQUFFLEVBQUU7WUFDNUIsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFDRixVQUFVLENBQUMsQ0FBQyxLQUF3QixFQUFFLEVBQUU7WUFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1lBQ3pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDbkIsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQzNDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFDUCxHQUFHLENBQUMsQ0FBQyxLQUFVLEVBQUUsRUFBRTtnQkFDakIsT0FBTyxLQUFLLENBQUM7WUFDZixDQUFDLENBQUMsRUFDRixRQUFRLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRTtnQkFDckIsT0FBTyxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUM7b0JBQ3RCLFVBQVUsRUFBRSxJQUFJO2lCQUNqQixDQUFDLENBQUM7Z0JBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQzlCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxHQUFHLEVBQUU7Z0JBQ2QsT0FBTyxDQUFDLEdBQUcsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO2dCQUN6QyxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUNuQixJQUFJLENBQUMsNkJBQTZCLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxlQUFlLENBQUMsQ0FBQztnQkFDdkUsT0FBTyxVQUFVLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDM0IsQ0FBQyxDQUFDLENBQ0gsQ0FBQztRQUNKLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztnSUE5Q1UsbUNBQW1DO29JQUFuQyxtQ0FBbUM7MkZBQW5DLG1DQUFtQztrQkFEL0MsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCwgbWVyZ2VNYXAsIHRha2UgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQgeyBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoJztcbmltcG9ydCB7IE1vbmtleUVjeEVycm9ySGFuZGxpbmdTZXJ2aWNlIH0gZnJvbSAnLi4vc2VydmljZXMvZXJyb3InO1xuXG5leHBvcnQgaW50ZXJmYWNlIEhlYWRlcnMge1xuICBuYW1lOiBzdHJpbmc7XG4gIHZhbHVlOiBzdHJpbmc7XG59XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnRXJyb3JJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIGNvbnN0cnVjdG9yKFxuICAgIHByaXZhdGUgbW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBtb25rZXllY3hFcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm8gdG8gZG9cbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgaGFuZGxlKHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIGVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkge1xuICAgIGlmICh0aGlzLm1vbmtleWVjeEF1dGhlbnRpY2F0aW9uU2VydmljZS5yZWZyZXNoU2hvdWxkSGFwcGVuKGVycm9yKSkge1xuICAgICAgYXdhaXQgdGhpcy5tb25rZXllY3hBdXRoZW50aWNhdGlvblNlcnZpY2U/LnJlZnJlc2hUb2tlbigpO1xuICAgICAgY29uc3QgaGVhZGVycyA9IGF3YWl0IHRoaXMubW9ua2V5ZWN4QXV0aGVudGljYXRpb25TZXJ2aWNlLmdldFJlcXVlc3RXaXRoSGVhZGVyc0FzeW5jKHJlcXVlc3QpO1xuICAgICAgcmV0dXJuIGhlYWRlcnM7XG4gICAgfVxuICAgIHJldHVybiB0aHJvd0Vycm9yKG51bGwpO1xuICB9XG5cbiAgaW50ZXJjZXB0KHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIGNvbnNvbGUubG9nKCdpbnRlcmNlcHRvciBlcnJvciA9PT09PSAxJyk7XG4gICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcXVlc3QpLnBpcGUoXG4gICAgICBtYXAoKGV2ZW50OiBIdHRwRXZlbnQ8YW55PikgPT4ge1xuICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICB9KSxcbiAgICAgIGNhdGNoRXJyb3IoKGVycm9yOiBIdHRwRXJyb3JSZXNwb25zZSkgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZygnaW50ZXJjZXB0b3IgZXJyb3IgPT09PT0gMicpO1xuICAgICAgICBjb25zb2xlLmxvZyhlcnJvcik7XG4gICAgICAgIHJldHVybiBmcm9tKHRoaXMuaGFuZGxlKHJlcXVlc3QsIGVycm9yKSkucGlwZShcbiAgICAgICAgICB0YWtlKDEpLFxuICAgICAgICAgIG1hcCgoZXZlbnQ6IGFueSkgPT4ge1xuICAgICAgICAgICAgcmV0dXJuIGV2ZW50O1xuICAgICAgICAgIH0pLFxuICAgICAgICAgIG1lcmdlTWFwKChyZXNwOiBhbnkpID0+IHtcbiAgICAgICAgICAgIHJlcXVlc3QgPSByZXF1ZXN0LmNsb25lKHtcbiAgICAgICAgICAgICAgc2V0SGVhZGVyczogcmVzcFxuICAgICAgICAgICAgfSk7XG4gICAgICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCk7XG4gICAgICAgICAgfSksXG4gICAgICAgICAgY2F0Y2hFcnJvcigoKSA9PiB7XG4gICAgICAgICAgICBjb25zb2xlLmxvZygnaW50ZXJjZXB0b3IgZXJyb3IgPT09PT0gMycpO1xuICAgICAgICAgICAgY29uc29sZS5sb2coZXJyb3IpO1xuICAgICAgICAgICAgdGhpcy5tb25rZXllY3hFcnJvckhhbmRsaW5nU2VydmljZS5oYW5kbGVFcnJvcihlcnJvciwgJ3JlZnJlc2hfdG9rZW4nKTtcbiAgICAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKGVycm9yKTtcbiAgICAgICAgICB9KVxuICAgICAgICApO1xuICAgICAgfSlcbiAgICApO1xuICB9XG59XG4iXX0=
|
|
@@ -32,13 +32,15 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
32
32
|
resp = await this.authService.getRequestWithHeadersAsync(request);
|
|
33
33
|
}
|
|
34
34
|
catch (e) {
|
|
35
|
+
console.log('interceptor header ===== 2');
|
|
36
|
+
console.log(e);
|
|
35
37
|
this.errorHandlingService.handleError(e);
|
|
36
38
|
return throwError(e);
|
|
37
39
|
}
|
|
38
40
|
return resp;
|
|
39
41
|
}
|
|
40
42
|
intercept(request, next) {
|
|
41
|
-
console.log('interceptor header =====');
|
|
43
|
+
console.log('interceptor header ===== 1');
|
|
42
44
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
43
45
|
return event;
|
|
44
46
|
}), mergeMap((resp) => {
|
|
@@ -47,7 +49,7 @@ export class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
47
49
|
});
|
|
48
50
|
return next.handle(request);
|
|
49
51
|
}), catchError((error) => {
|
|
50
|
-
console.log('interceptor header =====');
|
|
52
|
+
console.log('interceptor header ===== 3');
|
|
51
53
|
console.log(error);
|
|
52
54
|
this.errorHandlingService.handleError(error);
|
|
53
55
|
return throwError(error);
|
|
@@ -59,4 +61,4 @@ MonkeyEcxHttpConfigHeaderInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVe
|
|
|
59
61
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxHttpConfigHeaderInterceptor, decorators: [{
|
|
60
62
|
type: Injectable
|
|
61
63
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxAuthenticationService }, { type: i2.MonkeyEcxErrorHandlingService }, { type: i3.MonkeyEcxConfigService }]; } });
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
64
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL21vbmtleS1mcm9udC1jb3JlL3NyYy9saWIvY29yZS9pbnRlcmNlcHRvcnMvbW9ua2V5ZWN4LWh0dHAtY29uZmlnLWhlYWRlci5pbnRlcmNlcHRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzNDLE9BQU8sRUFBRSxJQUFJLEVBQWMsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3BELE9BQU8sRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBTXhFLE1BQU0sT0FBTyxvQ0FBb0M7SUFDL0MsWUFDVSxXQUEyQyxFQUMzQyxvQkFBbUQsRUFDbkQsTUFBOEI7UUFGOUIsZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBQzNDLHlCQUFvQixHQUFwQixvQkFBb0IsQ0FBK0I7UUFDbkQsV0FBTSxHQUFOLE1BQU0sQ0FBd0I7UUFFdEMsWUFBWTtJQUNkLENBQUM7SUFFTyxLQUFLLENBQUMsTUFBTSxDQUFDLE9BQXlCO1FBQzVDLE1BQU0sRUFBRSxHQUFHLEVBQUUsR0FBRyxPQUFPLENBQUM7UUFDeEIsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQzFDLElBQUk7Z0JBQ0YsTUFBTSxJQUFJLENBQUMsTUFBTTtxQkFDZCxNQUFNLEVBQUU7cUJBQ1IsSUFBSSxDQUNILEtBQUssQ0FBQyxDQUFDLEdBQVEsRUFBRSxFQUFFO29CQUNqQixPQUFPLENBQUMsQ0FBQyxHQUFHLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLENBQUM7Z0JBQy9DLENBQUMsQ0FBQyxDQUNIO3FCQUNBLFNBQVMsRUFBRSxDQUFDO2FBQ2hCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsWUFBWTthQUNiO1NBQ0Y7UUFDRCxJQUFJLElBQUksR0FBRyxJQUFJLENBQUM7UUFDaEIsSUFBSTtZQUNGLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsMEJBQTBCLENBQUMsT0FBTyxDQUFDLENBQUM7U0FDbkU7UUFBQyxPQUFPLENBQUMsRUFBRTtZQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztZQUMxQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ2YsSUFBSSxDQUFDLG9CQUFvQixDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN6QyxPQUFPLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUN0QjtRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELFNBQVMsQ0FBQyxPQUF5QixFQUFFLElBQWlCO1FBQ3BELE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQztRQUMxQyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUNwQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQ1AsR0FBRyxDQUFDLENBQUMsS0FBVSxFQUFFLEVBQUU7WUFDakIsT0FBTyxLQUFLLENBQUM7UUFDZixDQUFDLENBQUMsRUFDRixRQUFRLENBQUMsQ0FBQyxJQUFTLEVBQUUsRUFBRTtZQUNyQixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQztnQkFDdEIsVUFBVSxFQUFFLElBQUk7YUFDakIsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLENBQUMsQ0FBQyxFQUNGLFVBQVUsQ0FBQyxDQUFDLEtBQXdCLEVBQUUsRUFBRTtZQUN0QyxPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDLENBQUM7WUFDMUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNuQixJQUFJLENBQUMsb0JBQW9CLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzdDLE9BQU8sVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOztpSUExRFUsb0NBQW9DO3FJQUFwQyxvQ0FBb0M7MkZBQXBDLG9DQUFvQztrQkFEaEQsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFcnJvclJlc3BvbnNlLFxuICBIdHRwRXZlbnQsXG4gIEh0dHBIYW5kbGVyLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0XG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IGZyb20sIE9ic2VydmFibGUsIHRocm93RXJyb3IgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGNhdGNoRXJyb3IsIGZpcnN0LCBtYXAsIG1lcmdlTWFwLCB0YWtlIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuaW1wb3J0IHsgTW9ua2V5RWN4Q29uZmlnU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzJztcbmltcG9ydCB7IE1vbmtleUVjeEF1dGhlbnRpY2F0aW9uU2VydmljZSB9IGZyb20gJy4uL3NlcnZpY2VzL2F1dGgnO1xuaW1wb3J0IHsgTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lcnJvcic7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBNb25rZXlFY3hIdHRwQ29uZmlnSGVhZGVySW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGF1dGhTZXJ2aWNlOiBNb25rZXlFY3hBdXRoZW50aWNhdGlvblNlcnZpY2UsXG4gICAgcHJpdmF0ZSBlcnJvckhhbmRsaW5nU2VydmljZTogTW9ua2V5RWN4RXJyb3JIYW5kbGluZ1NlcnZpY2UsXG4gICAgcHJpdmF0ZSBjb25maWc6IE1vbmtleUVjeENvbmZpZ1NlcnZpY2VcbiAgKSB7XG4gICAgLy8gbm90IHRvIGRvXG4gIH1cblxuICBwcml2YXRlIGFzeW5jIGhhbmRsZShyZXF1ZXN0OiBIdHRwUmVxdWVzdDxhbnk+KSB7XG4gICAgY29uc3QgeyB1cmwgfSA9IHJlcXVlc3Q7XG4gICAgaWYgKHRoaXMuYXV0aFNlcnZpY2UuaXNUb2tlbk1hbmRhdG9yeSh1cmwpKSB7XG4gICAgICB0cnkge1xuICAgICAgICBhd2FpdCB0aGlzLmNvbmZpZ1xuICAgICAgICAgIC5jb25maWcoKVxuICAgICAgICAgIC5waXBlKFxuICAgICAgICAgICAgZmlyc3QoKHZhbDogYW55KSA9PiB7XG4gICAgICAgICAgICAgIHJldHVybiAhIXZhbCAmJiBKU09OLnN0cmluZ2lmeSh2YWwpICE9PSAne30nO1xuICAgICAgICAgICAgfSlcbiAgICAgICAgICApXG4gICAgICAgICAgLnRvUHJvbWlzZSgpO1xuICAgICAgfSBjYXRjaCAoZSkge1xuICAgICAgICAvLyBub3QgdG8gZG9cbiAgICAgIH1cbiAgICB9XG4gICAgbGV0IHJlc3AgPSBudWxsO1xuICAgIHRyeSB7XG4gICAgICByZXNwID0gYXdhaXQgdGhpcy5hdXRoU2VydmljZS5nZXRSZXF1ZXN0V2l0aEhlYWRlcnNBc3luYyhyZXF1ZXN0KTtcbiAgICB9IGNhdGNoIChlKSB7XG4gICAgICBjb25zb2xlLmxvZygnaW50ZXJjZXB0b3IgaGVhZGVyID09PT09IDInKTtcbiAgICAgIGNvbnNvbGUubG9nKGUpO1xuICAgICAgdGhpcy5lcnJvckhhbmRsaW5nU2VydmljZS5oYW5kbGVFcnJvcihlKTtcbiAgICAgIHJldHVybiB0aHJvd0Vycm9yKGUpO1xuICAgIH1cblxuICAgIHJldHVybiByZXNwO1xuICB9XG5cbiAgaW50ZXJjZXB0KHJlcXVlc3Q6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIGNvbnNvbGUubG9nKCdpbnRlcmNlcHRvciBoZWFkZXIgPT09PT0gMScpO1xuICAgIHJldHVybiBmcm9tKHRoaXMuaGFuZGxlKHJlcXVlc3QpKS5waXBlKFxuICAgICAgdGFrZSgxKSxcbiAgICAgIG1hcCgoZXZlbnQ6IGFueSkgPT4ge1xuICAgICAgICByZXR1cm4gZXZlbnQ7XG4gICAgICB9KSxcbiAgICAgIG1lcmdlTWFwKChyZXNwOiBhbnkpID0+IHtcbiAgICAgICAgcmVxdWVzdCA9IHJlcXVlc3QuY2xvbmUoe1xuICAgICAgICAgIHNldEhlYWRlcnM6IHJlc3BcbiAgICAgICAgfSk7XG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgIH0pLFxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3I6IEh0dHBFcnJvclJlc3BvbnNlKSA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKCdpbnRlcmNlcHRvciBoZWFkZXIgPT09PT0gMycpO1xuICAgICAgICBjb25zb2xlLmxvZyhlcnJvcik7XG4gICAgICAgIHRoaXMuZXJyb3JIYW5kbGluZ1NlcnZpY2UuaGFuZGxlRXJyb3IoZXJyb3IpO1xuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnJvcik7XG4gICAgICB9KVxuICAgICk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -53,7 +53,9 @@ export class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
53
53
|
}
|
|
54
54
|
handleMessage(error, mkc) {
|
|
55
55
|
// eslint-disable-next-line camelcase
|
|
56
|
-
const { notifications, error_description, message } = error
|
|
56
|
+
const { notifications, error_description, message } = error?.error || {
|
|
57
|
+
notifications: '', error_description: '', message: ''
|
|
58
|
+
};
|
|
57
59
|
let customMessage = '';
|
|
58
60
|
if (message) {
|
|
59
61
|
customMessage = message;
|
|
@@ -92,6 +94,7 @@ export class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
92
94
|
const { router, tokenStorage } = this;
|
|
93
95
|
const { status } = error;
|
|
94
96
|
const { companyType } = await tokenStorage?.getToken() || { companyType: '' };
|
|
97
|
+
console.log(error);
|
|
95
98
|
const routes = {
|
|
96
99
|
403: 'forbidden',
|
|
97
100
|
500: 'service-problems',
|
|
@@ -104,6 +107,7 @@ export class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
104
107
|
else {
|
|
105
108
|
route = `${route}/pages`;
|
|
106
109
|
}
|
|
110
|
+
console.log(route);
|
|
107
111
|
const found = routes[status];
|
|
108
112
|
let timeout = 0;
|
|
109
113
|
if (found && !this.isHttpCodeIgnoreRedirect(mkc, error?.status)) {
|
|
@@ -132,4 +136,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
132
136
|
providedIn: 'root'
|
|
133
137
|
}]
|
|
134
138
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxService }, { type: i2.MonkeyEcxTokenStorageService }, { type: i3.MonkeyEcxAuthenticationService }, { type: i4.Router }, { type: i5.MonkeyStyleGuideSnackbarService }, { type: i6.TranslateService }]; } });
|
|
135
|
-
//# 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":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKnD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;;;;;;;;AAOrD,MAAM,OAAO,iCAAkC,SAAQ,uBAAuB;IAC5E,YACE,gBAAkC,EAClC,YAA0C,EAClC,8BAA8D,EAC9D,MAAc,EACd,eAAgD,EAChD,gBAAkC;QAE1C,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAL9B,mCAA8B,GAA9B,8BAA8B,CAAgC;QAC9D,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAiC;QAChD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAI1C,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;IAC1D,CAAC;IAEO,uBAAuB,CAAC,EAA+B,EAAE,QAAgB;QAC/E,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE;YACtE,OAAO,KAAK,CAAC;SACd;QAED,MAAM,KAAK,GAAG,CAAC,EAAE,EAAE,YAAY,EAAE,cAAc,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/E,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,wBAAwB,CAC9B,EAA+B,EAC/B,QAAgB;QAEhB,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE;YACtE,OAAO,KAAK,CAAC;SACd;QAED,MAAM,KAAK,GAAG,CAAC,EAAE,EAAE,YAAY,EAAE,sBAAsB,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAEvF,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,cAAc,CAAC,MAAc;QACnC,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,EAAE;YACpC,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,WAAW,CACjB,OAAe,EACf,KAAwB,EACxB,GAAgC;QAEhC,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE;YACpD,eAAe,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK;gBACzB,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;gBACvC,QAAQ,EAAE,IAAI;gBACd,kBAAkB,EAAE,QAAQ;gBAC5B,gBAAgB,EAAE,KAAK;aACxB,CAAC,CAAC;SACJ;IACH,CAAC;IAEO,aAAa,CAAC,KAAwB,EAAE,GAAgC;QAC9E,qCAAqC;QACrC,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC;QAClE,IAAI,aAAa,GAAG,EAAE,CAAC;QAEvB,IAAI,OAAO,EAAE;YACX,aAAa,GAAG,OAAO,CAAC;SACzB;QAED,qCAAqC;QACrC,IAAI,iBAAiB,EAAE;YACrB,qCAAqC;YACrC,aAAa,GAAG,iBAAiB,CAAC;SACnC;QAED,IAAI,aAAa,EAAE;YACjB,aAAa,GAAG,aAAa,CAAC;SAC/B;QAED,IAAI,CAAC,aAAa,EAAE;YAClB,IAAI,KAAK,CAAC,KAAK,YAAY,IAAI,EAAE;gBAC/B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBACnC,IAAI,EAAE,kBAAkB;iBACzB,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAChC,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;oBACvC,MAAM,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC;oBAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;oBAC5C,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;oBACvC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACzB;iBAAM;gBACL,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aACpE;SACF;aAAM;YACL,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;SAC7C;IACH,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,KAAwB,EAAE,GAAgC;QACjF,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;QACtC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACzB,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAE9E,MAAM,MAAM,GAAQ;YAClB,GAAG,EAAE,WAAW;YAChB,GAAG,EAAE,kBAAkB;YACvB,GAAG,EAAE,kBAAkB;SACxB,CAAC;QAEF,IAAI,KAAK,GAAG,MAAM,CAAC;QACnB,IAAI,WAAW,EAAE;YACf,KAAK,GAAG,GAAG,KAAK,IAAI,WAAW,QAAQ,CAAC;SACzC;aAAM;YACL,KAAK,GAAG,GAAG,KAAK,QAAQ,CAAC;SAC1B;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;YAC/D,KAAK,GAAG,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC;YAC1C,OAAO,GAAG,GAAG,CAAC;YACd,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SAC1B;QAED,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;IAEM,uBAAuB,CAAC,KAAwB,EAAE,GAAgC;QACvF,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;YAChD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,8BAA8B,CAAC,wBAAwB,EAAE,EAAE,EAAE,CAAC,CAAC;SACjF;aAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE;YAC3D,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SAChC;IACH,CAAC;;8HA/IU,iCAAiC;kIAAjC,iCAAiC,cAFhC,MAAM;2FAEP,iCAAiC;kBAH7C,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","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    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"]}
|
|
139
|
+
//# 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    console.log(error);\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    console.log(route);\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"]}
|
|
@@ -4374,7 +4374,9 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
4374
4374
|
handleMessage(error, mkc) {
|
|
4375
4375
|
var _a;
|
|
4376
4376
|
// eslint-disable-next-line camelcase
|
|
4377
|
-
const { notifications, error_description, message } = error.error
|
|
4377
|
+
const { notifications, error_description, message } = (error === null || error === void 0 ? void 0 : error.error) || {
|
|
4378
|
+
notifications: '', error_description: '', message: ''
|
|
4379
|
+
};
|
|
4378
4380
|
let customMessage = '';
|
|
4379
4381
|
if (message) {
|
|
4380
4382
|
customMessage = message;
|
|
@@ -4415,6 +4417,7 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
4415
4417
|
const { router, tokenStorage } = this;
|
|
4416
4418
|
const { status } = error;
|
|
4417
4419
|
const { companyType } = (yield (tokenStorage === null || tokenStorage === void 0 ? void 0 : tokenStorage.getToken())) || { companyType: '' };
|
|
4420
|
+
console.log(error);
|
|
4418
4421
|
const routes = {
|
|
4419
4422
|
403: 'forbidden',
|
|
4420
4423
|
500: 'service-problems',
|
|
@@ -4427,6 +4430,7 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
4427
4430
|
else {
|
|
4428
4431
|
route = `${route}/pages`;
|
|
4429
4432
|
}
|
|
4433
|
+
console.log(route);
|
|
4430
4434
|
const found = routes[status];
|
|
4431
4435
|
let timeout = 0;
|
|
4432
4436
|
if (found && !this.isHttpCodeIgnoreRedirect(mkc, error === null || error === void 0 ? void 0 : error.status)) {
|
|
@@ -5309,11 +5313,11 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5309
5313
|
});
|
|
5310
5314
|
}
|
|
5311
5315
|
intercept(request, next) {
|
|
5312
|
-
console.log('interceptor error =====');
|
|
5316
|
+
console.log('interceptor error ===== 1');
|
|
5313
5317
|
return next.handle(request).pipe(map((event) => {
|
|
5314
5318
|
return event;
|
|
5315
5319
|
}), catchError((error) => {
|
|
5316
|
-
console.log('interceptor error =====
|
|
5320
|
+
console.log('interceptor error ===== 2');
|
|
5317
5321
|
console.log(error);
|
|
5318
5322
|
return from(this.handle(request, error)).pipe(take(1), map((event) => {
|
|
5319
5323
|
return event;
|
|
@@ -5323,7 +5327,7 @@ class MonkeyEcxHttpConfigErrorInterceptor {
|
|
|
5323
5327
|
});
|
|
5324
5328
|
return next.handle(request);
|
|
5325
5329
|
}), catchError(() => {
|
|
5326
|
-
console.log('interceptor error =====');
|
|
5330
|
+
console.log('interceptor error ===== 3');
|
|
5327
5331
|
console.log(error);
|
|
5328
5332
|
this.monkeyecxErrorHandlingService.handleError(error, 'refresh_token');
|
|
5329
5333
|
return throwError(error);
|
|
@@ -5365,6 +5369,8 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5365
5369
|
resp = yield this.authService.getRequestWithHeadersAsync(request);
|
|
5366
5370
|
}
|
|
5367
5371
|
catch (e) {
|
|
5372
|
+
console.log('interceptor header ===== 2');
|
|
5373
|
+
console.log(e);
|
|
5368
5374
|
this.errorHandlingService.handleError(e);
|
|
5369
5375
|
return throwError(e);
|
|
5370
5376
|
}
|
|
@@ -5372,7 +5378,7 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5372
5378
|
});
|
|
5373
5379
|
}
|
|
5374
5380
|
intercept(request, next) {
|
|
5375
|
-
console.log('interceptor header =====');
|
|
5381
|
+
console.log('interceptor header ===== 1');
|
|
5376
5382
|
return from(this.handle(request)).pipe(take(1), map((event) => {
|
|
5377
5383
|
return event;
|
|
5378
5384
|
}), mergeMap((resp) => {
|
|
@@ -5381,7 +5387,7 @@ class MonkeyEcxHttpConfigHeaderInterceptor {
|
|
|
5381
5387
|
});
|
|
5382
5388
|
return next.handle(request);
|
|
5383
5389
|
}), catchError((error) => {
|
|
5384
|
-
console.log('interceptor header =====');
|
|
5390
|
+
console.log('interceptor header ===== 3');
|
|
5385
5391
|
console.log(error);
|
|
5386
5392
|
this.errorHandlingService.handleError(error);
|
|
5387
5393
|
return throwError(error);
|