@seniorsistemas/platform-components 5.2.0 → 5.2.2

package/fesm5/seniorsistemas-platform-components.js

@@ -15,7 +15,7 @@ import { user, service } from '@seniorsistemas/senior-platform-data';
 import { CookieService } from 'ngx-cookie-service';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { Subject, Observable, from, BehaviorSubject as BehaviorSubject$1, defer, forkJoin, throwError, of } from 'rxjs';
-import { map, takeUntil, filter, tap, mergeMap, catchError, shareReplay } from 'rxjs/operators';
+import { map, takeUntil, filter, tap, mergeMap, flatMap, catchError, shareReplay } from 'rxjs/operators';
 import { NavigationEnd, Router } from '@angular/router';
 import moment from 'moment';
 import { contains, equals, clone } from 'ramda';
@@ -1648,54 +1648,27 @@ var RestUrl = /** @class */ (function () {
     return RestUrl;
 }());
 
-var XServicesUrl = /** @class */ (function () {
-    function XServicesUrl() {
-    }
-    XServicesUrl.prototype.get = function () {
-        return defer(function () {
-            var url = service.getXServicesUrl();
-            return from(url);
-        });
-    };
-    XServicesUrl = __decorate([
-        Injectable()
-    ], XServicesUrl);
-    return XServicesUrl;
-}());
-
 var HttpInterceptor = /** @class */ (function () {
-    function HttpInterceptor(restUrl, xServicesUrl) {
+    function HttpInterceptor(restUrl) {
         this.restUrl = restUrl;
-        this.xServicesUrl = xServicesUrl;
     }
     HttpInterceptor.prototype.intercept = function (originalReq, next) {
-        var _this = this;
         if (!originalReq.url.includes("://")) {
-            var getAuthHeader = defer(function () { return from(user.getAuthHeader()); });
-            if (/^\/?[^\/]+\/[^\/]+\/api\/(?:latest|v\d+)\/.+$/g.test(originalReq.url)) {
-                var xUrl = this.xServicesUrl.get();
-                return forkJoin({ xUrl: xUrl, getAuthHeader: getAuthHeader }).pipe(mergeMap(function (values) {
-                    return _this.injectBaseUrl(originalReq, next, values.xUrl, values.getAuthHeader);
-                }));
-            }
             var getRestUrl = this.restUrl.get();
-            return forkJoin({ getRestUrl: getRestUrl, getAuthHeader: getAuthHeader }).pipe(mergeMap(function (values) {
+            var getAuthHeader = defer(function () { return from(user.getAuthHeader()); });
+            return forkJoin(getRestUrl, getAuthHeader).pipe(flatMap(function (values) {
                 var _a = __read(values, 2), bridgeUrl = _a[0], authHeader = _a[1];
-                return _this.injectBaseUrl(originalReq, next, bridgeUrl, authHeader);
+                var request = originalReq.clone({
+                    url: bridgeUrl + originalReq.url,
+                    headers: originalReq.headers.set("Authorization", authHeader)
+                });
+                return next.handle(request);
             }));
         }
         return next.handle(originalReq);
     };
-    HttpInterceptor.prototype.injectBaseUrl = function (originalReq, next, baseUrl, authorization) {
-        var request = originalReq.clone({
-            url: baseUrl + originalReq.url,
-            headers: originalReq.headers.set("Authorization", authorization)
-        });
-        return next.handle(request);
-    };
     HttpInterceptor.ctorParameters = function () { return [
-        { type: RestUrl },
-        { type: XServicesUrl }
+        { type: RestUrl }
     ]; };
     HttpInterceptor = __decorate([
         Injectable()
@@ -1709,7 +1682,7 @@ var HttpInterceptorModule = /** @class */ (function () {
     HttpInterceptorModule = __decorate([
         NgModule({
             imports: [HttpClientModule],
-            providers: [RestUrl, XServicesUrl, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptor, multi: true }]
+            providers: [RestUrl, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptor, multi: true }]
         })
     ], HttpInterceptorModule);
     return HttpInterceptorModule;
@@ -2455,5 +2428,5 @@ var SpotlightModule = /** @class */ (function () {
  * Generated bundle index. Do not edit.
  */
 
-export { AdvancedFilterComponent, AdvancedFilterModule, AdvancedFilterService, AppRoutingModule, CyclicJsonInterceptorModule, FeatureToggleModule, FeatureToggleService, Filter, FilterType, FormFilter, HttpInterceptorModule, PermissionsModule, PermissionsService, RestUrl, Scope, SpotlightComponent, SpotlightModule, TranslationsConfig, TranslationsModule, USER_INFO, XServicesUrl, 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 };
+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 };
 //# sourceMappingURL=seniorsistemas-platform-components.js.map