@seniorsistemas/platform-components 5.2.0 → 5.2.2
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/bundles/seniorsistemas-platform-components.umd.js +10 -38
- package/bundles/seniorsistemas-platform-components.umd.js.map +1 -1
- package/bundles/seniorsistemas-platform-components.umd.min.js +1 -1
- package/bundles/seniorsistemas-platform-components.umd.min.js.map +1 -1
- package/esm2015/modules/http-interceptor/http-interceptor.module.js +2 -3
- package/esm2015/modules/http-interceptor/http-interceptor.service.js +11 -21
- package/esm2015/modules/http-interceptor/index.js +1 -2
- package/esm5/modules/http-interceptor/http-interceptor.module.js +2 -3
- package/esm5/modules/http-interceptor/http-interceptor.service.js +11 -24
- package/esm5/modules/http-interceptor/index.js +1 -2
- package/fesm2015/seniorsistemas-platform-components.js +12 -33
- package/fesm2015/seniorsistemas-platform-components.js.map +1 -1
- package/fesm5/seniorsistemas-platform-components.js +12 -39
- package/fesm5/seniorsistemas-platform-components.js.map +1 -1
- package/modules/http-interceptor/http-interceptor.service.d.ts +2 -5
- package/modules/http-interceptor/index.d.ts +0 -1
- package/package.json +2 -2
- package/seniorsistemas-platform-components.metadata.json +1 -1
- package/esm2015/modules/http-interceptor/x-services-url.service.js +0 -17
- package/esm5/modules/http-interceptor/x-services-url.service.js +0 -20
- package/modules/http-interceptor/x-services-url.service.d.ts +0 -4
|
@@ -2,15 +2,14 @@ import { __decorate } from "tslib";
|
|
|
2
2
|
import { NgModule } from '@angular/core';
|
|
3
3
|
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
4
4
|
import { RestUrl } from './rest-url.service';
|
|
5
|
-
import { XServicesUrl } from './x-services-url.service';
|
|
6
5
|
import { HttpInterceptor } from './http-interceptor.service';
|
|
7
6
|
let HttpInterceptorModule = class HttpInterceptorModule {
|
|
8
7
|
};
|
|
9
8
|
HttpInterceptorModule = __decorate([
|
|
10
9
|
NgModule({
|
|
11
10
|
imports: [HttpClientModule],
|
|
12
|
-
providers: [RestUrl,
|
|
11
|
+
providers: [RestUrl, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptor, multi: true }]
|
|
13
12
|
})
|
|
14
13
|
], HttpInterceptorModule);
|
|
15
14
|
export { HttpInterceptorModule };
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1pbnRlcmNlcHRvci5tb2R1bGUuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Ac2VuaW9yc2lzdGVtYXMvcGxhdGZvcm0tY29tcG9uZW50cy8iLCJzb3VyY2VzIjpbIm1vZHVsZXMvaHR0cC1pbnRlcmNlcHRvci9odHRwLWludGVyY2VwdG9yLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0MsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBTTdELElBQWEscUJBQXFCLEdBQWxDLE1BQWEscUJBQXFCO0NBQUcsQ0FBQTtBQUF4QixxQkFBcUI7SUFKakMsUUFBUSxDQUFDO1FBQ1IsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7UUFDM0IsU0FBUyxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxlQUFlLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDO0tBQzdGLENBQUM7R0FDVyxxQkFBcUIsQ0FBRztTQUF4QixxQkFBcUIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgSHR0cENsaWVudE1vZHVsZSwgSFRUUF9JTlRFUkNFUFRPUlMgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5cbmltcG9ydCB7IFJlc3RVcmwgfSBmcm9tICcuL3Jlc3QtdXJsLnNlcnZpY2UnO1xuaW1wb3J0IHsgSHR0cEludGVyY2VwdG9yIH0gZnJvbSAnLi9odHRwLWludGVyY2VwdG9yLnNlcnZpY2UnO1xuXG5ATmdNb2R1bGUoe1xuICBpbXBvcnRzOiBbSHR0cENsaWVudE1vZHVsZV0sXG4gIHByb3ZpZGVyczogW1Jlc3RVcmwsIHsgcHJvdmlkZTogSFRUUF9JTlRFUkNFUFRPUlMsIHVzZUNsYXNzOiBIdHRwSW50ZXJjZXB0b3IsIG11bHRpOiB0cnVlIH1dXG59KVxuZXhwb3J0IGNsYXNzIEh0dHBJbnRlcmNlcHRvck1vZHVsZSB7fVxuIl19
|
|
@@ -2,43 +2,33 @@ import { __decorate } from "tslib";
|
|
|
2
2
|
import { Injectable } from '@angular/core';
|
|
3
3
|
import { user } from '@seniorsistemas/senior-platform-data';
|
|
4
4
|
import { forkJoin, defer, from } from 'rxjs';
|
|
5
|
-
import {
|
|
5
|
+
import { flatMap } from 'rxjs/operators';
|
|
6
6
|
import { RestUrl } from './rest-url.service';
|
|
7
|
-
import { XServicesUrl } from './x-services-url.service';
|
|
8
7
|
let HttpInterceptor = class HttpInterceptor {
|
|
9
|
-
constructor(restUrl
|
|
8
|
+
constructor(restUrl) {
|
|
10
9
|
this.restUrl = restUrl;
|
|
11
|
-
this.xServicesUrl = xServicesUrl;
|
|
12
10
|
}
|
|
13
11
|
intercept(originalReq, next) {
|
|
14
12
|
if (!originalReq.url.includes(`://`)) {
|
|
15
|
-
const getAuthHeader = defer(() => from(user.getAuthHeader()));
|
|
16
|
-
if (/^\/?[^\/]+\/[^\/]+\/api\/(?:latest|v\d+)\/.+$/g.test(originalReq.url)) {
|
|
17
|
-
const xUrl = this.xServicesUrl.get();
|
|
18
|
-
return forkJoin({ xUrl, getAuthHeader }).pipe(mergeMap((values) => this.injectBaseUrl(originalReq, next, values.xUrl, values.getAuthHeader)));
|
|
19
|
-
}
|
|
20
13
|
const getRestUrl = this.restUrl.get();
|
|
21
|
-
|
|
14
|
+
const getAuthHeader = defer(() => from(user.getAuthHeader()));
|
|
15
|
+
return forkJoin(getRestUrl, getAuthHeader).pipe(flatMap((values) => {
|
|
22
16
|
const [bridgeUrl, authHeader] = values;
|
|
23
|
-
|
|
17
|
+
const request = originalReq.clone({
|
|
18
|
+
url: bridgeUrl + originalReq.url,
|
|
19
|
+
headers: originalReq.headers.set(`Authorization`, authHeader)
|
|
20
|
+
});
|
|
21
|
+
return next.handle(request);
|
|
24
22
|
}));
|
|
25
23
|
}
|
|
26
24
|
return next.handle(originalReq);
|
|
27
25
|
}
|
|
28
|
-
injectBaseUrl(originalReq, next, baseUrl, authorization) {
|
|
29
|
-
const request = originalReq.clone({
|
|
30
|
-
url: baseUrl + originalReq.url,
|
|
31
|
-
headers: originalReq.headers.set(`Authorization`, authorization)
|
|
32
|
-
});
|
|
33
|
-
return next.handle(request);
|
|
34
|
-
}
|
|
35
26
|
};
|
|
36
27
|
HttpInterceptor.ctorParameters = () => [
|
|
37
|
-
{ type: RestUrl }
|
|
38
|
-
{ type: XServicesUrl }
|
|
28
|
+
{ type: RestUrl }
|
|
39
29
|
];
|
|
40
30
|
HttpInterceptor = __decorate([
|
|
41
31
|
Injectable()
|
|
42
32
|
], HttpInterceptor);
|
|
43
33
|
export { HttpInterceptor };
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1pbnRlcmNlcHRvci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQHNlbmlvcnNpc3RlbWFzL3BsYXRmb3JtLWNvbXBvbmVudHMvIiwic291cmNlcyI6WyJtb2R1bGVzL2h0dHAtaW50ZXJjZXB0b3IvaHR0cC1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUM1RCxPQUFPLEVBQWMsUUFBUSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDekQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXpDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUc3QyxJQUFhLGVBQWUsR0FBNUIsTUFBYSxlQUFlO0lBQzFCLFlBQW9CLE9BQWdCO1FBQWhCLFlBQU8sR0FBUCxPQUFPLENBQVM7SUFBRyxDQUFDO0lBRWpDLFNBQVMsQ0FBQyxXQUE2QixFQUFFLElBQWlCO1FBQy9ELElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNwQyxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3RDLE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUM5RCxPQUFPLFFBQVEsQ0FBQyxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUMsSUFBSSxDQUM3QyxPQUFPLENBQUMsQ0FBQyxNQUFXLEVBQUUsRUFBRTtnQkFDdEIsTUFBTSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsR0FBRyxNQUFNLENBQUM7Z0JBQ3ZDLE1BQU0sT0FBTyxHQUFHLFdBQVcsQ0FBQyxLQUFLLENBQUM7b0JBQ2hDLEdBQUcsRUFBRSxTQUFTLEdBQUcsV0FBVyxDQUFDLEdBQUc7b0JBQ2hDLE9BQU8sRUFBRSxXQUFXLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsVUFBVSxDQUFDO2lCQUM5RCxDQUFDLENBQUM7Z0JBQ0gsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQzlCLENBQUMsQ0FBQyxDQUNILENBQUM7U0FDSDtRQUNELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUNsQyxDQUFDO0NBQ0YsQ0FBQTs7WUFuQjhCLE9BQU87O0FBRHpCLGVBQWU7SUFEM0IsVUFBVSxFQUFFO0dBQ0EsZUFBZSxDQW9CM0I7U0FwQlksZUFBZSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBJbnRlcmNlcHRvciBhcyBBbmd1bGFySHR0cEludGVyY2VwdG9yLCBIdHRwSGFuZGxlciwgSHR0cFJlcXVlc3QsIEh0dHBFdmVudCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IHVzZXIgfSBmcm9tICdAc2VuaW9yc2lzdGVtYXMvc2VuaW9yLXBsYXRmb3JtLWRhdGEnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgZm9ya0pvaW4sIGRlZmVyLCBmcm9tIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBmbGF0TWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xuXG5pbXBvcnQgeyBSZXN0VXJsIH0gZnJvbSAnLi9yZXN0LXVybC5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIEh0dHBJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEFuZ3VsYXJIdHRwSW50ZXJjZXB0b3Ige1xuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlc3RVcmw6IFJlc3RVcmwpIHt9XG5cbiAgcHVibGljIGludGVyY2VwdChvcmlnaW5hbFJlcTogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XG4gICAgaWYgKCFvcmlnaW5hbFJlcS51cmwuaW5jbHVkZXMoYDovL2ApKSB7XG4gICAgICBjb25zdCBnZXRSZXN0VXJsID0gdGhpcy5yZXN0VXJsLmdldCgpO1xuICAgICAgY29uc3QgZ2V0QXV0aEhlYWRlciA9IGRlZmVyKCgpID0+IGZyb20odXNlci5nZXRBdXRoSGVhZGVyKCkpKTtcbiAgICAgIHJldHVybiBmb3JrSm9pbihnZXRSZXN0VXJsLCBnZXRBdXRoSGVhZGVyKS5waXBlKFxuICAgICAgICBmbGF0TWFwKCh2YWx1ZXM6IGFueSkgPT4ge1xuICAgICAgICAgIGNvbnN0IFticmlkZ2VVcmwsIGF1dGhIZWFkZXJdID0gdmFsdWVzO1xuICAgICAgICAgIGNvbnN0IHJlcXVlc3QgPSBvcmlnaW5hbFJlcS5jbG9uZSh7XG4gICAgICAgICAgICB1cmw6IGJyaWRnZVVybCArIG9yaWdpbmFsUmVxLnVybCxcbiAgICAgICAgICAgIGhlYWRlcnM6IG9yaWdpbmFsUmVxLmhlYWRlcnMuc2V0KGBBdXRob3JpemF0aW9uYCwgYXV0aEhlYWRlcilcbiAgICAgICAgICB9KTtcbiAgICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxdWVzdCk7XG4gICAgICAgIH0pXG4gICAgICApO1xuICAgIH1cbiAgICByZXR1cm4gbmV4dC5oYW5kbGUob3JpZ2luYWxSZXEpO1xuICB9XG59XG4iXX0=
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
export * from './http-interceptor.module';
|
|
2
2
|
export * from './rest-url.service';
|
|
3
|
-
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Ac2VuaW9yc2lzdGVtYXMvcGxhdGZvcm0tY29tcG9uZW50cy8iLCJzb3VyY2VzIjpbIm1vZHVsZXMvaHR0cC1pbnRlcmNlcHRvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9odHRwLWludGVyY2VwdG9yLm1vZHVsZSc7XG5leHBvcnQgKiBmcm9tICcuL3Jlc3QtdXJsLnNlcnZpY2UnO1xuZXhwb3J0IHsgWFNlcnZpY2VzVXJsIH0gZnJvbSAnLi94LXNlcnZpY2VzLXVybC5zZXJ2aWNlJztcbiJdfQ==
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Ac2VuaW9yc2lzdGVtYXMvcGxhdGZvcm0tY29tcG9uZW50cy8iLCJzb3VyY2VzIjpbIm1vZHVsZXMvaHR0cC1pbnRlcmNlcHRvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsb0JBQW9CLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2h0dHAtaW50ZXJjZXB0b3IubW9kdWxlJztcbmV4cG9ydCAqIGZyb20gJy4vcmVzdC11cmwuc2VydmljZSc7XG4iXX0=
|
|
@@ -2,7 +2,6 @@ import { __decorate } from "tslib";
|
|
|
2
2
|
import { NgModule } from '@angular/core';
|
|
3
3
|
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
4
4
|
import { RestUrl } from './rest-url.service';
|
|
5
|
-
import { XServicesUrl } from './x-services-url.service';
|
|
6
5
|
import { HttpInterceptor } from './http-interceptor.service';
|
|
7
6
|
var HttpInterceptorModule = /** @class */ (function () {
|
|
8
7
|
function HttpInterceptorModule() {
|
|
@@ -10,10 +9,10 @@ var HttpInterceptorModule = /** @class */ (function () {
|
|
|
10
9
|
HttpInterceptorModule = __decorate([
|
|
11
10
|
NgModule({
|
|
12
11
|
imports: [HttpClientModule],
|
|
13
|
-
providers: [RestUrl,
|
|
12
|
+
providers: [RestUrl, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptor, multi: true }]
|
|
14
13
|
})
|
|
15
14
|
], HttpInterceptorModule);
|
|
16
15
|
return HttpInterceptorModule;
|
|
17
16
|
}());
|
|
18
17
|
export { HttpInterceptorModule };
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1pbnRlcmNlcHRvci5tb2R1bGUuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Ac2VuaW9yc2lzdGVtYXMvcGxhdGZvcm0tY29tcG9uZW50cy8iLCJzb3VyY2VzIjpbIm1vZHVsZXMvaHR0cC1pbnRlcmNlcHRvci9odHRwLWludGVyY2VwdG9yLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDN0MsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBTTdEO0lBQUE7SUFBb0MsQ0FBQztJQUF4QixxQkFBcUI7UUFKakMsUUFBUSxDQUFDO1lBQ1IsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7WUFDM0IsU0FBUyxFQUFFLENBQUMsT0FBTyxFQUFFLEVBQUUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLFFBQVEsRUFBRSxlQUFlLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDO1NBQzdGLENBQUM7T0FDVyxxQkFBcUIsQ0FBRztJQUFELDRCQUFDO0NBQUEsQUFBckMsSUFBcUM7U0FBeEIscUJBQXFCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgTmdNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEh0dHBDbGllbnRNb2R1bGUsIEhUVFBfSU5URVJDRVBUT1JTIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuXG5pbXBvcnQgeyBSZXN0VXJsIH0gZnJvbSAnLi9yZXN0LXVybC5zZXJ2aWNlJztcbmltcG9ydCB7IEh0dHBJbnRlcmNlcHRvciB9IGZyb20gJy4vaHR0cC1pbnRlcmNlcHRvci5zZXJ2aWNlJztcblxuQE5nTW9kdWxlKHtcbiAgaW1wb3J0czogW0h0dHBDbGllbnRNb2R1bGVdLFxuICBwcm92aWRlcnM6IFtSZXN0VXJsLCB7IHByb3ZpZGU6IEhUVFBfSU5URVJDRVBUT1JTLCB1c2VDbGFzczogSHR0cEludGVyY2VwdG9yLCBtdWx0aTogdHJ1ZSB9XVxufSlcbmV4cG9ydCBjbGFzcyBIdHRwSW50ZXJjZXB0b3JNb2R1bGUge31cbiJdfQ==
|
|
@@ -2,42 +2,29 @@ import { __decorate, __read } from "tslib";
|
|
|
2
2
|
import { Injectable } from '@angular/core';
|
|
3
3
|
import { user } from '@seniorsistemas/senior-platform-data';
|
|
4
4
|
import { forkJoin, defer, from } from 'rxjs';
|
|
5
|
-
import {
|
|
5
|
+
import { flatMap } from 'rxjs/operators';
|
|
6
6
|
import { RestUrl } from './rest-url.service';
|
|
7
|
-
import { XServicesUrl } from './x-services-url.service';
|
|
8
7
|
var HttpInterceptor = /** @class */ (function () {
|
|
9
|
-
function HttpInterceptor(restUrl
|
|
8
|
+
function HttpInterceptor(restUrl) {
|
|
10
9
|
this.restUrl = restUrl;
|
|
11
|
-
this.xServicesUrl = xServicesUrl;
|
|
12
10
|
}
|
|
13
11
|
HttpInterceptor.prototype.intercept = function (originalReq, next) {
|
|
14
|
-
var _this = this;
|
|
15
12
|
if (!originalReq.url.includes("://")) {
|
|
16
|
-
var getAuthHeader = defer(function () { return from(user.getAuthHeader()); });
|
|
17
|
-
if (/^\/?[^\/]+\/[^\/]+\/api\/(?:latest|v\d+)\/.+$/g.test(originalReq.url)) {
|
|
18
|
-
var xUrl = this.xServicesUrl.get();
|
|
19
|
-
return forkJoin({ xUrl: xUrl, getAuthHeader: getAuthHeader }).pipe(mergeMap(function (values) {
|
|
20
|
-
return _this.injectBaseUrl(originalReq, next, values.xUrl, values.getAuthHeader);
|
|
21
|
-
}));
|
|
22
|
-
}
|
|
23
13
|
var getRestUrl = this.restUrl.get();
|
|
24
|
-
|
|
14
|
+
var getAuthHeader = defer(function () { return from(user.getAuthHeader()); });
|
|
15
|
+
return forkJoin(getRestUrl, getAuthHeader).pipe(flatMap(function (values) {
|
|
25
16
|
var _a = __read(values, 2), bridgeUrl = _a[0], authHeader = _a[1];
|
|
26
|
-
|
|
17
|
+
var request = originalReq.clone({
|
|
18
|
+
url: bridgeUrl + originalReq.url,
|
|
19
|
+
headers: originalReq.headers.set("Authorization", authHeader)
|
|
20
|
+
});
|
|
21
|
+
return next.handle(request);
|
|
27
22
|
}));
|
|
28
23
|
}
|
|
29
24
|
return next.handle(originalReq);
|
|
30
25
|
};
|
|
31
|
-
HttpInterceptor.prototype.injectBaseUrl = function (originalReq, next, baseUrl, authorization) {
|
|
32
|
-
var request = originalReq.clone({
|
|
33
|
-
url: baseUrl + originalReq.url,
|
|
34
|
-
headers: originalReq.headers.set("Authorization", authorization)
|
|
35
|
-
});
|
|
36
|
-
return next.handle(request);
|
|
37
|
-
};
|
|
38
26
|
HttpInterceptor.ctorParameters = function () { return [
|
|
39
|
-
{ type: RestUrl }
|
|
40
|
-
{ type: XServicesUrl }
|
|
27
|
+
{ type: RestUrl }
|
|
41
28
|
]; };
|
|
42
29
|
HttpInterceptor = __decorate([
|
|
43
30
|
Injectable()
|
|
@@ -45,4 +32,4 @@ var HttpInterceptor = /** @class */ (function () {
|
|
|
45
32
|
return HttpInterceptor;
|
|
46
33
|
}());
|
|
47
34
|
export { HttpInterceptor };
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC1pbnRlcmNlcHRvci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6Im5nOi8vQHNlbmlvcnNpc3RlbWFzL3BsYXRmb3JtLWNvbXBvbmVudHMvIiwic291cmNlcyI6WyJtb2R1bGVzL2h0dHAtaW50ZXJjZXB0b3IvaHR0cC1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUM1RCxPQUFPLEVBQWMsUUFBUSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDekQsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXpDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUc3QztJQUNFLHlCQUFvQixPQUFnQjtRQUFoQixZQUFPLEdBQVAsT0FBTyxDQUFTO0lBQUcsQ0FBQztJQUVqQyxtQ0FBUyxHQUFoQixVQUFpQixXQUE2QixFQUFFLElBQWlCO1FBQy9ELElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUNwQyxJQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDO1lBQ3RDLElBQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxjQUFNLE9BQUEsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQyxFQUExQixDQUEwQixDQUFDLENBQUM7WUFDOUQsT0FBTyxRQUFRLENBQUMsVUFBVSxFQUFFLGFBQWEsQ0FBQyxDQUFDLElBQUksQ0FDN0MsT0FBTyxDQUFDLFVBQUMsTUFBVztnQkFDWixJQUFBLHNCQUFnQyxFQUEvQixpQkFBUyxFQUFFLGtCQUFvQixDQUFDO2dCQUN2QyxJQUFNLE9BQU8sR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDO29CQUNoQyxHQUFHLEVBQUUsU0FBUyxHQUFHLFdBQVcsQ0FBQyxHQUFHO29CQUNoQyxPQUFPLEVBQUUsV0FBVyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxFQUFFLFVBQVUsQ0FBQztpQkFDOUQsQ0FBQyxDQUFDO2dCQUNILE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUM5QixDQUFDLENBQUMsQ0FDSCxDQUFDO1NBQ0g7UUFDRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDbEMsQ0FBQzs7Z0JBbEI0QixPQUFPOztJQUR6QixlQUFlO1FBRDNCLFVBQVUsRUFBRTtPQUNBLGVBQWUsQ0FvQjNCO0lBQUQsc0JBQUM7Q0FBQSxBQXBCRCxJQW9CQztTQXBCWSxlQUFlIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgSHR0cEludGVyY2VwdG9yIGFzIEFuZ3VsYXJIdHRwSW50ZXJjZXB0b3IsIEh0dHBIYW5kbGVyLCBIdHRwUmVxdWVzdCwgSHR0cEV2ZW50IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHsgdXNlciB9IGZyb20gJ0BzZW5pb3JzaXN0ZW1hcy9zZW5pb3ItcGxhdGZvcm0tZGF0YSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBmb3JrSm9pbiwgZGVmZXIsIGZyb20gfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IGZsYXRNYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5cbmltcG9ydCB7IFJlc3RVcmwgfSBmcm9tICcuL3Jlc3QtdXJsLnNlcnZpY2UnO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgSHR0cEludGVyY2VwdG9yIGltcGxlbWVudHMgQW5ndWxhckh0dHBJbnRlcmNlcHRvciB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVzdFVybDogUmVzdFVybCkge31cblxuICBwdWJsaWMgaW50ZXJjZXB0KG9yaWdpbmFsUmVxOiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+IHtcbiAgICBpZiAoIW9yaWdpbmFsUmVxLnVybC5pbmNsdWRlcyhgOi8vYCkpIHtcbiAgICAgIGNvbnN0IGdldFJlc3RVcmwgPSB0aGlzLnJlc3RVcmwuZ2V0KCk7XG4gICAgICBjb25zdCBnZXRBdXRoSGVhZGVyID0gZGVmZXIoKCkgPT4gZnJvbSh1c2VyLmdldEF1dGhIZWFkZXIoKSkpO1xuICAgICAgcmV0dXJuIGZvcmtKb2luKGdldFJlc3RVcmwsIGdldEF1dGhIZWFkZXIpLnBpcGUoXG4gICAgICAgIGZsYXRNYXAoKHZhbHVlczogYW55KSA9PiB7XG4gICAgICAgICAgY29uc3QgW2JyaWRnZVVybCwgYXV0aEhlYWRlcl0gPSB2YWx1ZXM7XG4gICAgICAgICAgY29uc3QgcmVxdWVzdCA9IG9yaWdpbmFsUmVxLmNsb25lKHtcbiAgICAgICAgICAgIHVybDogYnJpZGdlVXJsICsgb3JpZ2luYWxSZXEudXJsLFxuICAgICAgICAgICAgaGVhZGVyczogb3JpZ2luYWxSZXEuaGVhZGVycy5zZXQoYEF1dGhvcml6YXRpb25gLCBhdXRoSGVhZGVyKVxuICAgICAgICAgIH0pO1xuICAgICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXF1ZXN0KTtcbiAgICAgICAgfSlcbiAgICAgICk7XG4gICAgfVxuICAgIHJldHVybiBuZXh0LmhhbmRsZShvcmlnaW5hbFJlcSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
export * from './http-interceptor.module';
|
|
2
2
|
export * from './rest-url.service';
|
|
3
|
-
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Ac2VuaW9yc2lzdGVtYXMvcGxhdGZvcm0tY29tcG9uZW50cy8iLCJzb3VyY2VzIjpbIm1vZHVsZXMvaHR0cC1pbnRlcmNlcHRvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9odHRwLWludGVyY2VwdG9yLm1vZHVsZSc7XG5leHBvcnQgKiBmcm9tICcuL3Jlc3QtdXJsLnNlcnZpY2UnO1xuZXhwb3J0IHsgWFNlcnZpY2VzVXJsIH0gZnJvbSAnLi94LXNlcnZpY2VzLXVybC5zZXJ2aWNlJztcbiJdfQ==
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Ac2VuaW9yc2lzdGVtYXMvcGxhdGZvcm0tY29tcG9uZW50cy8iLCJzb3VyY2VzIjpbIm1vZHVsZXMvaHR0cC1pbnRlcmNlcHRvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsb0JBQW9CLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tICcuL2h0dHAtaW50ZXJjZXB0b3IubW9kdWxlJztcbmV4cG9ydCAqIGZyb20gJy4vcmVzdC11cmwuc2VydmljZSc7XG4iXX0=
|
|
@@ -15,7 +15,7 @@ import { user, service } from '@seniorsistemas/senior-platform-data';
|
|
|
15
15
|
import { CookieService } from 'ngx-cookie-service';
|
|
16
16
|
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
|
|
17
17
|
import { Subject, Observable, from, BehaviorSubject as BehaviorSubject$1, defer, forkJoin, throwError, of } from 'rxjs';
|
|
18
|
-
import { map, takeUntil, filter, tap, mergeMap, catchError, shareReplay } from 'rxjs/operators';
|
|
18
|
+
import { map, takeUntil, filter, tap, mergeMap, flatMap, catchError, shareReplay } from 'rxjs/operators';
|
|
19
19
|
import { NavigationEnd, Router } from '@angular/router';
|
|
20
20
|
import moment from 'moment';
|
|
21
21
|
import { contains, equals, clone } from 'ramda';
|
|
@@ -1500,49 +1500,28 @@ RestUrl = __decorate([
|
|
|
1500
1500
|
Injectable()
|
|
1501
1501
|
], RestUrl);
|
|
1502
1502
|
|
|
1503
|
-
let XServicesUrl = class XServicesUrl {
|
|
1504
|
-
get() {
|
|
1505
|
-
return defer(() => {
|
|
1506
|
-
const url = service.getXServicesUrl();
|
|
1507
|
-
return from(url);
|
|
1508
|
-
});
|
|
1509
|
-
}
|
|
1510
|
-
};
|
|
1511
|
-
XServicesUrl = __decorate([
|
|
1512
|
-
Injectable()
|
|
1513
|
-
], XServicesUrl);
|
|
1514
|
-
|
|
1515
1503
|
let HttpInterceptor = class HttpInterceptor {
|
|
1516
|
-
constructor(restUrl
|
|
1504
|
+
constructor(restUrl) {
|
|
1517
1505
|
this.restUrl = restUrl;
|
|
1518
|
-
this.xServicesUrl = xServicesUrl;
|
|
1519
1506
|
}
|
|
1520
1507
|
intercept(originalReq, next) {
|
|
1521
1508
|
if (!originalReq.url.includes(`://`)) {
|
|
1522
|
-
const getAuthHeader = defer(() => from(user.getAuthHeader()));
|
|
1523
|
-
if (/^\/?[^\/]+\/[^\/]+\/api\/(?:latest|v\d+)\/.+$/g.test(originalReq.url)) {
|
|
1524
|
-
const xUrl = this.xServicesUrl.get();
|
|
1525
|
-
return forkJoin({ xUrl, getAuthHeader }).pipe(mergeMap((values) => this.injectBaseUrl(originalReq, next, values.xUrl, values.getAuthHeader)));
|
|
1526
|
-
}
|
|
1527
1509
|
const getRestUrl = this.restUrl.get();
|
|
1528
|
-
|
|
1510
|
+
const getAuthHeader = defer(() => from(user.getAuthHeader()));
|
|
1511
|
+
return forkJoin(getRestUrl, getAuthHeader).pipe(flatMap((values) => {
|
|
1529
1512
|
const [bridgeUrl, authHeader] = values;
|
|
1530
|
-
|
|
1513
|
+
const request = originalReq.clone({
|
|
1514
|
+
url: bridgeUrl + originalReq.url,
|
|
1515
|
+
headers: originalReq.headers.set(`Authorization`, authHeader)
|
|
1516
|
+
});
|
|
1517
|
+
return next.handle(request);
|
|
1531
1518
|
}));
|
|
1532
1519
|
}
|
|
1533
1520
|
return next.handle(originalReq);
|
|
1534
1521
|
}
|
|
1535
|
-
injectBaseUrl(originalReq, next, baseUrl, authorization) {
|
|
1536
|
-
const request = originalReq.clone({
|
|
1537
|
-
url: baseUrl + originalReq.url,
|
|
1538
|
-
headers: originalReq.headers.set(`Authorization`, authorization)
|
|
1539
|
-
});
|
|
1540
|
-
return next.handle(request);
|
|
1541
|
-
}
|
|
1542
1522
|
};
|
|
1543
1523
|
HttpInterceptor.ctorParameters = () => [
|
|
1544
|
-
{ type: RestUrl }
|
|
1545
|
-
{ type: XServicesUrl }
|
|
1524
|
+
{ type: RestUrl }
|
|
1546
1525
|
];
|
|
1547
1526
|
HttpInterceptor = __decorate([
|
|
1548
1527
|
Injectable()
|
|
@@ -1553,7 +1532,7 @@ let HttpInterceptorModule = class HttpInterceptorModule {
|
|
|
1553
1532
|
HttpInterceptorModule = __decorate([
|
|
1554
1533
|
NgModule({
|
|
1555
1534
|
imports: [HttpClientModule],
|
|
1556
|
-
providers: [RestUrl,
|
|
1535
|
+
providers: [RestUrl, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptor, multi: true }]
|
|
1557
1536
|
})
|
|
1558
1537
|
], HttpInterceptorModule);
|
|
1559
1538
|
|
|
@@ -2232,5 +2211,5 @@ SpotlightModule = __decorate([
|
|
|
2232
2211
|
* Generated bundle index. Do not edit.
|
|
2233
2212
|
*/
|
|
2234
2213
|
|
|
2235
|
-
export { AdvancedFilterComponent, AdvancedFilterModule, AdvancedFilterService, AppRoutingModule, CyclicJsonInterceptorModule, FeatureToggleModule, FeatureToggleService, Filter, FilterType, FormFilter, HttpInterceptorModule, PermissionsModule, PermissionsService, RestUrl, Scope, SpotlightComponent, SpotlightModule, TranslationsConfig, TranslationsModule, USER_INFO,
|
|
2214
|
+
export { AdvancedFilterComponent, AdvancedFilterModule, AdvancedFilterService, AppRoutingModule, CyclicJsonInterceptorModule, FeatureToggleModule, FeatureToggleService, Filter, FilterType, FormFilter, HttpInterceptorModule, PermissionsModule, PermissionsService, RestUrl, Scope, SpotlightComponent, SpotlightModule, TranslationsConfig, TranslationsModule, USER_INFO, factory, promise, fallback as ɵa, CalendarOptionsService as ɵb, FormFilterComponent as ɵc, MapValuesPipe as ɵd, TranslatePipe as ɵe, CyclicJsonInterceptor as ɵf, HttpInterceptor as ɵg, RESOURCES as ɵh, ENVIRONMENT as ɵi, Environment as ɵk, fallback$1 as ɵl, SpotlightService as ɵm, TranslatePipe$1 as ɵn };
|
|
2236
2215
|
//# sourceMappingURL=seniorsistemas-platform-components.js.map
|