@abp/ng.core 10.0.0 → 10.0.2

package/fesm2022/abp-ng.core.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { inject, ChangeDetectorRef, Input, Component, Injectable, InjectionToken, Injector, NgModuleFactory, Compiler, PLATFORM_ID, makeStateKey, TransferState, REQUEST, NgZone, signal, computed, effect, LOCALE_ID, ComponentFactoryResolver, ApplicationRef, isDevMode, input, ElementRef, Directive, EventEmitter, Output, TemplateRef, ViewContainerRef, IterableDiffers, HostListener, provideAppInitializer, makeEnvironmentProviders, Pipe, SecurityContext, NgModule } from '@angular/core';
-import { of, BehaviorSubject, Subject, firstValueFrom, throwError, Observable, timer, pipe, concat, ReplaySubject, EMPTY, map as map$1, Subscription, combineLatest, from, take as take$1, filter as filter$1, fromEvent, switchMap as switchMap$1, startWith, distinctUntilChanged as distinctUntilChanged$1 } from 'rxjs';
+import { of, BehaviorSubject, Subject, firstValueFrom, throwError, timeout, lastValueFrom, Observable, timer, pipe, concat, ReplaySubject, EMPTY, map as map$1, Subscription, combineLatest, from, take as take$1, filter as filter$1, fromEvent, switchMap as switchMap$1, startWith, distinctUntilChanged as distinctUntilChanged$1 } from 'rxjs';
 import { PRIMARY_OUTLET, Router, NavigationStart, NavigationError, NavigationEnd, NavigationCancel, TitleStrategy, ActivatedRoute, RouterOutlet, RouterModule } from '@angular/router';
 import { isPlatformBrowser, DOCUMENT, registerLocaleData, NgComponentOutlet, isPlatformServer, DatePipe, DATE_PIPE_DEFAULT_TIMEZONE, CommonModule } from '@angular/common';
 import { map, distinctUntilChanged, filter, catchError, tap, take, switchMap, mapTo, takeUntil, delay, retryWhen, shareReplay, debounceTime, finalize } from 'rxjs/operators';
@@ -1102,6 +1102,7 @@ async function getInitialData() {
     const environmentService = injector.get(EnvironmentService);
     const configState = injector.get(ConfigStateService);
     const options = injector.get(CORE_OPTIONS);
+    const appStartedWithSSR = injector.get(APP_STARTED_WITH_SSR);
     environmentService.setState(options.environment);
     await getRemoteEnv(injector, options.environment);
     await parseTenantFromUrl(injector);
@@ -1124,8 +1125,12 @@ async function getInitialData() {
         }
         return throwError(() => error);
     }));
-    // TODO: Not working with SSR
-    // await lastValueFrom(result$);
+    if (appStartedWithSSR) {
+        await firstValueFrom(result$.pipe(timeout(0), catchError(() => of(null))));
+    }
+    else {
+        await lastValueFrom(result$);
+    }
     await localeInitializer(injector);
 }
 function localeInitializer(injector) {
@@ -5080,10 +5085,16 @@ class PermissionGuard {
         if (!requiredPolicy) {
             return of(true);
         }
-        return this.permissionService.getGrantedPolicy$(requiredPolicy).pipe(filter(Boolean), take(1), tap(access => {
-            if (!access && this.authService.isAuthenticated) {
+        return this.permissionService.getGrantedPolicy$(requiredPolicy).pipe(take(1), map(access => {
+            if (access)
+                return true;
+            if (route.data?.['redirectUrl']) {
+                return this.router.parseUrl(route.data['redirectUrl']);
+            }
+            if (this.authService.isAuthenticated) {
                 this.httpErrorReporter.reportError({ status: 403 });
             }
+            return false;
         }));
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.7", ngImport: i0, type: PermissionGuard, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -5114,10 +5125,16 @@ const permissionGuard = (route, state) => {
     if (isPlatformServer(platformId)) {
         return of(true);
     }
-    return permissionService.getGrantedPolicy$(requiredPolicy).pipe(filter(Boolean), take(1), tap(access => {
-        if (!access && authService.isAuthenticated) {
+    return permissionService.getGrantedPolicy$(requiredPolicy).pipe(take(1), map(access => {
+        if (access)
+            return true;
+        if (route.data?.['redirectUrl']) {
+            return router.parseUrl(route.data['redirectUrl']);
+        }
+        if (authService.isAuthenticated) {
             httpErrorReporter.reportError({ status: 403 });
         }
+        return false;
     }));
 };