@stemy/ngx-utils 11.1.1 → 11.2.3

package/bundles/stemy-ngx-utils.umd.js

@@ -2620,7 +2620,20 @@
                 var check = info && info.guard instanceof AuthGuard ? info.guard.checkRoute(info.route) : Promise.resolve(true);
                 check.then(function (result) {
                     if (result) {
-                        AclService.checkStateDirty(info);
+                        if (!info || !info.dirty)
+                            return;
+                        info.dirty = false;
+                        var component = info.component;
+                        if (info.first) {
+                            if (ObjectUtils.isFunction(component.onUserInitialized)) {
+                                component.onUserInitialized();
+                            }
+                            info.first = false;
+                            return;
+                        }
+                        if (ObjectUtils.isFunction(component.onUserChanged)) {
+                            component.onUserChanged();
+                        }
                         return;
                     }
                     info.guard.getReturnState(info.route).then(function (returnState) {
@@ -2632,25 +2645,14 @@
             });
             this.state.subscribe(function () {
                 var info = _this.getStateInfo();
-                AclService.checkStateDirty(info);
-            });
-        }
-        AclService.checkStateDirty = function (info) {
-            if (!info || !info.dirty)
-                return;
-            info.dirty = false;
-            var component = info.component;
-            if (info.first) {
+                if (!(info === null || info === void 0 ? void 0 : info.component))
+                    return;
+                var component = info.component;
                 if (ObjectUtils.isFunction(component.onUserInitialized)) {
                     component.onUserInitialized();
                 }
-                info.first = false;
-                return;
-            }
-            if (ObjectUtils.isFunction(component.onUserChanged)) {
-                component.onUserChanged();
-            }
-        };
+            });
+        }
         AclService.prototype.getStateInfo = function () {
             var _this = this;
             var route = this.state.route;
@@ -2661,13 +2663,13 @@
                 var guardType = (route.canActivate || emptyGuards)[0];
                 info = {
                     route: this.state.route,
-                    component: this.state.component,
                     guard: guardType ? this.injector.get(guardType) : null,
-                    dirty: false,
+                    dirty: true,
                     first: true
                 };
                 this.components.push(info);
             }
+            info.component = this.state.component;
             return info;
         };
         return AclService;
@@ -2987,11 +2989,12 @@
                         var authKey = "Authorization";
                         // If an authorization header exists and we still have an Unauthorized response prompt the user to log in again
                         if (headers.has(authKey) && response.status == 401) {
-                            _this.pushFailedRequest(url, options, function () {
+                            var pushed = _this.pushFailedRequest(url, options, function () {
                                 options.headers = _this.makeHeaders(options.originalHeaders);
                                 _this.toPromise(url, options, listener).then(resolve, reject);
                             });
-                            _this.handleUnauthorizedError(absoluteUrl, options, function () { return reject(response); });
+                            if (pushed)
+                                _this.handleUnauthorizedError(absoluteUrl, options, function () { return reject(response); });
                             return;
                         }
                         reject(response);
@@ -3001,8 +3004,9 @@
         };
         BaseHttpService.prototype.pushFailedRequest = function (url, options, req) {
             if (url.indexOf("tokens") >= 0)
-                return;
+                return false;
             BaseHttpService.failedRequests.push(req);
+            return true;
         };
         BaseHttpService.prototype.checkHeaders = function (headers) {
             if (!headers || !headers.cookie || !headers.referer || !headers.host) {
@@ -3154,6 +3158,14 @@
             }
             this.baseConfig = baseConfig || {};
             this.loadedConfig = Object.assign(!baseUrl ? {} : { baseUrl: baseUrl }, this.baseConfig);
+            try {
+                var url = new URL(this.loadedConfig.baseUrl);
+                var port = url.port && url.port !== "443" && url.port !== "80" ? ":" + url.port : "";
+                this.loadedConfig.baseDomain = url.protocol + "://" + url.hostname + port + "/";
+            }
+            catch (_a) {
+                this.loadedConfig.baseDomain = "/";
+            }
             this.scriptParameters = scriptParams || {};
             this.loaderFunc = function () {
                 _this.loader = _this.loader || new Promise(function (resolve, reject) {
@@ -3214,7 +3226,8 @@
             var project = !this.loadedConfig ? "" : this.loadedConfig.project;
             url = url ? "" + url.replace(/\/+$/, "") + ending : ending;
             url = url.replace("[project]", project);
-            return this.universal.isServer && url.startsWith("//") ? "http:" + url : url;
+            url = this.universal.isServer && url.startsWith("//") ? "http:" + url : url;
+            return url.startsWith("/") ? this.loadedConfig.baseUrl + url.substr(1) : url;
         };
         ConfigService.prototype.getConfigValue = function (key) {
             return this.loadedConfig[key];