@open-rlb/ng-app 3.1.27 → 3.1.29

package/fesm2022/open-rlb-ng-app.mjs

@@ -1,7 +1,7 @@
 import * as i1$2 from '@angular/common/http';
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import { InjectionToken, Injectable, Inject, Optional, inject, EventEmitter, importProvidersFrom, makeStateKey, makeEnvironmentProviders, Pipe, Input, Component, PLATFORM_ID, NgModule, Directive, isDevMode, provideAppInitializer } from '@angular/core';
+import { InjectionToken, Injectable, Inject, Optional, inject, EventEmitter, importProvidersFrom, makeStateKey, makeEnvironmentProviders, Pipe, Input, Component, PLATFORM_ID, TemplateRef, ViewContainerRef, input, effect, Directive, NgModule, isDevMode, provideAppInitializer } from '@angular/core';
 import * as i2 from '@angular/router';
 import { NavigationEnd, RoutesRecognized, RouterModule, Router, provideRouter } from '@angular/router';
 import * as i1$4 from '@angular/service-worker';
@@ -15,9 +15,8 @@ import { RLB_TRANSLATION_SERVICE, RlbBootstrapModule, ModalDirective, ToastDirec
 import * as i1$5 from 'angular-auth-oidc-client';
 import { AbstractLoggerService, AuthModule, provideAuth, AuthInterceptor, AbstractSecurityStorage } from 'angular-auth-oidc-client';
 import * as i1 from 'ngx-cookie-service-ssr';
-import { of, filter, switchMap, map, BehaviorSubject, share, lastValueFrom, from, zip, EMPTY, catchError, Observable, tap, shareReplay, distinctUntilChanged, take } from 'rxjs';
+import { of, tap, switchMap, from, map, catchError, filter, BehaviorSubject, share, lastValueFrom, zip, EMPTY, Observable, shareReplay, distinctUntilChanged, take } from 'rxjs';
 import { signalStore, withState, withMethods, patchState } from '@ngrx/signals';
-import { tapResponse } from '@ngrx/operators';
 import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 import * as i1$3 from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -452,31 +451,33 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
                     args: [RLB_CFG_ACL]
                 }] }] });
 
+const RLB_INIT_PROVIDER = new InjectionToken(`${RLB_CFG}:init.provider`);
+
 //import { ErrorManagementService } from "../../services/errors/error-management.service";
-const AclStore = signalStore({ providedIn: 'root' }, withState(initialAclState), withMethods((store, adminApi = inject(AdminApiService)) => ({
-    // REUSABLE LOGIC: Will be used in guard
-    hasPermission: (resourceName, action) => {
+const AclStore = signalStore({ providedIn: 'root' }, withState(initialAclState), withMethods((store, adminApi = inject(AdminApiService), baseStore = inject((Store)), rlbInitProvider = inject(RLB_INIT_PROVIDER, { optional: true }), aclConfiguration = inject(RLB_CFG_ACL, { optional: true })) => ({
+    hasPermission: (busId, resId, action) => {
         const resources = store.resources();
         if (!resources)
             return false;
-        return resources.some(company => company.resourceBusinessId === resourceName && company.resources.some(res => {
-            const matchName = res.resourceId === resourceName;
-            if (!action)
-                return matchName;
-            return matchName && res.actions.includes(action);
-        }));
+        return resources.some(company => company.resourceBusinessId === busId &&
+            company.resources.some(res => {
+                const matchRes = res.resourceId === resId;
+                return action ? (matchRes && res.actions.includes(action)) : matchRes;
+            }));
     },
-    // Replaces legacy ngrx action and the effect
+    // Load Logic: Replaces both Effects. Get user res + call via bridge finalizeApps
     loadACL() {
         patchState(store, { loading: true, loaded: false });
-        return adminApi.resourcesByUser$().pipe(
-        //errorManagement.manageUI('error', 'dialog'),
-        tapResponse({
-            next: (resources) => patchState(store, { resources, loaded: true, loading: false }),
-            error: (error) => {
-                console.error('ACL Load Failed', error);
-                patchState(store, { error, loaded: true, loading: false });
-            },
+        return adminApi.resourcesByUser$().pipe(tap(resources => patchState(store, { resources, loaded: true, loading: false })), switchMap((resources) => {
+            if (!rlbInitProvider) {
+                console.error("RlbInitProvider not found. Define RLB_INIT_PROVIDER");
+                return of(resources);
+            }
+            // Pass resources directly to the finalizer to prevent race condition problem
+            return from(rlbInitProvider.finalizeApps(resources, baseStore, aclConfiguration)).pipe(map(() => resources), catchError((err) => {
+                console.error('Finalization failed', err);
+                return of(resources);
+            }));
         }));
     },
     reset: () => patchState(store, initialAclState)
@@ -511,6 +512,7 @@ class AppsService {
         this.loggerService = loggerService;
         this.confAuth = confAuth;
         this.confAcl = confAcl;
+        this.aclStore = inject(AclStore); // Inject SignalStore here
         this.logger = this.loggerService.for(this.constructor.name);
         this.logger.log('AppsService initialized');
         this.initAuthProviders(store, confAuth);
@@ -521,11 +523,10 @@ class AppsService {
     }
     get apps() {
         const apps = this.store.selectSignal(state => state[appContextFeatureKey].apps)();
-        const resources = this.store.selectSignal(state => state[aclFeatureKey].resources)();
+        const resources = this.aclStore.resources();
         const confAcl = this.confAcl;
         return apps.filter(app => {
             // Basic domain check
-            console.log('Filtering app:', app);
             const isDomainAllowed = !app.domains || app.domains.includes(this.currentDomain);
             if (!isDomainAllowed)
                 return false;
@@ -554,11 +555,26 @@ class AppsService {
             });
         });
     }
+    get currentAppAclInfo() {
+        const app = this.currentApp;
+        if (!app || !app.data || !this.confAcl)
+            return null;
+        return {
+            busId: app.data[this.confAcl.businessIdKey],
+            resId: app.data[this.confAcl.resourceIdKey]
+        };
+    }
     get currentApp() {
         const app = this.store.selectSignal(state => state[appContextFeatureKey].currentApp)();
         this.logger.log('Current app from store:', app);
         return app;
     }
+    checkPermissionInCurrentApp(action) {
+        const info = this.currentAppAclInfo;
+        if (!info)
+            return false;
+        return this.aclStore.hasPermission(info.busId, info.resId, action);
+    }
     selectApp(app, viewMode, url) {
         const currentApp = this.currentApp;
         if (!app) {
@@ -926,8 +942,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
             args: [{ providedIn: 'root' }]
         }], ctorParameters: () => [{ type: i2.Router }, { type: i2.ActivatedRoute }, { type: AppLoggerService }, { type: LanguageService }, { type: i2$1.UniqueIdService }] });
 
-const RLB_INIT_PROVIDER = new InjectionToken(`${RLB_CFG}:init.provider`);
-
 class LocalCacheService {
     constructor(options) {
         this.options = options;
@@ -1527,16 +1541,9 @@ class AuthenticationService {
                 this.store.dispatch(AuthActions.setCurrentProvider({
                     currentProvider: authenticatedConfig.configId
                 }));
-                if (this.appconfig.acl) {
-                    // SignalStore methods can trigger the API call
-                    return this.aclStore.loadACL().pipe(tap(() => this.handleRedirect()), map(() => responses));
-                }
-                else {
-                    this.handleRedirect();
-                    return of(responses);
-                }
             }
-            return of(responses);
+            // SignalStore methods can trigger the API call
+            return this.aclStore.loadACL().pipe(tap(() => this.handleRedirect()), map(() => responses));
         }));
     }
     login(targetUrl) {
@@ -1677,7 +1684,6 @@ class CompanyInterceptor {
         }
         const currentApp = this.store.selectSignal(state => state[appContextFeatureKey].currentApp)();
         const data = currentApp?.data;
-        console.log('CompanyInterceptor - currentApp data:', data);
         const mapping = this.config.acl?.interceptorMapping || {};
         let params = req.params;
         for (const key of Object.keys(mapping)) {
@@ -2291,6 +2297,33 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
                 args: ['toast-container-ids']
             }] } });
 
+class RlbRole {
+    constructor() {
+        this.appsService = inject(AppsService);
+        this.templateRef = inject((TemplateRef));
+        this.viewContainer = inject(ViewContainerRef);
+        this.action = input(undefined, { ...(ngDevMode ? { debugName: "action" } : {}), alias: 'roles' });
+        // Effect automatically re-runs if store.resources or inputs change
+        effect(() => {
+            const action = this.action() || '';
+            const hasPerm = this.appsService.checkPermissionInCurrentApp(action);
+            this.viewContainer.clear();
+            if (hasPerm) {
+                this.viewContainer.createEmbeddedView(this.templateRef);
+            }
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: RlbRole, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.1.4", type: RlbRole, isStandalone: false, selector: "[roles]", inputs: { action: { classPropertyName: "action", publicName: "roles", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: RlbRole, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: '[roles]',
+                    standalone: false
+                }]
+        }], ctorParameters: () => [], propDecorators: { action: [{ type: i0.Input, args: [{ isSignal: true, alias: "roles", required: false }] }] } });
+
 class RlbAppModule {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: RlbAppModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.1.4", ngImport: i0, type: RlbAppModule, declarations: [
@@ -2314,7 +2347,9 @@ class RlbAppModule {
             CmsComponent,
             ContentComponent,
             AppTemplateComponent,
-            AppContainerComponent], imports: [CommonModule,
+            AppContainerComponent,
+            // directives
+            RlbRole], imports: [CommonModule,
             FormsModule,
             ReactiveFormsModule,
             TranslateModule,
@@ -2338,7 +2373,9 @@ class RlbAppModule {
             TranslateModule,
             RlbBootstrapModule,
             RouterModule,
-            FormsModule] }); }
+            FormsModule,
+            // directives
+            RlbRole] }); }
     static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: RlbAppModule, imports: [CommonModule,
             FormsModule,
             ReactiveFormsModule,
@@ -2375,7 +2412,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
                         CmsComponent,
                         ContentComponent,
                         AppTemplateComponent,
-                        AppContainerComponent
+                        AppContainerComponent,
+                        // directives
+                        RlbRole
                     ],
                     exports: [
                         // pipes
@@ -2396,7 +2435,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
                         TranslateModule,
                         RlbBootstrapModule,
                         RouterModule,
-                        FormsModule
+                        FormsModule,
+                        // directives
+                        RlbRole
                     ],
                     imports: [
                         CommonModule,
@@ -2543,55 +2584,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
             args: [{ selector: 'rlb-app-selector', imports: [RlbAppModule, CommonModule], template: "<div class=\"container mt-2\">\n  <div class=\"container text-center position-relative my-3\">\n    <h3>{{ 'core.apps.title' | translate}}</h3>\n    <i role=\"button\" class=\"bi bi-chevron-left position-absolute start-0 top-50 translate-middle-y cur\"\n    style=\"font-size: 25px;font-weight: 600;\" (click)=\"backClicked()\"></i>\n  </div>\n  <rlb-list>\n    @for (app of apps; track app.id) {\n      <ng-container ngProjectAs=\"rlb-list-item-image\">\n        @if (app.core) {\n          <ng-container ngProjectAs=\"rlb-list-item-image\">\n            <rlb-list-item-image [icon]=\"app.core.icon\" [avatar-size]=\"35\"\n              [line-1]=\"(app.core.title | translate) + (app.data?.appName ? ' - ' + app.data?.appName : '')\"\n              [disabled]=\"!app.enabled && (app.core.auth && !(auth$ | async))\" [line-2]=\"app.core.description | translate\"\n              (click)=\"selectApp(app)\">\n            </rlb-list-item-image>\n          </ng-container>\n        }\n      </ng-container>\n    }\n  </rlb-list>\n</div>\n" }]
         }], ctorParameters: () => [{ type: i1$6.Location }, { type: AppsService }, { type: AuthenticationService }] });
 
-class RlbRole {
-    constructor(templateRef, viewContainer, authenticationService, parseJwtService) {
-        this.templateRef = templateRef;
-        this.viewContainer = viewContainer;
-        this.authenticationService = authenticationService;
-        this.parseJwtService = parseJwtService;
-    }
-    set roles(roles) {
-        if (typeof roles === 'string') {
-            if (roles.includes(','))
-                roles = roles.split(',').map(role => role.trim());
-            else
-                roles = [roles];
-        }
-    }
-    updateView() {
-        return this.authenticationService.
-            accessToken$.pipe(map(token => this.parseJwtService.parseJwt(token)), 
-        //map(payload => this.authenticationService.currentProvider.roleClaim?.(payload) || []),
-        tap(roles => {
-            let valid = true;
-            for (const role of this.roles) {
-                if (roles.includes(role))
-                    valid &&= true;
-            }
-            if (valid) {
-                this.viewContainer.createEmbeddedView(this.templateRef);
-            }
-            else {
-                this.viewContainer.clear();
-            }
-        }));
-    }
-    ngOnInit() {
-        this.updateView().subscribe();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: RlbRole, deps: [{ token: i0.TemplateRef }, { token: i0.ViewContainerRef }, { token: AuthenticationService }, { token: ParseJwtService }], target: i0.ɵɵFactoryTarget.Directive }); }
-    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "21.1.4", type: RlbRole, isStandalone: false, selector: "[roles]", inputs: { roles: "roles" }, ngImport: i0 }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: RlbRole, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: '[roles]',
-                    standalone: false
-                }]
-        }], ctorParameters: () => [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: AuthenticationService }, { type: ParseJwtService }], propDecorators: { roles: [{
-                type: Input
-            }] } });
-
 const oauthGuard = (route, state) => {
     const authService = inject(AuthenticationService);
     return authService.isAuthenticated$.pipe(take(1), map((isAuthenticated) => {
@@ -2604,14 +2596,17 @@ const oauthGuard = (route, state) => {
 };
 
 const permissionGuard = (route) => {
-    const store = inject(AclStore);
+    const aclStore = inject(AclStore);
+    const appsService = inject(AppsService);
     const router = inject(Router);
-    const resource = route.data['resource'];
-    const action = route.data['action'];
-    // toObservable helps wait for 'loaded' to be true
-    return toObservable(store.loaded).pipe(filter(Boolean), take(1), map(() => store.hasPermission(resource, action)
-        ? true
-        : router.createUrlTree(['/notFound'])));
+    // We wait for aclStore to load data
+    return toObservable(aclStore.loaded).pipe(filter(Boolean), take(1), map(() => {
+        const action = route.data['action'];
+        if (appsService.checkPermissionInCurrentApp(action)) {
+            return true;
+        }
+        return router.createUrlTree(['/notFound']);
+    }));
 };
 
 const SESSION_RT = 'RT';
@@ -3252,6 +3247,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
         }] });
 
 class AclEffects {
+    // TODO: It's legacy approach. We're moving forward to signalStore. All legacy boilerplate (effects.ts, reducers.ts, actions.ts) will be removed soon
+    // I've moved this logic into acl.store.ts -> loadACL() method
+    // finalizeAppsOnAclLoad$ = createEffect(() => {
+    //   return this.actions$.pipe(
+    //     ofType(AclActions.loadACLSuccess),
+    //     switchMap(() => {
+    //       if (!this.rlbInitProvider) {
+    //         console.error("RlbInitProvider not found. Define RLB_INIT_PROVIDER");
+    //         return of(AclActions.finalizedAppsFailure());
+    //       }
+    //       return from(
+    //         this.rlbInitProvider.finalizeApps(this.store, this.aclConfiguration)
+    //       ).pipe(
+    //         map(() => AclActions.finalizedAppsSuccess()),
+    //         catchError(() => of(AclActions.finalizedAppsFailure()))
+    //       );
+    //     }));
+    // });
     constructor(actions$, adminApi, rlbInitProvider, aclConfiguration, store) {
         this.actions$ = actions$;
         this.adminApi = adminApi;
@@ -3266,15 +3279,6 @@ class AclEffects {
         this.fetchAcl$ = createEffect(() => {
             return this.actions$.pipe(ofType(AclActions.loadACL), switchMap$1(() => this.adminApi.resourcesByUser$().pipe(map$1(resources => AclActions.loadACLSuccess({ resources })), catchError(error => of(AclActions.loadACLFailure({ error }))))));
         });
-        this.finalizeAppsOnAclLoad$ = createEffect(() => {
-            return this.actions$.pipe(ofType(AclActions.loadACLSuccess), switchMap$1(() => {
-                if (!this.rlbInitProvider) {
-                    console.error("RlbInitProvider not found. Define RLB_INIT_PROVIDER");
-                    return of(AclActions.finalizedAppsFailure());
-                }
-                return from(this.rlbInitProvider.finalizeApps(this.store, this.aclConfiguration)).pipe(map$1(() => AclActions.finalizedAppsSuccess()), catchError(() => of(AclActions.finalizedAppsFailure())));
-            }));
-        });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: AclEffects, deps: [{ token: i1$8.Actions }, { token: AdminApiService }, { token: RLB_INIT_PROVIDER, optional: true }, { token: RLB_CFG_ACL, optional: true }, { token: i1$1.Store }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: AclEffects }); }
@@ -3342,14 +3346,10 @@ function provideRlbConfig(env) {
             inject(AppsService);
         }),
         provideAppInitializer(() => {
+            // From here starts all pipeline: checkAuthMultiple -> resourcesByUser -> finalizeApp -> orchestration in appsService
             const authService = inject(AuthenticationService);
             return authService.checkAuthMultiple();
         }),
-        provideAppInitializer(() => {
-            const aclStore = inject(AclStore);
-            // We call the rxMethod, AppInitializer can guarantee that this logic will be executed before routing
-            return aclStore.loadACL();
-        }),
         { provide: RLB_CFG, useValue: env },
         { provide: RLB_CFG_ENV, useValue: env.environment },
         { provide: RLB_CFG_CMS, useValue: env.cms },