@codex-ts/core-lib 1.1.3 → 1.1.4

package/fesm2022/codex-ts-core-lib.mjs

@@ -5,11 +5,10 @@ import { isPlatformBrowser, CommonModule, formatDate } from '@angular/common';
 import Keycloak from 'keycloak-js';
 import * as i1 from '@angular/common/http';
 import { HTTP_INTERCEPTORS, HttpClientModule, HttpParams } from '@angular/common/http';
-import { from, mergeMap, catchError, throwError, map, BehaviorSubject, finalize, Observable, forkJoin, of, isObservable, Subject, take as take$1, tap as tap$1, takeUntil as takeUntil$1, ReplaySubject, distinctUntilChanged as distinctUntilChanged$1 } from 'rxjs';
+import { from, mergeMap, catchError, throwError, Observable, BehaviorSubject, finalize, forkJoin, of, isObservable, Subject, take as take$1, tap as tap$1, map as map$1, takeUntil as takeUntil$1, ReplaySubject, distinctUntilChanged as distinctUntilChanged$1 } from 'rxjs';
 import * as i1$3 from '@angular/router';
 import { Router } from '@angular/router';
-import { toObservable } from '@angular/core/rxjs-interop';
-import { retry, timeout, catchError as catchError$1, take, map as map$1, finalize as finalize$1, switchMap, takeUntil, mergeMap as mergeMap$1, tap, debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { retry, timeout, catchError as catchError$1, take, map, finalize as finalize$1, switchMap, takeUntil, mergeMap as mergeMap$1, tap, debounceTime, distinctUntilChanged } from 'rxjs/operators';
 import * as i4 from 'primeng/api';
 import * as i1$1 from '@angular/forms';
 import { FormGroup, ReactiveFormsModule } from '@angular/forms';
@@ -324,20 +323,25 @@ class KeycloakAuthGuard {
     config = inject(KEYCLOAK_CONFIG);
     router = inject(Router);
     canActivate(route, state) {
-        return toObservable(this.keycloakService.isAuthenticated$).pipe(map(authenticated => {
-            if (!authenticated) {
-                this.keycloakService.login({ redirectUri: window.location.origin + state.url });
-                return false;
-            }
-            // Check for route-specific roles first, then fallback to default roles
-            const routeRoles = route.data['roles'];
-            const defaultRoles = this.config.options?.roles;
-            const requiredRoles = routeRoles || defaultRoles;
-            if (requiredRoles?.length && !this.hasRequiredRoles(requiredRoles)) {
-                return this.router.createUrlTree(['/unauthorized']);
-            }
-            return true;
-        }));
+        return new Observable(subscriber => {
+            const authenticated = this.keycloakService.isAuthenticated$();
+            subscriber.next(this.processAuthentication(authenticated, route, state));
+            subscriber.complete();
+        });
+    }
+    processAuthentication(authenticated, route, state) {
+        if (!authenticated) {
+            this.keycloakService.login({ redirectUri: window.location.origin + state.url });
+            return false;
+        }
+        // Check for route-specific roles first, then fallback to default roles
+        const routeRoles = route.data['roles'];
+        const defaultRoles = this.config.options?.roles;
+        const requiredRoles = routeRoles || defaultRoles;
+        if (requiredRoles?.length && !this.hasRequiredRoles(requiredRoles)) {
+            return this.router.createUrlTree(['/unauthorized']);
+        }
+        return true;
     }
     hasRequiredRoles(roles) {
         return roles.every(role => this.keycloakService.hasRole(role));
@@ -1102,7 +1106,7 @@ class FormService {
             return of(void 0);
         }
         this.formState.loading = true;
-        return this.entityService.getById(uuid).pipe(take(1), map$1(data => {
+        return this.entityService.getById(uuid).pipe(take(1), map(data => {
             this.updateFormState(data);
         }), finalize$1(() => this.formState.loading = false));
     }
@@ -1122,7 +1126,7 @@ class FormService {
         }
         this.formState.loading = true;
         const operation$ = this.getSubmitOperation();
-        return operation$.pipe(finalize$1(() => this.formState.loading = false), map$1(result => {
+        return operation$.pipe(finalize$1(() => this.formState.loading = false), map(result => {
             this.notificationService.showSuccess(`${this.entityName} ${AppMessages.FORM.SUCCESS.SAVE}`);
             return result;
         }));
@@ -1861,7 +1865,7 @@ class BaseFormComponent extends BasePageComponent {
         });
     }
     initializeForm() {
-        return this.route.queryParams.pipe(take(1), map$1(params => {
+        return this.route.queryParams.pipe(take(1), map(params => {
             this.initializeFormMode(params[AppConstants.FORM.MODE]);
             this.setupFormState();
             this.initializeFormSubscriptions();
@@ -1882,7 +1886,7 @@ class BaseFormComponent extends BasePageComponent {
                 throw new Error(`UUID is required for ${this.state.mode} mode`);
             }
             return this.getEntityOperations().getById(uuid)
-                .pipe(tap(data => this.updateFormState(data)), map$1(() => void 0));
+                .pipe(tap(data => this.updateFormState(data)), map(() => void 0));
         }));
     }
     getRouterState() {
@@ -2461,7 +2465,7 @@ class BaseTabbedFormComponent extends BasePageComponent {
             activeTab: tabs[0]?.value || ''
         };
         // Then initialize form
-        this.route.queryParams.pipe(take$1(1), tap$1(() => this.state = { ...this.state, loading: true }), tap$1(params => this.initializeForm(params)), map(() => void 0), catchError(error => {
+        this.route.queryParams.pipe(take$1(1), tap$1(() => this.state = { ...this.state, loading: true }), tap$1(params => this.initializeForm(params)), map$1(() => void 0), catchError(error => {
             console.error('Error initializing form:', error);
             this.showError(AppMessages.FORM.ERROR.INIT);
             return of(void 0);
@@ -2517,7 +2521,7 @@ class BaseTabbedFormComponent extends BasePageComponent {
         }
     }
     loadFromUuid() {
-        this.route.queryParams.pipe(take$1(1), map((params) => {
+        this.route.queryParams.pipe(take$1(1), map$1((params) => {
             const uuid = params[AppConstants.FORM.UUID];
             if (!uuid) {
                 throw new Error(`UUID is required for ${this.state.mode} mode when no formData is provided`);
@@ -2905,7 +2909,7 @@ class BaseTaskDetailsComponent extends BasePageComponent {
         this.formlyConfigService = formlyConfigService;
     }
     initializeServices() {
-        return of(void 0).pipe(map$1(() => {
+        return of(void 0).pipe(map(() => {
             this.formService = new FormService(this.getEntityService(), this.formlyConfigService, this.notificationService, this.getEntityName(), this.getJsonFields(), this.getDropdownOptions());
             this.state = this.formService.getState();
             this.loading = this.state.loading;
@@ -2920,7 +2924,7 @@ class BaseTaskDetailsComponent extends BasePageComponent {
         });
     }
     initializeFromRoute() {
-        return this.route.queryParams.pipe(map$1(params => {
+        return this.route.queryParams.pipe(map(params => {
             const mode = params[AppConstants.FORM.MODE];
             if (mode) {
                 this.formService.setMode(mode);