visorus-erp-core 17.5.0 → 17.7.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/esm2022/lib/services/global.service.mjs +23 -5
- package/fesm2022/visorus-erp-core.mjs +33 -8
- package/fesm2022/visorus-erp-core.mjs.map +1 -1
- package/lib/httpInterceptor/httpInterceptor.d.ts +3 -1
- package/lib/services/global.service.d.ts +1 -0
- 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"]}
|
|
@@ -22,14 +22,32 @@ export class GlobalService {
|
|
|
22
22
|
}
|
|
23
23
|
buildAuth() {
|
|
24
24
|
const data = this.getUsuario();
|
|
25
|
+
if (!data.token_type || !data.access_token) {
|
|
26
|
+
this.closeEndPoint();
|
|
27
|
+
this.regresaAlprincipal("/login");
|
|
28
|
+
}
|
|
25
29
|
return {
|
|
26
30
|
headers: new HttpHeaders({
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
})
|
|
31
|
+
Authorization: data.token_type + " " + data.access_token,
|
|
32
|
+
"Content-Type": "application/json",
|
|
33
|
+
Accept: "application/json",
|
|
34
|
+
}),
|
|
31
35
|
};
|
|
32
36
|
}
|
|
37
|
+
regresaAlprincipal(url) {
|
|
38
|
+
const configString = localStorage.getItem("config");
|
|
39
|
+
let config = JSON.parse(configString || "");
|
|
40
|
+
let host = "";
|
|
41
|
+
if (config) {
|
|
42
|
+
if (config.host) {
|
|
43
|
+
host = config.host;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (url) {
|
|
47
|
+
host = host + url;
|
|
48
|
+
}
|
|
49
|
+
window.location.href = host;
|
|
50
|
+
}
|
|
33
51
|
validateEndPoint() {
|
|
34
52
|
return this.http.get(this.getUrl() + '/validate', this.buildAuth());
|
|
35
53
|
}
|
|
@@ -51,4 +69,4 @@ export class GlobalService {
|
|
|
51
69
|
return this.http.post(this.getUrl() + '/usuario/setModulo', modulo, this.buildAuth());
|
|
52
70
|
}
|
|
53
71
|
}
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2xvYmFsLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9lcnAtY29yZS9zcmMvbGliL3NlcnZpY2VzL2dsb2JhbC5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUduRCxNQUFNLE9BQU8sYUFBYTtJQUl4QixZQUNVLElBQWdCO1FBQWhCLFNBQUksR0FBSixJQUFJLENBQVk7SUFFMUIsQ0FBQztJQUVELGdCQUFnQjtRQUNkLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFDLENBQUMsU0FBUyxDQUMzQyxDQUFDLElBQVMsRUFBRSxFQUFFO1lBQ1osWUFBWSxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1FBQ3ZELENBQUMsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUVELG9CQUFvQjtRQUNsQixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ3BELENBQUM7SUFFRCxNQUFNLENBQUMsYUFBc0I7UUFDM0IsT0FBTyxJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLEdBQUcsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ3RGLENBQUM7SUFFRCxJQUFJLENBQUMsTUFBTTtRQUVULE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUMxRCxDQUFDO0lBRUQsZ0JBQWdCO1FBQ2QsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsK0JBQStCLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUM7SUFDMUYsQ0FBQztJQUVELFNBQVM7UUFDUCxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7UUFDL0IsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLElBQUksQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7WUFDM0MsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQ3JCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNwQyxDQUFDO1FBQ0QsT0FBTztZQUNMLE9BQU8sRUFBRSxJQUFJLFdBQVcsQ0FBQztnQkFDdkIsYUFBYSxFQUFFLElBQUksQ0FBQyxVQUFVLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxZQUFZO2dCQUN4RCxjQUFjLEVBQUUsa0JBQWtCO2dCQUNsQyxNQUFNLEVBQUUsa0JBQWtCO2FBQzNCLENBQUM7U0FDSCxDQUFDO0lBQ0osQ0FBQztJQUVELGtCQUFrQixDQUFDLEdBQVE7UUFDekIsTUFBTSxZQUFZLEdBQUcsWUFBWSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNwRCxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksSUFBSSxFQUFFLENBQUMsQ0FBQztRQUM1QyxJQUFJLElBQUksR0FBRyxFQUFFLENBQUM7UUFDZCxJQUFJLE1BQU0sRUFBRSxDQUFDO1lBQ1gsSUFBSSxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ2hCLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDO1lBQ3JCLENBQUM7UUFDSCxDQUFDO1FBQ0QsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNSLElBQUksR0FBRyxJQUFJLEdBQUcsR0FBRyxDQUFDO1FBQ3BCLENBQUM7UUFDRCxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7SUFDOUIsQ0FBQztJQUdELGdCQUFnQjtRQUVkLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLFdBQVcsRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQztJQUN0RSxDQUFDO0lBRUQsYUFBYTtRQUNYLFlBQVksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbkMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hDLENBQUM7SUFFRCxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsa0JBQWtCLENBQUMsZUFBZTtRQUNoQyxJQUFJLENBQUMsZUFBZSxHQUFHLGVBQWUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsT0FBTztRQUNMLElBQUksSUFBSSxHQUFHLFlBQVksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDeEMsT0FBTyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQzVCLENBQUM7SUFFRCxTQUFTLENBQUMsTUFBTTtRQUNkLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLG9CQUFvQixFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQztJQUN4RixDQUFDO0NBR0YiLCJzb3VyY2VzQ29udGVudCI6WyJcbmltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5cbmltcG9ydCB7IEh0dHBIZWFkZXJzIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgVXN1YXJpbyB9IGZyb20gJy4uL21vZGVscy9Vc3VhcmlvJztcblxuZXhwb3J0IGNsYXNzIEdsb2JhbFNlcnZpY2Uge1xuXG4gIHVzdWFyaW9JbnN0YW5jZTogVXN1YXJpbztcblxuICBjb25zdHJ1Y3RvcihcbiAgICBwcml2YXRlIGh0dHA6IEh0dHBDbGllbnRcbiAgKSB7XG4gIH1cblxuICBzZXRDb25maWd1cmFjaW9uKCkge1xuICAgIHRoaXMuaHR0cC5nZXQoJ2Fzc2V0cy9jb25maWcuanNvbicpLnN1YnNjcmliZShcbiAgICAgIChkYXRhOiBhbnkpID0+IHtcbiAgICAgICAgbG9jYWxTdG9yYWdlLnNldEl0ZW0oJ2NvbmZpZycsIEpTT04uc3RyaW5naWZ5KGRhdGEpKTtcbiAgICAgIH1cbiAgICApO1xuICB9XG5cbiAgb2J0aWVuZUNvbmZpZ3VyYWNpb24oKSB7XG4gICAgcmV0dXJuIEpTT04ucGFyc2UobG9jYWxTdG9yYWdlLmdldEl0ZW0oJ2NvbmZpZycpKTtcbiAgfVxuXG4gIGdldFVybCh1cmxDb21wb25lbnRlPzogc3RyaW5nKSB7XG4gICAgcmV0dXJuIHRoaXMub2J0aWVuZUNvbmZpZ3VyYWNpb24oKS51cmwgKyAodXJsQ29tcG9uZW50ZSA/ICcvJyArIHVybENvbXBvbmVudGUgOiAnJyk7XG4gIH1cblxuICBhdXRoKHBhcmFtcykge1xuXG4gICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0KHRoaXMuZ2V0VXJsKCkgKyAnL2xvZ2luJywgcGFyYW1zKTtcbiAgfVxuXG4gIGdldFVzdWFyaW9BY3R1YWwoKSB7XG4gICAgcmV0dXJuIHRoaXMuaHR0cC5nZXQodGhpcy5nZXRVcmwoKSArICcvdXN1YXJpby9vYnRpZW5lVXN1YXJpb0FjdHVhbCcsIHRoaXMuYnVpbGRBdXRoKCkpO1xuICB9XG5cbiAgYnVpbGRBdXRoKCkge1xuICAgIGNvbnN0IGRhdGEgPSB0aGlzLmdldFVzdWFyaW8oKTtcbiAgICBpZiAoIWRhdGEudG9rZW5fdHlwZSB8fCAhZGF0YS5hY2Nlc3NfdG9rZW4pIHtcbiAgICAgIHRoaXMuY2xvc2VFbmRQb2ludCgpO1xuICAgICAgdGhpcy5yZWdyZXNhQWxwcmluY2lwYWwoXCIvbG9naW5cIik7XG4gICAgfVxuICAgIHJldHVybiB7XG4gICAgICBoZWFkZXJzOiBuZXcgSHR0cEhlYWRlcnMoe1xuICAgICAgICBBdXRob3JpemF0aW9uOiBkYXRhLnRva2VuX3R5cGUgKyBcIiBcIiArIGRhdGEuYWNjZXNzX3Rva2VuLFxuICAgICAgICBcIkNvbnRlbnQtVHlwZVwiOiBcImFwcGxpY2F0aW9uL2pzb25cIixcbiAgICAgICAgQWNjZXB0OiBcImFwcGxpY2F0aW9uL2pzb25cIixcbiAgICAgIH0pLFxuICAgIH07XG4gIH1cblxuICByZWdyZXNhQWxwcmluY2lwYWwodXJsOiBhbnkpIHtcbiAgICBjb25zdCBjb25maWdTdHJpbmcgPSBsb2NhbFN0b3JhZ2UuZ2V0SXRlbShcImNvbmZpZ1wiKTtcbiAgICBsZXQgY29uZmlnID0gSlNPTi5wYXJzZShjb25maWdTdHJpbmcgfHwgXCJcIik7XG4gICAgbGV0IGhvc3QgPSBcIlwiO1xuICAgIGlmIChjb25maWcpIHtcbiAgICAgIGlmIChjb25maWcuaG9zdCkge1xuICAgICAgICBob3N0ID0gY29uZmlnLmhvc3Q7XG4gICAgICB9XG4gICAgfVxuICAgIGlmICh1cmwpIHtcbiAgICAgIGhvc3QgPSBob3N0ICsgdXJsO1xuICAgIH1cbiAgICB3aW5kb3cubG9jYXRpb24uaHJlZiA9IGhvc3Q7XG4gIH1cblxuXG4gIHZhbGlkYXRlRW5kUG9pbnQoKSB7XG5cbiAgICByZXR1cm4gdGhpcy5odHRwLmdldCh0aGlzLmdldFVybCgpICsgJy92YWxpZGF0ZScsIHRoaXMuYnVpbGRBdXRoKCkpO1xuICB9XG5cbiAgY2xvc2VFbmRQb2ludCgpIHtcbiAgICBsb2NhbFN0b3JhZ2UucmVtb3ZlSXRlbSgndXN1YXJpbycpO1xuICAgIHRoaXMuc2V0VXN1YXJpb0luc3RhbmNlKG51bGwpO1xuICB9XG5cbiAgZ2V0VXN1YXJpbygpIHtcbiAgICByZXR1cm4gSlNPTi5wYXJzZShsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgndXN1YXJpbycpKTtcbiAgfVxuXG4gIHNldFVzdWFyaW9JbnN0YW5jZSh1c3VhcmlvSW5zdGFuY2UpIHtcbiAgICB0aGlzLnVzdWFyaW9JbnN0YW5jZSA9IHVzdWFyaW9JbnN0YW5jZTtcbiAgfVxuICBcbiAgZ2V0TGFuZygpIHtcbiAgICBsZXQgbGFuZyA9IGxvY2FsU3RvcmFnZS5nZXRJdGVtKCdsYW5nJyk7XG4gICAgcmV0dXJuIGxhbmcgPyBsYW5nIDogJ2VzJztcbiAgfVxuXG4gIHNldE1vZHVsbyhtb2R1bG8pIHtcbiAgICByZXR1cm4gdGhpcy5odHRwLnBvc3QodGhpcy5nZXRVcmwoKSArICcvdXN1YXJpby9zZXRNb2R1bG8nLCBtb2R1bG8sIHRoaXMuYnVpbGRBdXRoKCkpO1xuICB9XG5cbiAgXG59XG5cbiJdfQ==
|
|
@@ -101,14 +101,32 @@ class GlobalService {
|
|
|
101
101
|
}
|
|
102
102
|
buildAuth() {
|
|
103
103
|
const data = this.getUsuario();
|
|
104
|
+
if (!data.token_type || !data.access_token) {
|
|
105
|
+
this.closeEndPoint();
|
|
106
|
+
this.regresaAlprincipal("/login");
|
|
107
|
+
}
|
|
104
108
|
return {
|
|
105
109
|
headers: new HttpHeaders({
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
})
|
|
110
|
+
Authorization: data.token_type + " " + data.access_token,
|
|
111
|
+
"Content-Type": "application/json",
|
|
112
|
+
Accept: "application/json",
|
|
113
|
+
}),
|
|
110
114
|
};
|
|
111
115
|
}
|
|
116
|
+
regresaAlprincipal(url) {
|
|
117
|
+
const configString = localStorage.getItem("config");
|
|
118
|
+
let config = JSON.parse(configString || "");
|
|
119
|
+
let host = "";
|
|
120
|
+
if (config) {
|
|
121
|
+
if (config.host) {
|
|
122
|
+
host = config.host;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
if (url) {
|
|
126
|
+
host = host + url;
|
|
127
|
+
}
|
|
128
|
+
window.location.href = host;
|
|
129
|
+
}
|
|
112
130
|
validateEndPoint() {
|
|
113
131
|
return this.http.get(this.getUrl() + '/validate', this.buildAuth());
|
|
114
132
|
}
|
|
@@ -456,8 +474,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImpo
|
|
|
456
474
|
}] });
|
|
457
475
|
|
|
458
476
|
class httpInterceptor {
|
|
459
|
-
constructor(loginModalService, toastrService, loadingScreenService) {
|
|
477
|
+
constructor(loginModalService, authService, toastrService, loadingScreenService) {
|
|
460
478
|
this.loginModalService = loginModalService;
|
|
479
|
+
this.authService = authService;
|
|
461
480
|
this.toastrService = toastrService;
|
|
462
481
|
this.loadingScreenService = loadingScreenService;
|
|
463
482
|
}
|
|
@@ -488,7 +507,13 @@ class httpInterceptor {
|
|
|
488
507
|
if (err.status === 401) {
|
|
489
508
|
//this.router.navigateByUrl('/login');
|
|
490
509
|
// this.router.navigateByUrl('/sing_out');
|
|
491
|
-
this.loginModalService.showModal();
|
|
510
|
+
// this.loginModalService.showModal();
|
|
511
|
+
// Solo cierra la sesión local: loginOut() dispararía un POST con el
|
|
512
|
+
// token ya vencido, ese POST también daría 401 y se entraría en bucle.
|
|
513
|
+
// El isLogin() evita repetir el cierre con 401 paralelos.
|
|
514
|
+
if (this.authService.isLogin()) {
|
|
515
|
+
this.authService.quitarUsuario();
|
|
516
|
+
}
|
|
492
517
|
}
|
|
493
518
|
if (err.status === 403)
|
|
494
519
|
this.toastrService.error('No tiene permiso sobre esta accion', 'Error', {
|
|
@@ -528,12 +553,12 @@ class httpInterceptor {
|
|
|
528
553
|
}
|
|
529
554
|
}
|
|
530
555
|
}
|
|
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 }); }
|
|
556
|
+
/** @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
557
|
/** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor }); }
|
|
533
558
|
}
|
|
534
559
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: httpInterceptor, decorators: [{
|
|
535
560
|
type: Injectable
|
|
536
|
-
}], ctorParameters: () => [{ type: LoginModalService }, { type: i1$1.ToastrService }, { type: LoadingScreenService }] });
|
|
561
|
+
}], ctorParameters: () => [{ type: LoginModalService }, { type: AuthService }, { type: i1$1.ToastrService }, { type: LoadingScreenService }] });
|
|
537
562
|
|
|
538
563
|
class Error404Component {
|
|
539
564
|
constructor() { }
|