visorus-erp-core 17.8.0 → 17.9.0
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.
|
@@ -21,7 +21,7 @@ export class httpInterceptor {
|
|
|
21
21
|
this.loadingScreenService.startLoading(); // this.loadingService.start();
|
|
22
22
|
return next.handle(request).pipe(catchError((error, caught) => {
|
|
23
23
|
this.loadingScreenService.stopLoading();
|
|
24
|
-
this.handleError(error);
|
|
24
|
+
this.handleError(error, request);
|
|
25
25
|
return throwError(error);
|
|
26
26
|
}), tap((res) => {
|
|
27
27
|
// @ts-ignore
|
|
@@ -39,9 +39,9 @@ export class httpInterceptor {
|
|
|
39
39
|
}
|
|
40
40
|
}));
|
|
41
41
|
}
|
|
42
|
-
handleError(err) {
|
|
42
|
+
handleError(err, request) {
|
|
43
43
|
if (err.status === 401 || err.status === 403) {
|
|
44
|
-
if (err.status === 401) {
|
|
44
|
+
if (err.status === 401 && !request.url.includes('monederoElectronicoAPI')) {
|
|
45
45
|
//this.router.navigateByUrl('/login');
|
|
46
46
|
// this.router.navigateByUrl('/sing_out');
|
|
47
47
|
// this.loginModalService.showModal();
|
|
@@ -68,25 +68,23 @@ export class httpInterceptor {
|
|
|
68
68
|
}
|
|
69
69
|
readError(respuesta) {
|
|
70
70
|
if (respuesta.error) {
|
|
71
|
-
if (respuesta.error.error)
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}
|
|
71
|
+
if (respuesta.error.error && respuesta.error.error.message) {
|
|
72
|
+
this.toastrService.error(respuesta.error.error.message, "Error", {
|
|
73
|
+
timeOut: 3000,
|
|
74
|
+
});
|
|
75
|
+
}
|
|
77
76
|
if (respuesta.error.message) {
|
|
78
|
-
this.toastrService.error(respuesta.error.message,
|
|
79
|
-
timeOut: 3000
|
|
77
|
+
this.toastrService.error(respuesta.error.message, "Error", {
|
|
78
|
+
timeOut: 3000,
|
|
80
79
|
});
|
|
81
80
|
}
|
|
82
|
-
if (respuesta.error._errors) {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
81
|
+
if (respuesta.error._errors && Array.isArray(respuesta.error._errors)) {
|
|
82
|
+
respuesta.error._errors.forEach((err) => {
|
|
83
|
+
this.toastrService.error(err.message, "Error", {
|
|
84
|
+
timeOut: 3000,
|
|
85
|
+
closeButton: true,
|
|
86
|
+
});
|
|
87
|
+
});
|
|
90
88
|
}
|
|
91
89
|
}
|
|
92
90
|
}
|
|
@@ -96,4 +94,4 @@ export class httpInterceptor {
|
|
|
96
94
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, decorators: [{
|
|
97
95
|
type: Injectable
|
|
98
96
|
}], ctorParameters: () => [{ type: i1.LoginModalService }, { type: i2.AuthService }, { type: i3.ToastrService }, { type: i4.LoadingScreenService }] });
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"httpInterceptor.js","sourceRoot":"","sources":["../../../../../projects/erp-core/src/lib/httpInterceptor/httpInterceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport {\n    HttpRequest,\n    HttpHandler,\n    HttpEvent,\n    HttpInterceptor, HttpErrorResponse\n} from '@angular/common/http';\nimport { Observable, of, throwError } from 'rxjs';\nimport { catchError, tap } from 'rxjs/operators';\n\nimport { ToastrService } from 'ngx-toastr';\nimport { LoginModalService } from '../components/login-modal/login-modal.service';\nimport { LoadingScreenService } from '../components/loading-screen/loading-screen.service';\nimport { AuthService } from '../../public_api';\n\n@Injectable()\nexport class httpInterceptor implements HttpInterceptor {\n    constructor(\n        private loginModalService: LoginModalService,\n        private authService: AuthService,\n         private toastrService: ToastrService,\n      private loadingScreenService : LoadingScreenService\n         ) {\n    }\n\n    intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n\n       this.loadingScreenService.startLoading();// this.loadingService.start();\n        return next.handle(request).pipe(catchError((error, caught) => {\n            this.loadingScreenService.stopLoading();\n            this.handleError(error, request);\n            return throwError(error);\n        }) as any, tap((res : any) => {\n            // @ts-ignore\n            const body = (res.body) ? res.body : null;\n            if(res.type !== 0  &&  res.type === 4){\n            this.loadingScreenService.stopLoading();\n            }\n            if (body) {\n                let message = (body.success) ? body.success : null;\n\n                if (message) {\n                    this.toastrService.success(message, 'Exito', {\n                        timeOut: 3000, closeButton: true\n                    });\n                }\n            }\n        }) as any);\n    }\n\n    private handleError(err: HttpErrorResponse, request: HttpRequest<any>): Observable<any> {\n        if (err.status === 401 || err.status === 403) {\n            if (err.status === 401 && !request.url.includes('monederoElectronicoAPI')) {\n                //this.router.navigateByUrl('/login');\n                // this.router.navigateByUrl('/sing_out');\n                // this.loginModalService.showModal();\n                // Solo cierra la sesión local: loginOut() dispararía un POST con el\n                // token ya vencido, ese POST también daría 401 y se entraría en bucle.\n                // El isLogin() evita repetir el cierre con 401 paralelos.\n                if (this.authService.isLogin()) {\n                    this.authService.quitarUsuario();\n                }\n            }\n            if (err.status === 403)\n            this.toastrService.error('No tiene permiso sobre esta accion', 'Error', {\n                timeOut: 5000\n              });\n                return of(err.message);\n        }\n      if(err.status !== 401 && err.status !== 403 && err.status !== 409){\n        this.toastrService.error('Ocurrio un error al procesar su solicitud', 'Error', {\n          timeOut: 5000\n        });\n      }\n        this.readError(err);\n        return of(err);\n    }\n\n    private readError(respuesta: any) {\n    if (respuesta.error) {\n      if (respuesta.error.error && respuesta.error.error.message) {\n        this.toastrService.error(respuesta.error.error.message, \"Error\", {\n          timeOut: 3000,\n        });\n      }\n      if (respuesta.error.message) {\n        this.toastrService.error(respuesta.error.message, \"Error\", {\n          timeOut: 3000,\n        });\n      }\n      if (respuesta.error._errors && Array.isArray(respuesta.error._errors)) {\n        respuesta.error._errors.forEach((err: any) => {\n          this.toastrService.error(err.message, \"Error\", {\n            timeOut: 3000,\n            closeButton: true,\n          });\n        });\n      }\n    }\n  }\n\n\n}\n"]}
|
|
@@ -484,7 +484,7 @@ class httpInterceptor {
|
|
|
484
484
|
this.loadingScreenService.startLoading(); // this.loadingService.start();
|
|
485
485
|
return next.handle(request).pipe(catchError((error, caught) => {
|
|
486
486
|
this.loadingScreenService.stopLoading();
|
|
487
|
-
this.handleError(error);
|
|
487
|
+
this.handleError(error, request);
|
|
488
488
|
return throwError(error);
|
|
489
489
|
}), tap((res) => {
|
|
490
490
|
// @ts-ignore
|
|
@@ -502,9 +502,9 @@ class httpInterceptor {
|
|
|
502
502
|
}
|
|
503
503
|
}));
|
|
504
504
|
}
|
|
505
|
-
handleError(err) {
|
|
505
|
+
handleError(err, request) {
|
|
506
506
|
if (err.status === 401 || err.status === 403) {
|
|
507
|
-
if (err.status === 401) {
|
|
507
|
+
if (err.status === 401 && !request.url.includes('monederoElectronicoAPI')) {
|
|
508
508
|
//this.router.navigateByUrl('/login');
|
|
509
509
|
// this.router.navigateByUrl('/sing_out');
|
|
510
510
|
// this.loginModalService.showModal();
|
|
@@ -531,25 +531,23 @@ class httpInterceptor {
|
|
|
531
531
|
}
|
|
532
532
|
readError(respuesta) {
|
|
533
533
|
if (respuesta.error) {
|
|
534
|
-
if (respuesta.error.error)
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
}
|
|
534
|
+
if (respuesta.error.error && respuesta.error.error.message) {
|
|
535
|
+
this.toastrService.error(respuesta.error.error.message, "Error", {
|
|
536
|
+
timeOut: 3000,
|
|
537
|
+
});
|
|
538
|
+
}
|
|
540
539
|
if (respuesta.error.message) {
|
|
541
|
-
this.toastrService.error(respuesta.error.message,
|
|
542
|
-
timeOut: 3000
|
|
540
|
+
this.toastrService.error(respuesta.error.message, "Error", {
|
|
541
|
+
timeOut: 3000,
|
|
543
542
|
});
|
|
544
543
|
}
|
|
545
|
-
if (respuesta.error._errors) {
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
}
|
|
544
|
+
if (respuesta.error._errors && Array.isArray(respuesta.error._errors)) {
|
|
545
|
+
respuesta.error._errors.forEach((err) => {
|
|
546
|
+
this.toastrService.error(err.message, "Error", {
|
|
547
|
+
timeOut: 3000,
|
|
548
|
+
closeButton: true,
|
|
549
|
+
});
|
|
550
|
+
});
|
|
553
551
|
}
|
|
554
552
|
}
|
|
555
553
|
}
|