@abp/ng.core 5.3.1 → 6.0.0-rc.1

package/fesm2015/abp-ng.core.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { ChangeDetectorRef, Component, Input, InjectionToken, Injectable, Inject, isDevMode, Optional, SkipSelf, Directive, EventEmitter, Output, Self, Injector, Pipe, NgModule, APP_INITIALIZER, LOCALE_ID, NgModuleFactory, Compiler, ComponentFactoryResolver, ApplicationRef, inject } from '@angular/core';
 import * as i1$1 from '@angular/router';
 import { PRIMARY_OUTLET, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, ActivatedRoute, Router, RouterModule } from '@angular/router';
-import { BehaviorSubject, Subject, throwError, Subscription, combineLatest, from, fromEvent, of, timer, pipe, Observable, concat, ReplaySubject } from 'rxjs';
+import { BehaviorSubject, Subject, throwError, Subscription, combineLatest, from, fromEvent, ReplaySubject, of, timer, pipe, Observable, concat } from 'rxjs';
 import { map, distinctUntilChanged, filter, catchError, switchMap, take, mapTo, debounceTime, takeUntil, tap, finalize, retryWhen, delay, shareReplay } from 'rxjs/operators';
 import compare from 'just-compare';
 import { __rest, __awaiter } from 'tslib';
@@ -238,6 +238,12 @@ function coreOptionsFactory(_a) {
 }
 
 const mapToApiUrl = (key) => (apis) => (apis[key] || apis.default).url || apis.default.url;
+const mapToIssuer = (issuer) => {
+    if (!issuer) {
+        return issuer;
+    }
+    return issuer.endsWith('/') ? issuer : issuer + '/';
+};
 class EnvironmentService {
     constructor() {
         this.store = new InternalStore({});
@@ -260,6 +266,13 @@ class EnvironmentService {
     setState(environment) {
         this.store.set(environment);
     }
+    getIssuer() {
+        const issuer = this.store.state.oAuthConfig.issuer;
+        return mapToIssuer(issuer);
+    }
+    getIssuer$() {
+        return this.store.sliceState(state => state.oAuthConfig.issuer).pipe(map(mapToIssuer));
+    }
 }
 EnvironmentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: EnvironmentService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
 EnvironmentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: EnvironmentService, providedIn: 'root' });
@@ -313,8 +326,9 @@ class RestService {
         api = api || this.getApiFromStore(config.apiName);
         const { method, params } = request, options = __rest(request, ["method", "params"]);
         const { observe = "body" /* Body */, skipHandleError } = config;
+        const url = this.removeDuplicateSlashes(api + request.url);
         return this.http
-            .request(method, api + request.url, Object.assign(Object.assign({ observe }, (params && {
+            .request(method, url, Object.assign(Object.assign({ observe }, (params && {
             params: this.getParams(params, config.httpParamEncoder),
         })), options))
             .pipe(catchError(err => (skipHandleError ? throwError(err) : this.handleError(err))));
@@ -333,6 +347,9 @@ class RestService {
             ? new HttpParams({ encoder, fromObject: filteredParams })
             : new HttpParams({ fromObject: filteredParams });
     }
+    removeDuplicateSlashes(url) {
+        return url.replace(/([^:]\/)\/+/g, '$1');
+    }
 }
 RestService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: RestService, deps: [{ token: CORE_OPTIONS }, { token: i1.HttpClient }, { token: EnvironmentService }, { token: HttpErrorReporterService }], target: i0.ɵɵFactoryTarget.Injectable });
 RestService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: RestService, providedIn: 'root' });
@@ -352,9 +369,7 @@ class AbpApplicationConfigurationService {
     constructor(restService) {
         this.restService = restService;
         this.apiName = 'abp';
-    }
-    get() {
-        return this.restService.request({
+        this.get = () => this.restService.request({
             method: 'GET',
             url: '/api/abp/application-configuration',
         }, { apiName: this.apiName });
@@ -473,6 +488,22 @@ class ConfigStateService {
             }, {});
         }));
     }
+    getGlobalFeatures() {
+        return this.store.state.globalFeatures;
+    }
+    getGlobalFeatures$() {
+        return this.store.sliceState(state => state.globalFeatures);
+    }
+    isGlobalFeatureEnabled(key, globalFeatures) {
+        const features = globalFeatures.enabledFeatures || [];
+        return features.some(f => key === f);
+    }
+    getGlobalFeatureIsEnabled(key) {
+        return this.isGlobalFeatureEnabled(key, this.store.state.globalFeatures);
+    }
+    getGlobalFeatureIsEnabled$(key) {
+        return this.store.sliceState(state => this.isGlobalFeatureEnabled(key, state.globalFeatures));
+    }
 }
 ConfigStateService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ConfigStateService, deps: [{ token: AbpApplicationConfigurationService }], target: i0.ɵɵFactoryTarget.Injectable });
 ConfigStateService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: ConfigStateService, providedIn: 'root' });
@@ -1919,6 +1950,8 @@ class PermissionDirective {
         this.permissionService = permissionService;
         this.cdRef = cdRef;
         this.runChangeDetection = true;
+        this.cdrSubject = new ReplaySubject();
+        this.rendered = false;
     }
     check() {
         if (this.subscription) {
@@ -1932,7 +1965,12 @@ class PermissionDirective {
             if (isGranted)
                 this.vcRef.createEmbeddedView(this.templateRef);
             if (this.runChangeDetection) {
-                this.cdRef.detectChanges();
+                if (!this.rendered) {
+                    this.cdrSubject.next();
+                }
+                else {
+                    this.cdRef.detectChanges();
+                }
             }
             else {
                 this.cdRef.markForCheck();
@@ -1946,6 +1984,10 @@ class PermissionDirective {
     ngOnChanges() {
         this.check();
     }
+    ngAfterViewInit() {
+        this.cdrSubject.pipe(take(1)).subscribe(() => this.cdRef.detectChanges());
+        this.rendered = true;
+    }
 }
 PermissionDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.6", ngImport: i0, type: PermissionDirective, deps: [{ token: i0.TemplateRef, optional: true }, { token: i0.ViewContainerRef }, { token: PermissionService }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
 PermissionDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.6", type: PermissionDirective, selector: "[abpPermission]", inputs: { condition: ["abpPermission", "condition"], runChangeDetection: ["abpPermissionRunChangeDetection", "runChangeDetection"] }, usesOnChanges: true, ngImport: i0 });
@@ -2295,6 +2337,7 @@ class ApiInterceptor {
         if (!(existingHeaders === null || existingHeaders === void 0 ? void 0 : existingHeaders.has(this.tenantKey)) && (tenant === null || tenant === void 0 ? void 0 : tenant.id)) {
             headers[this.tenantKey] = tenant.id;
         }
+        headers['X-Requested-With'] = 'XMLHttpRequest';
         return headers;
     }
 }
@@ -2776,15 +2819,13 @@ class AbpTenantService {
     constructor(restService) {
         this.restService = restService;
         this.apiName = 'abp';
-        this.findTenantById = (id, headers) => this.restService.request({
+        this.findTenantById = (id) => this.restService.request({
             method: 'GET',
             url: `/api/abp/multi-tenancy/tenants/by-id/${id}`,
-            headers,
         }, { apiName: this.apiName });
-        this.findTenantByName = (name, headers) => this.restService.request({
+        this.findTenantByName = (name) => this.restService.request({
             method: 'GET',
             url: `/api/abp/multi-tenancy/tenants/by-name/${name}`,
-            headers,
         }, { apiName: this.apiName });
     }
 }
@@ -2814,12 +2855,12 @@ class MultiTenancyService {
     }
     setTenantByName(tenantName) {
         return this.tenantService
-            .findTenantByName(tenantName, { [this.tenantKey]: '' })
+            .findTenantByName(tenantName)
             .pipe(switchMap(this.setTenantToState));
     }
     setTenantById(tenantId) {
         return this.tenantService
-            .findTenantById(tenantId, { [this.tenantKey]: '' })
+            .findTenantById(tenantId)
             .pipe(switchMap(this.setTenantToState));
     }
 }