@stemy/ngx-utils 11.1.1 → 11.2.3

package/fesm2015/stemy-ngx-utils.js

@@ -1923,7 +1923,20 @@ class AclService {
             const check = info && info.guard instanceof AuthGuard ? info.guard.checkRoute(info.route) : Promise.resolve(true);
             check.then(result => {
                 if (result) {
-                    AclService.checkStateDirty(info);
+                    if (!info || !info.dirty)
+                        return;
+                    info.dirty = false;
+                    const 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(returnState => {
@@ -1935,24 +1948,13 @@ class AclService {
         });
         this.state.subscribe(() => {
             const info = this.getStateInfo();
-            AclService.checkStateDirty(info);
-        });
-    }
-    static checkStateDirty(info) {
-        if (!info || !info.dirty)
-            return;
-        info.dirty = false;
-        const component = info.component;
-        if (info.first) {
+            if (!(info === null || info === void 0 ? void 0 : info.component))
+                return;
+            const component = info.component;
             if (ObjectUtils.isFunction(component.onUserInitialized)) {
                 component.onUserInitialized();
             }
-            info.first = false;
-            return;
-        }
-        if (ObjectUtils.isFunction(component.onUserChanged)) {
-            component.onUserChanged();
-        }
+        });
     }
     getStateInfo() {
         const route = this.state.route;
@@ -1963,13 +1965,13 @@ class AclService {
             const 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;
     }
 }
@@ -2262,11 +2264,12 @@ class BaseHttpService {
                     const 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, () => {
+                        const pushed = this.pushFailedRequest(url, options, () => {
                             options.headers = this.makeHeaders(options.originalHeaders);
                             this.toPromise(url, options, listener).then(resolve, reject);
                         });
-                        this.handleUnauthorizedError(absoluteUrl, options, () => reject(response));
+                        if (pushed)
+                            this.handleUnauthorizedError(absoluteUrl, options, () => reject(response));
                         return;
                     }
                     reject(response);
@@ -2276,8 +2279,9 @@ class BaseHttpService {
     }
     pushFailedRequest(url, options, req) {
         if (url.indexOf("tokens") >= 0)
-            return;
+            return false;
         BaseHttpService.failedRequests.push(req);
+        return true;
     }
     checkHeaders(headers) {
         if (!headers || !headers.cookie || !headers.referer || !headers.host) {
@@ -2411,6 +2415,14 @@ class ConfigService {
         }
         this.baseConfig = baseConfig || {};
         this.loadedConfig = Object.assign(!baseUrl ? {} : { baseUrl }, this.baseConfig);
+        try {
+            const url = new URL(this.loadedConfig.baseUrl);
+            const 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 = () => {
             this.loader = this.loader || new Promise((resolve, reject) => {
@@ -2458,7 +2470,8 @@ class ConfigService {
         const 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;
     }
     getConfigValue(key) {
         return this.loadedConfig[key];