visorus-erp-core 17.5.0 → 17.6.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.
- package/esm2022/lib/httpInterceptor/httpInterceptor.mjs +16 -7
- package/fesm2022/visorus-erp-core.mjs +11 -4
- package/fesm2022/visorus-erp-core.mjs.map +1 -1
- package/lib/globalPrimeNg.d.ts +2 -2
- package/lib/httpInterceptor/httpInterceptor.d.ts +3 -1
- package/lib/importComponents.d.ts +2 -2
- package/package.json +1 -1
|
@@ -4,13 +4,16 @@ import { catchError, tap } from 'rxjs/operators';
|
|
|
4
4
|
import { ToastrService } from 'ngx-toastr';
|
|
5
5
|
import { LoginModalService } from '../components/login-modal/login-modal.service';
|
|
6
6
|
import { LoadingScreenService } from '../components/loading-screen/loading-screen.service';
|
|
7
|
+
import { AuthService } from '../../public_api';
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
8
9
|
import * as i1 from "../components/login-modal/login-modal.service";
|
|
9
|
-
import * as i2 from "
|
|
10
|
-
import * as i3 from "
|
|
10
|
+
import * as i2 from "../../public_api";
|
|
11
|
+
import * as i3 from "ngx-toastr";
|
|
12
|
+
import * as i4 from "../components/loading-screen/loading-screen.service";
|
|
11
13
|
export class httpInterceptor {
|
|
12
|
-
constructor(loginModalService, toastrService, loadingScreenService) {
|
|
14
|
+
constructor(loginModalService, authService, toastrService, loadingScreenService) {
|
|
13
15
|
this.loginModalService = loginModalService;
|
|
16
|
+
this.authService = authService;
|
|
14
17
|
this.toastrService = toastrService;
|
|
15
18
|
this.loadingScreenService = loadingScreenService;
|
|
16
19
|
}
|
|
@@ -41,7 +44,13 @@ export class httpInterceptor {
|
|
|
41
44
|
if (err.status === 401) {
|
|
42
45
|
//this.router.navigateByUrl('/login');
|
|
43
46
|
// this.router.navigateByUrl('/sing_out');
|
|
44
|
-
this.loginModalService.showModal();
|
|
47
|
+
// this.loginModalService.showModal();
|
|
48
|
+
// Solo cierra la sesión local: loginOut() dispararía un POST con el
|
|
49
|
+
// token ya vencido, ese POST también daría 401 y se entraría en bucle.
|
|
50
|
+
// El isLogin() evita repetir el cierre con 401 paralelos.
|
|
51
|
+
if (this.authService.isLogin()) {
|
|
52
|
+
this.authService.quitarUsuario();
|
|
53
|
+
}
|
|
45
54
|
}
|
|
46
55
|
if (err.status === 403)
|
|
47
56
|
this.toastrService.error('No tiene permiso sobre esta accion', 'Error', {
|
|
@@ -81,10 +90,10 @@ export class httpInterceptor {
|
|
|
81
90
|
}
|
|
82
91
|
}
|
|
83
92
|
}
|
|
84
|
-
/** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, deps: [{ token: i1.LoginModalService }, { token: i2.
|
|
93
|
+
/** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, deps: [{ token: i1.LoginModalService }, { token: i2.AuthService }, { token: i3.ToastrService }, { token: i4.LoadingScreenService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
85
94
|
/** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor }); }
|
|
86
95
|
}
|
|
87
96
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, decorators: [{
|
|
88
97
|
type: Injectable
|
|
89
|
-
}], ctorParameters: () => [{ type: i1.LoginModalService }, { type: i2.
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
}], ctorParameters: () => [{ type: i1.LoginModalService }, { type: i2.AuthService }, { type: i3.ToastrService }, { type: i4.LoadingScreenService }] });
|
|
99
|
+
//# 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);\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): Observable<any> {\n        if (err.status === 401 || err.status === 403) {\n            if (err.status === 401) {\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    readError(respuesta: any) {\n        if(respuesta.error){\n            if (respuesta.error.error)\n            if (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\n            if(respuesta.error._errors){\n                if (Array.isArray(respuesta.error._errors))\n                for (let indexError = 0; indexError < respuesta.error._errors.length; indexError++) {\n                    this.toastrService.error(respuesta.error._errors[indexError].message, 'Error', {\n                        timeOut: 3000,\n                        closeButton: true\n                    });\n                }\n            }\n        }\n\n    }\n\n}\n"]}
|
|
@@ -456,8 +456,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
456
456
|
}] });
|
|
457
457
|
|
|
458
458
|
class httpInterceptor {
|
|
459
|
-
constructor(loginModalService, toastrService, loadingScreenService) {
|
|
459
|
+
constructor(loginModalService, authService, toastrService, loadingScreenService) {
|
|
460
460
|
this.loginModalService = loginModalService;
|
|
461
|
+
this.authService = authService;
|
|
461
462
|
this.toastrService = toastrService;
|
|
462
463
|
this.loadingScreenService = loadingScreenService;
|
|
463
464
|
}
|
|
@@ -488,7 +489,13 @@ class httpInterceptor {
|
|
|
488
489
|
if (err.status === 401) {
|
|
489
490
|
//this.router.navigateByUrl('/login');
|
|
490
491
|
// this.router.navigateByUrl('/sing_out');
|
|
491
|
-
this.loginModalService.showModal();
|
|
492
|
+
// this.loginModalService.showModal();
|
|
493
|
+
// Solo cierra la sesión local: loginOut() dispararía un POST con el
|
|
494
|
+
// token ya vencido, ese POST también daría 401 y se entraría en bucle.
|
|
495
|
+
// El isLogin() evita repetir el cierre con 401 paralelos.
|
|
496
|
+
if (this.authService.isLogin()) {
|
|
497
|
+
this.authService.quitarUsuario();
|
|
498
|
+
}
|
|
492
499
|
}
|
|
493
500
|
if (err.status === 403)
|
|
494
501
|
this.toastrService.error('No tiene permiso sobre esta accion', 'Error', {
|
|
@@ -528,12 +535,12 @@ class httpInterceptor {
|
|
|
528
535
|
}
|
|
529
536
|
}
|
|
530
537
|
}
|
|
531
|
-
/** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, deps: [{ token: LoginModalService }, { token: i1$1.ToastrService }, { token: LoadingScreenService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
538
|
+
/** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, deps: [{ token: LoginModalService }, { token: AuthService }, { token: i1$1.ToastrService }, { token: LoadingScreenService }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
532
539
|
/** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor }); }
|
|
533
540
|
}
|
|
534
541
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, decorators: [{
|
|
535
542
|
type: Injectable
|
|
536
|
-
}], ctorParameters: () => [{ type: LoginModalService }, { type: i1$1.ToastrService }, { type: LoadingScreenService }] });
|
|
543
|
+
}], ctorParameters: () => [{ type: LoginModalService }, { type: AuthService }, { type: i1$1.ToastrService }, { type: LoadingScreenService }] });
|
|
537
544
|
|
|
538
545
|
class Error404Component {
|
|
539
546
|
constructor() { }
|