@abp/ng.core 10.0.0-rc.3 → 10.0.1

package/fesm2022/abp-ng.core.mjs

@@ -5080,10 +5080,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 +5120,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;
     }));
 };