@abp/ng.core 4.4.0 → 4.4.4

package/bundles/abp-ng.core.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/router'), require('@angular/common'), require('rxjs'), require('rxjs/operators'), require('@angular/common/http'), require('@ngxs/store'), require('just-compare'), require('snq'), require('@angular/forms'), require('angular-oauth2-oidc'), require('just-clone')) :
-    typeof define === 'function' && define.amd ? define('@abp/ng.core', ['exports', '@angular/core', '@angular/router', '@angular/common', 'rxjs', 'rxjs/operators', '@angular/common/http', '@ngxs/store', 'just-compare', 'snq', '@angular/forms', 'angular-oauth2-oidc', 'just-clone'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.abp = global.abp || {}, global.abp.ng = global.abp.ng || {}, global.abp.ng.core = {}), global.ng.core, global.ng.router, global.ng.common, global.rxjs, global.rxjs.operators, global.ng.common.http, global.i4, global.compare, global.snq, global.ng.forms, global.i1$1, global.clone));
-}(this, (function (exports, i0, i1, common, rxjs, operators, i2, i4, compare, snq, forms, i1$1, clone) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/router'), require('@angular/common'), require('rxjs'), require('rxjs/operators'), require('snq'), require('just-compare'), require('@angular/common/http'), require('@ngxs/store'), require('@angular/forms'), require('angular-oauth2-oidc'), require('just-clone')) :
+    typeof define === 'function' && define.amd ? define('@abp/ng.core', ['exports', '@angular/core', '@angular/router', '@angular/common', 'rxjs', 'rxjs/operators', 'snq', 'just-compare', '@angular/common/http', '@ngxs/store', '@angular/forms', 'angular-oauth2-oidc', 'just-clone'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.abp = global.abp || {}, global.abp.ng = global.abp.ng || {}, global.abp.ng.core = {}), global.ng.core, global.ng.router, global.ng.common, global.rxjs, global.rxjs.operators, global.snq, global.compare, global.ng.common.http, global.i4, global.ng.forms, global.i1$1, global.clone));
+}(this, (function (exports, i0, i1, common, rxjs, operators, snq, compare, i2, i4, forms, i1$1, clone) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -28,10 +28,10 @@
 
     var i0__namespace = /*#__PURE__*/_interopNamespace(i0);
     var i1__namespace = /*#__PURE__*/_interopNamespace(i1);
+    var snq__default = /*#__PURE__*/_interopDefaultLegacy(snq);
+    var compare__default = /*#__PURE__*/_interopDefaultLegacy(compare);
     var i2__namespace = /*#__PURE__*/_interopNamespace(i2);
     var i4__namespace = /*#__PURE__*/_interopNamespace(i4);
-    var compare__default = /*#__PURE__*/_interopDefaultLegacy(compare);
-    var snq__default = /*#__PURE__*/_interopDefaultLegacy(snq);
     var i1__namespace$1 = /*#__PURE__*/_interopNamespace(i1$1);
     var clone__default = /*#__PURE__*/_interopDefaultLegacy(clone);
 
@@ -499,6 +499,76 @@
         return Object.assign({}, options);
     }
 
+    // This will not be necessary when only Angukar 9.1+ is supported
+    function getLocaleDirection(locale) {
+        return /^(ar(-[A-Z]{2})?|ckb(-IR)?|fa(-AF)?|he|ks|lrc(-IQ)?|mzn|pa-Arab|ps(-PK)?|sd|ug|ur(-IN)?|uz-Arab|yi)$/.test(locale)
+            ? 'rtl'
+            : 'ltr';
+    }
+    function createLocalizer(localization) {
+        return function (resourceName, key, defaultValue) {
+            if (resourceName === '_')
+                return key;
+            var resource = snq__default['default'](function () { return localization.values[resourceName]; });
+            if (!resource)
+                return defaultValue;
+            return resource[key] || defaultValue;
+        };
+    }
+    function createLocalizerWithFallback(localization) {
+        var findLocalization = createLocalizationFinder(localization);
+        return function (resourceNames, keys, defaultValue) {
+            var localized = findLocalization(resourceNames, keys).localized;
+            return localized || defaultValue;
+        };
+    }
+    function createLocalizationPipeKeyGenerator(localization) {
+        var findLocalization = createLocalizationFinder(localization);
+        return function (resourceNames, keys, defaultKey) {
+            var _a = findLocalization(resourceNames, keys), resourceName = _a.resourceName, key = _a.key;
+            return !resourceName ? defaultKey : resourceName === '_' ? key : resourceName + "::" + key;
+        };
+    }
+    function createLocalizationFinder(localization) {
+        var localize = createLocalizer(localization);
+        return function (resourceNames, keys) {
+            resourceNames = resourceNames.concat(localization.defaultResourceName).filter(Boolean);
+            var resourceCount = resourceNames.length;
+            var keyCount = keys.length;
+            for (var i = 0; i < resourceCount; i++) {
+                var resourceName = resourceNames[i];
+                for (var j = 0; j < keyCount; j++) {
+                    var key = keys[j];
+                    var localized = localize(resourceName, key, null);
+                    if (localized)
+                        return { resourceName: resourceName, key: key, localized: localized };
+                }
+            }
+            return { resourceName: undefined, key: undefined, localized: undefined };
+        };
+    }
+
+    function createTokenParser(format) {
+        return function (str) {
+            var tokens = [];
+            var regex = format.replace(/\./g, '\\.').replace(/\{\s?([0-9a-zA-Z]+)\s?\}/g, function (_, token) {
+                tokens.push(token);
+                return '(.+)';
+            });
+            var matches = (str.match(regex) || []).slice(1);
+            return matches.reduce(function (acc, v, i) {
+                var key = tokens[i];
+                acc[key] = __spread((acc[key] || []), [v]).filter(Boolean);
+                return acc;
+            }, {});
+        };
+    }
+    function interpolate(text, params) {
+        return text
+            .replace(/(['"]?\{\s*(\d+)\s*\}['"]?)/g, function (_, match, digit) { var _a; return (_a = params[digit]) !== null && _a !== void 0 ? _a : match; })
+            .replace(/\s+/g, ' ');
+    }
+
     function noop() {
         // tslint:disable-next-line: only-arrow-functions
         var fn = function () { };
@@ -717,80 +787,12 @@
         { type: RestService }
     ]; };
 
-    // This will not be necessary when only Angukar 9.1+ is supported
-    function getLocaleDirection(locale) {
-        return /^(ar(-[A-Z]{2})?|ckb(-IR)?|fa(-AF)?|he|ks|lrc(-IQ)?|mzn|pa-Arab|ps(-PK)?|sd|ug|ur(-IN)?|uz-Arab|yi)$/.test(locale)
-            ? 'rtl'
-            : 'ltr';
-    }
-    function createLocalizer(localization) {
-        return function (resourceName, key, defaultValue) {
-            if (resourceName === '_')
-                return key;
-            var resource = snq__default['default'](function () { return localization.values[resourceName]; });
-            if (!resource)
-                return defaultValue;
-            return resource[key] || defaultValue;
-        };
-    }
-    function createLocalizerWithFallback(localization) {
-        var findLocalization = createLocalizationFinder(localization);
-        return function (resourceNames, keys, defaultValue) {
-            var localized = findLocalization(resourceNames, keys).localized;
-            return localized || defaultValue;
-        };
-    }
-    function createLocalizationPipeKeyGenerator(localization) {
-        var findLocalization = createLocalizationFinder(localization);
-        return function (resourceNames, keys, defaultKey) {
-            var _a = findLocalization(resourceNames, keys), resourceName = _a.resourceName, key = _a.key;
-            return !resourceName ? defaultKey : resourceName === '_' ? key : resourceName + "::" + key;
-        };
-    }
-    function createLocalizationFinder(localization) {
-        var localize = createLocalizer(localization);
-        return function (resourceNames, keys) {
-            resourceNames = resourceNames.concat(localization.defaultResourceName).filter(Boolean);
-            var resourceCount = resourceNames.length;
-            var keyCount = keys.length;
-            for (var i = 0; i < resourceCount; i++) {
-                var resourceName = resourceNames[i];
-                for (var j = 0; j < keyCount; j++) {
-                    var key = keys[j];
-                    var localized = localize(resourceName, key, null);
-                    if (localized)
-                        return { resourceName: resourceName, key: key, localized: localized };
-                }
-            }
-            return { resourceName: undefined, key: undefined, localized: undefined };
-        };
-    }
-
-    function createTokenParser(format) {
-        return function (str) {
-            var tokens = [];
-            var regex = format.replace(/\./g, '\\.').replace(/\{\s?([0-9a-zA-Z]+)\s?\}/g, function (_, token) {
-                tokens.push(token);
-                return '(.+)';
-            });
-            var matches = (str.match(regex) || []).slice(1);
-            return matches.reduce(function (acc, v, i) {
-                var key = tokens[i];
-                acc[key] = __spread((acc[key] || []), [v]).filter(Boolean);
-                return acc;
-            }, {});
-        };
-    }
-    function interpolate(text, params) {
-        return text
-            .replace(/(['"]?\{\s*(\d+)\s*\}['"]?)/g, function (_, match, digit) { var _a; return (_a = params[digit]) !== null && _a !== void 0 ? _a : match; })
-            .replace(/\s+/g, ' ');
-    }
-
     var ConfigStateService = /** @class */ (function () {
         function ConfigStateService(abpConfigService) {
             this.abpConfigService = abpConfigService;
             this.store = new InternalStore({});
+            this.updateSubject = new rxjs.Subject();
+            this.initUpdateStream();
         }
         Object.defineProperty(ConfigStateService.prototype, "createOnUpdateStream", {
             get: function () {
@@ -799,12 +801,22 @@
             enumerable: false,
             configurable: true
         });
+        ConfigStateService.prototype.initUpdateStream = function () {
+            var _this = this;
+            this.updateSubject
+                .pipe(operators.switchMap(function () { return _this.abpConfigService.get(); }))
+                .subscribe(function (res) { return _this.setState(res); });
+        };
+        /**
+         * @deprecated do not use this method directly, instead call refreshAppState
+         * This method will be private in v5.0
+         */
         ConfigStateService.prototype.setState = function (state) {
             this.store.set(state);
         };
         ConfigStateService.prototype.refreshAppState = function () {
-            var _this = this;
-            return this.abpConfigService.get().pipe(operators.tap(function (res) { return _this.setState(res); }));
+            this.updateSubject.next();
+            return this.createOnUpdateStream(function (state) { return state; }).pipe(operators.take(1));
         };
         ConfigStateService.prototype.getOne$ = function (key) {
             return this.store.sliceState(function (state) { return state[key]; });
@@ -994,11 +1006,10 @@
     ]; };
 
     var LocalizationService = /** @class */ (function () {
-        function LocalizationService(sessionState, injector, otherInstance, configState, appConfigService) {
+        function LocalizationService(sessionState, injector, otherInstance, configState) {
             this.sessionState = sessionState;
             this.injector = injector;
             this.configState = configState;
-            this.appConfigService = appConfigService;
             this.latestLang = this.sessionState.getLanguage();
             this._languageChange$ = new rxjs.Subject();
             if (otherInstance)
@@ -1026,10 +1037,7 @@
             var _this = this;
             this.sessionState
                 .onLanguageChange$()
-                .pipe(operators.filter(function (lang) { return _this.configState.getDeep('localization.currentCulture.cultureName') !== lang; }), operators.switchMap(function (lang) { return _this.appConfigService
-                .get()
-                .pipe(operators.tap(function (res) { return _this.configState.setState(res); }))
-                .pipe(operators.mapTo(lang)); }), operators.switchMap(function (lang) { return rxjs.from(_this.registerLocale(lang).then(function () { return lang; })); }))
+                .pipe(operators.filter(function (lang) { return _this.configState.getDeep('localization.currentCulture.cultureName') !== lang; }), operators.switchMap(function (lang) { return _this.configState.refreshAppState().pipe(operators.mapTo(lang)); }), operators.switchMap(function (lang) { return rxjs.from(_this.registerLocale(lang).then(function () { return lang; })); }))
                 .subscribe(function (lang) { return _this._languageChange$.next(lang); });
         };
         LocalizationService.prototype.registerLocale = function (locale) {
@@ -1089,7 +1097,7 @@
         };
         return LocalizationService;
     }());
-    LocalizationService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function LocalizationService_Factory() { return new LocalizationService(i0__namespace.ɵɵinject(SessionStateService), i0__namespace.ɵɵinject(i0__namespace.INJECTOR), i0__namespace.ɵɵinject(LocalizationService, 12), i0__namespace.ɵɵinject(ConfigStateService), i0__namespace.ɵɵinject(AbpApplicationConfigurationService)); }, token: LocalizationService, providedIn: "root" });
+    LocalizationService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function LocalizationService_Factory() { return new LocalizationService(i0__namespace.ɵɵinject(SessionStateService), i0__namespace.ɵɵinject(i0__namespace.INJECTOR), i0__namespace.ɵɵinject(LocalizationService, 12), i0__namespace.ɵɵinject(ConfigStateService)); }, token: LocalizationService, providedIn: "root" });
     LocalizationService.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
@@ -1097,8 +1105,7 @@
         { type: SessionStateService },
         { type: i0.Injector },
         { type: LocalizationService, decorators: [{ type: i0.Optional }, { type: i0.SkipSelf }] },
-        { type: ConfigStateService },
-        { type: AbpApplicationConfigurationService }
+        { type: ConfigStateService }
     ]; };
     function getLocalization(state, key) {
         var interpolateParams = [];
@@ -1676,7 +1683,6 @@
             this.route = injector.get(i1.ActivatedRoute);
             this.router = injector.get(i1.Router);
             this.routes = injector.get(RoutesService);
-            this.getLayout();
             this.checkLayoutOnNavigationEnd();
             this.listenToLanguageChange();
         }
@@ -3112,10 +3118,8 @@
     var storageKey = 'passwordFlow';
     function pipeToLogin(params, injector) {
         var configState = injector.get(ConfigStateService);
-        var appConfigService = injector.get(AbpApplicationConfigurationService);
         var router = injector.get(i1.Router);
-        return rxjs.pipe(operators.switchMap(function () { return appConfigService.get(); }), operators.tap(function (res) {
-            configState.setState(res);
+        return rxjs.pipe(operators.switchMap(function () { return configState.refreshAppState(); }), operators.tap(function () {
             setRememberMe(params.rememberMe);
             if (params.redirectUrl)
                 router.navigate([params.redirectUrl]);
@@ -3157,7 +3161,6 @@
             this.environment = injector.get(EnvironmentService);
             this.configState = injector.get(ConfigStateService);
             this.oAuthService = injector.get(i1$1.OAuthService);
-            this.appConfigService = injector.get(AbpApplicationConfigurationService);
             this.sessionState = injector.get(SessionStateService);
             this.oAuthConfig = this.environment.getEnvironment().oAuthConfig;
             this.tenantKey = injector.get(TENANT_KEY);
@@ -3172,6 +3175,9 @@
                     if (shouldClear)
                         clearOAuthStorage(oAuthStorage);
                     this.oAuthService.configure(this.oAuthConfig);
+                    this.oAuthService.events
+                        .pipe(operators.filter(function (event) { return event.type === 'token_refresh_error'; }))
+                        .subscribe(function () { return _this.navigateToLogin(); });
                     return [2 /*return*/, this.oAuthService
                             .loadDiscoveryDocument()
                             .then(function () {
@@ -3190,10 +3196,8 @@
         AuthFlowStrategy.prototype.listenToOauthErrors = function () {
             var _this = this;
             this.oAuthService.events
-                .pipe(operators.filter(function (event) { return event instanceof i1$1.OAuthErrorEvent; }), operators.tap(function () { return clearOAuthStorage(); }), operators.switchMap(function () { return _this.appConfigService.get(); }))
-                .subscribe(function (res) {
-                _this.configState.setState(res);
-            });
+                .pipe(operators.filter(function (event) { return event instanceof i1$1.OAuthErrorEvent; }), operators.tap(function () { return clearOAuthStorage(); }), operators.switchMap(function () { return _this.configState.refreshAppState(); }))
+                .subscribe();
         };
         return AuthFlowStrategy;
     }());
@@ -3260,9 +3264,7 @@
                 else {
                     _this.oAuthService.logOut();
                     removeRememberMe();
-                    _this.appConfigService.get().subscribe(function (res) {
-                        _this.configState.setState(res);
-                    });
+                    _this.configState.refreshAppState().subscribe();
                 }
             });
         };
@@ -3295,8 +3297,7 @@
         AuthPasswordFlowStrategy.prototype.pipeToLogin = function (params) {
             var _this = this;
             var router = this.injector.get(i1.Router);
-            return rxjs.pipe(operators.switchMap(function () { return _this.appConfigService.get(); }), operators.tap(function (res) {
-                _this.configState.setState(res);
+            return rxjs.pipe(operators.switchMap(function () { return _this.configState.refreshAppState(); }), operators.tap(function () {
                 setRememberMe(params.rememberMe);
                 if (params.redirectUrl)
                     router.navigate([params.redirectUrl]);
@@ -3305,8 +3306,7 @@
         AuthPasswordFlowStrategy.prototype.logout = function (queryParams) {
             var _this = this;
             var router = this.injector.get(i1.Router);
-            return rxjs.from(this.oAuthService.revokeTokenAndLogout(queryParams)).pipe(operators.switchMap(function () { return _this.appConfigService.get(); }), operators.tap(function (res) {
-                _this.configState.setState(res);
+            return rxjs.from(this.oAuthService.revokeTokenAndLogout(queryParams)).pipe(operators.switchMap(function () { return _this.configState.refreshAppState(); }), operators.tap(function () {
                 router.navigateByUrl('/');
                 removeRememberMe();
             }));
@@ -3572,9 +3572,14 @@
                 setEnvironmentWithDomainTenant = function (tenant) {
                     hideTenantBox();
                     setDomainTenant(tenant);
-                    replaceTenantNameWithinEnvironment(injector, tenant.name);
                 };
                 if (tenancyName) {
+                    /**
+                     * We have to replace tenant name within the urls from environment,
+                     * because the code below will make a http request to find information about the domain tenant.
+                     * Before this request takes place, we need to replace placeholders aka "{0}".
+                     */
+                    replaceTenantNameWithinEnvironment(injector, tenancyName);
                     return [2 /*return*/, multiTenancyService
                             .setTenantByName(tenancyName)
                             .pipe(operators.tap(setEnvironmentWithDomainTenant))
@@ -3616,13 +3621,12 @@
     function getInitialData(injector) {
         var _this = this;
         var fn = function () { return __awaiter(_this, void 0, void 0, function () {
-            var environmentService, configState, appConfigService, options;
+            var environmentService, configState, options;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         environmentService = injector.get(EnvironmentService);
                         configState = injector.get(ConfigStateService);
-                        appConfigService = injector.get(AbpApplicationConfigurationService);
                         options = injector.get(CORE_OPTIONS);
                         environmentService.setState(options.environment);
                         return [4 /*yield*/, getRemoteEnv(injector, options.environment)];
@@ -3636,9 +3640,9 @@
                         _a.sent();
                         if (options.skipGetAppConfiguration)
                             return [2 /*return*/];
-                        return [2 /*return*/, appConfigService
-                                .get()
-                                .pipe(operators.tap(function (res) { return configState.setState(res); }), operators.tap(function () { return checkAccessToken(injector); }), operators.tap(function () {
+                        return [2 /*return*/, configState
+                                .refreshAppState()
+                                .pipe(operators.tap(function () { return checkAccessToken(injector); }), operators.tap(function () {
                                 var currentTenant = configState.getOne('currentTenant');
                                 injector.get(SessionStateService).setTenant(currentTenant);
                             }), operators.catchError(function (error) {
@@ -4605,10 +4609,8 @@
      * @deprecated Use ConfigStateService instead. To be deleted in v5.0.
      */
     exports.ConfigState = ConfigState_1 = /** @class */ (function () {
-        function ConfigState(http, store, sessionState, environmentService, configState) {
-            this.http = http;
+        function ConfigState(store, environmentService, configState) {
             this.store = store;
-            this.sessionState = sessionState;
             this.environmentService = environmentService;
             this.configState = configState;
             this.syncConfigState();
@@ -4778,13 +4780,10 @@
                 .subscribe(function (env) { return _this.store.dispatch(new PatchConfigState({ environment: env })); });
         };
         ConfigState.prototype.addData = function (_a) {
-            var _this = this;
             var patchState = _a.patchState, dispatch = _a.dispatch;
             var apiName = 'default';
             var api = this.store.selectSnapshot(ConfigState_1.getApiUrl(apiName));
-            return this.http
-                .get(api + "/api/abp/application-configuration")
-                .pipe(operators.tap(function (configuration) { return _this.configState.setState(configuration); }), operators.catchError(function (err) {
+            return this.configState.refreshAppState().pipe(operators.catchError(function (err) {
                 dispatch(new RestOccurError(err));
                 return rxjs.throwError(err);
             }));
@@ -4804,9 +4803,7 @@
         { type: i0.Injectable }
     ];
     exports.ConfigState.ctorParameters = function () { return [
-        { type: i2.HttpClient },
         { type: i4.Store },
-        { type: SessionStateService },
         { type: EnvironmentService },
         { type: ConfigStateService }
     ]; };