@open-rlb/ng-app 3.1.63 → 3.1.64

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

@@ -15,7 +15,7 @@ import { RLB_TRANSLATION_SERVICE, ToastService, RlbBootstrapModule, ModalDirecti
 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, tap, switchMap, from, map, catchError, filter, BehaviorSubject, share, lastValueFrom, zip, EMPTY, Observable, shareReplay, distinctUntilChanged, take } from 'rxjs';
+import { of, from, map, catchError, tap, switchMap, filter, BehaviorSubject, share, lastValueFrom, zip, EMPTY, Observable, shareReplay, distinctUntilChanged, take } from 'rxjs';
 import { signalStore, withState, withMethods, patchState } from '@ngrx/signals';
 import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 import * as i1$3 from '@ngx-translate/core';
@@ -395,18 +395,6 @@ const initialSidebarState = {
     searchText: null
 };
 
-const AclActions = createActionGroup({
-    source: 'ACL',
-    events: {
-        'Load ACL': emptyProps(),
-        'Load ACL Success': props(),
-        'Load ACL Failure': props(),
-        'Reset': emptyProps(),
-        'Finalized Apps Success': emptyProps(),
-        'Finalized Apps Failure': emptyProps()
-    }
-});
-
 const aclFeatureKey = 'acl';
 const initialAclState = {
     resources: null,
@@ -421,19 +409,20 @@ class AdminApiService {
         this.config = config;
         this.aclConfig = aclConfig;
     }
-    resourcesByUser$() {
+    resourcesByUser$(endpointKey, path) {
         if (!this.aclConfig) {
             console.error("ACL configuration is missing. Provide 'acl' in ProjectConfiguration.");
             return of([]);
         }
-        const endpoint = this.config.endpoints?.[this.aclConfig.endpointKey];
+        const endpoint = this.config.endpoints?.[endpointKey];
         if (!endpoint) {
-            throw new Error(`Endpoint '${this.aclConfig.endpointKey}' not found in configuration.`);
+            throw new Error(`Endpoint '${endpointKey}' not found in configuration.`);
+        }
+        if (!path) {
+            throw new Error(`Path '${path}' not found in configuration.`);
         }
-        const url = `${endpoint.baseUrl}/${this.aclConfig.path}`;
-        return this.httpClient.get(url).pipe(
-        //this.errorManagementService.manageUI('error', 'dialog')
-        );
+        const url = `${endpoint.baseUrl}/${path}`;
+        return this.httpClient.get(url).pipe();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.4", ngImport: i0, type: AdminApiService, deps: [{ token: i1$2.HttpClient }, { token: RLB_CFG, optional: true }, { token: RLB_CFG_ACL, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.4", ngImport: i0, type: AdminApiService, providedIn: 'root' }); }
@@ -455,7 +444,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.4", ngImpor
 
 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), 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();
@@ -464,25 +452,37 @@ const AclStore = signalStore({ providedIn: 'root' }, withState(initialAclState),
         return resources.some(company => company.resourceBusinessId === busId &&
             company.resources.some(res => {
                 const matchRes = res.resourceId === resId;
-                return action ? (matchRes && res.actions.includes(action)) : matchRes;
+                return action ? matchRes && res.actions.includes(action) : matchRes;
             }));
     },
     // Load Logic: Replaces both Effects. Get user res + call via bridge finalizeApps
-    loadACL() {
+    // Accept the provider's ACL config
+    loadACL(providerAcl) {
+        // IF NO ACL CONFIGURATION -> BYPASS
+        if (!providerAcl) {
+            patchState(store, { resources: [], loaded: true, loading: false });
+            // Even if empty, we execute finalizeApps so the pipeline doesn't hang
+            if (rlbInitProvider) {
+                return from(rlbInitProvider.finalizeApps([], baseStore, aclConfiguration)).pipe(map(() => []), catchError(err => {
+                    console.error('Finalization failed during bypass', err);
+                    return of([]);
+                }));
+            }
+            return of([]);
+        }
+        // IF ACL CONFIG EXISTS -> FETCH RESOURCES
         patchState(store, { loading: true, loaded: false });
-        return adminApi.resourcesByUser$().pipe(tap(resources => patchState(store, { resources, loaded: true, loading: false })), switchMap((resources) => {
+        return adminApi.resourcesByUser$(providerAcl.endpointKey, providerAcl.path).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) => {
+            return from(rlbInitProvider.finalizeApps(resources, baseStore, aclConfiguration)).pipe(map(() => resources), catchError(err => {
                 console.error('Finalization failed', err);
                 return of(resources);
             }));
         }));
     },
-    reset: () => patchState(store, initialAclState)
+    reset: () => patchState(store, initialAclState),
 })));
 
 class AbstractSupportService {
@@ -1551,22 +1551,25 @@ class AuthenticationService {
     }
     checkAuthMultiple(url) {
         return this.oidc.checkAuthMultiple(url).pipe(switchMap((responses) => {
-            const authenticatedConfig = responses.find(o => o.isAuthenticated);
+            let authenticatedConfig = responses.find(o => o.isAuthenticated);
+            // uncomment to bypass login
+            // if (isDevMode()) {
+            //   //@ts-ignore
+            //   authenticatedConfig = { configId: 'chattoo' };
+            // }
             if (authenticatedConfig && authenticatedConfig.configId) {
                 this.store.dispatch(AuthActions.setCurrentProvider({
                     currentProvider: authenticatedConfig.configId,
                 }));
             }
             else {
-                // wrap login with this to bypass login flow
-                // if (!isDevMode()) {
-                //
-                // }
                 this.login();
                 return EMPTY;
             }
-            // SignalStore methods can trigger the API call
-            return this.aclStore.loadACL().pipe(tap(() => this.handleRedirect()), map(() => responses));
+            // Find the active provider's configuration
+            const activeProviderConfig = this.authConfig?.providers.find(p => p.configId === authenticatedConfig?.configId);
+            // Pass the specific provider's ACL config to the store
+            return this.aclStore.loadACL(activeProviderConfig?.acl).pipe(tap(() => this.handleRedirect()), map(() => responses));
         }));
     }
     login(targetUrl) {
@@ -3368,7 +3371,7 @@ const authsFeature = createFeature({
     }))
 });
 const authReducer = authsFeature.reducer;
-const { selectAuthState, selectCurrentProvider, selectLoading: selectLoading$1 } = authsFeature;
+const { selectAuthState, selectCurrentProvider, selectLoading } = authsFeature;
 
 const navbarsFeature = createFeature({
     name: navbarsFeatureKey,
@@ -3483,78 +3486,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.4", ngImpor
                 }]
         }], propDecorators: { data: [{ type: i0.Input, args: [{ isSignal: true, alias: "data", required: true }] }] } });
 
-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;
-        this.rlbInitProvider = rlbInitProvider;
-        this.aclConfiguration = aclConfiguration;
-        this.store = store;
-        this.loadAclOnAuth$ = createEffect(() => {
-            return this.actions$.pipe(
-            // Listen for the action dispatched in AuthenticationService.checkAuthMultiple
-            ofType(AuthActions.setCurrentProvider), map$1(() => AclActions.loadACL()));
-        });
-        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 }))))));
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.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.2.4", ngImport: i0, type: AclEffects }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.4", ngImport: i0, type: AclEffects, decorators: [{
-            type: Injectable
-        }], ctorParameters: () => [{ type: i1$8.Actions }, { type: AdminApiService }, { type: undefined, decorators: [{
-                    type: Optional
-                }, {
-                    type: Inject,
-                    args: [RLB_INIT_PROVIDER]
-                }] }, { type: undefined, decorators: [{
-                    type: Optional
-                }, {
-                    type: Inject,
-                    args: [RLB_CFG_ACL]
-                }] }, { type: i1$1.Store }] });
-
-const aclFeature = createFeature({
-    name: aclFeatureKey,
-    reducer: createReducer(initialAclState, on(AclActions.loadACL, (state) => ({
-        ...state,
-        loading: true,
-        loaded: false
-    })), on(AclActions.loadACLSuccess, (state, { resources }) => ({
-        ...state,
-        resources,
-        loaded: true,
-        loading: false
-    })), on(AclActions.loadACLFailure, (state, { error }) => ({
-        ...state,
-        error,
-        loading: false,
-        loaded: true // We mark as loaded to unblock the UI even if the fetch fails
-    })), on(AclActions.reset, () => ({ ...initialAclState })))
-});
-const aclReducer = aclFeature.reducer;
-const { selectAclState, selectResources, selectLoading, selectLoaded } = aclFeature;
-
 const verifyDeactivate = (component, currentRoute, currentState, nextState) => {
     return component.verifyDeactivate();
 };
@@ -3565,12 +3496,10 @@ function provideRlbConfig(env) {
         RlbAppModule,
         provideStore(),
         provideState(authsFeature),
-        provideEffects(AuthEffects, AppContextEffects, AclEffects),
+        provideEffects(AuthEffects, AppContextEffects),
         provideState(navbarsFeature),
         provideState(sidebarsFeature),
         provideState(appFeature),
-        provideState(aclFeature),
-        // provideEffects(AppContextEffects),
         provideRouter(getDefaultRoutes(env.pages)),
         provideRlbCodeBrowserOAuth(env.auth),
         provideRlbI18n(env.i18n),
@@ -3594,12 +3523,14 @@ function provideRlbConfig(env) {
         { provide: RLB_CFG_I18N, useValue: env.i18n },
         { provide: RLB_CFG_ACL, useValue: env.acl },
         {
-            provide: ModalRegistryOptions, useValue: {
+            provide: ModalRegistryOptions,
+            useValue: {
                 modals: {
-                    "modal-apps-component": ModalAppsComponent,
+                    'modal-apps-component': ModalAppsComponent,
                     'error-modal-component': ErrorModalComponent,
-                }
-            }, multi: true
+                },
+            },
+            multi: true,
         },
         {
             provide: ToastRegistryOptions,
@@ -3614,12 +3545,16 @@ function provideRlbConfig(env) {
 }
 function provideApp(app) {
     const routesPaths = app.routes ? flattenRoutes(app.routes) : [];
-    const providers = [{
-            provide: RLB_APPS, useValue: {
+    const providers = [
+        {
+            provide: RLB_APPS,
+            useValue: {
                 ...app.info,
                 routes: routesPaths,
-            }, multi: true
-        },];
+            },
+            multi: true,
+        },
+    ];
     if (app.routes) {
         providers.push(provideRouter(app.routes));
     }
@@ -3640,5 +3575,5 @@ function flattenRoutes(routes, parentPath = '') {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractMdService, AbstractSupportService, AclActions, AppBreadcrumbService, AppContainerComponent, AppContextActions, AppContextActionsInternal, AppLoggerService, AppStorageService, AppTemplateComponent, AppsService, AsMultiPipe, AsSinglePipe, AuthActions, AuthActionsInternal, AuthFeatureService, AuthenticationService, AutolinkPipe, BaseComponent, CmsComponent, CmsPipe, ContentComponent, CookiesService, ErrorManagementService, ErrorModalComponent, KeycloakProfileService, LanguageService, LeftComponentPipe, LocalCacheService, ModalAppsComponent, NavbarActions, NavbarActionsInternal, OauthPasswordService, ParseJwtService, PwaUpdaterService, RLB_APPS, RLB_APP_NAVCOMP, RLB_CFG, RLB_CFG_ACL, RLB_CFG_AUTH, RLB_CFG_CMS, RLB_CFG_ENV, RLB_CFG_I18N, RLB_CFG_PAGES, RLB_INIT_PROVIDER, RightComponentPipe, RlbAppModule, RlbRole, SidebarActions, SidebarActionsInternal, StrapiService, ToastComponent, TokenOauthInterceptor, TranslateBrowserLoader, TruncatePipe, UtilsService, aclFeatureKey, appContextFeatureKey, authsFeatureKey, getDefaultRoutes, initialAclState, initialAppContextState, initialAuthState, initialNavbarState, initialSidebarState, navbarsFeatureKey, oauthGuard, oauthPasswordGuard, permissionGuard, provideApp, provideRlbCodeBrowserOAuth, provideRlbConfig, provideRlbI18n, sidebarsFeatureKey, translateBrowserLoaderFactory, verifyDeactivate };
+export { AbstractMdService, AbstractSupportService, AppBreadcrumbService, AppContainerComponent, AppContextActions, AppContextActionsInternal, AppLoggerService, AppStorageService, AppTemplateComponent, AppsService, AsMultiPipe, AsSinglePipe, AuthActions, AuthActionsInternal, AuthFeatureService, AuthenticationService, AutolinkPipe, BaseComponent, CmsComponent, CmsPipe, ContentComponent, CookiesService, ErrorManagementService, ErrorModalComponent, KeycloakProfileService, LanguageService, LeftComponentPipe, LocalCacheService, ModalAppsComponent, NavbarActions, NavbarActionsInternal, OauthPasswordService, ParseJwtService, PwaUpdaterService, RLB_APPS, RLB_APP_NAVCOMP, RLB_CFG, RLB_CFG_ACL, RLB_CFG_AUTH, RLB_CFG_CMS, RLB_CFG_ENV, RLB_CFG_I18N, RLB_CFG_PAGES, RLB_INIT_PROVIDER, RightComponentPipe, RlbAppModule, RlbRole, SidebarActions, SidebarActionsInternal, StrapiService, ToastComponent, TokenOauthInterceptor, TranslateBrowserLoader, TruncatePipe, UtilsService, aclFeatureKey, appContextFeatureKey, authsFeatureKey, getDefaultRoutes, initialAclState, initialAppContextState, initialAuthState, initialNavbarState, initialSidebarState, navbarsFeatureKey, oauthGuard, oauthPasswordGuard, permissionGuard, provideApp, provideRlbCodeBrowserOAuth, provideRlbConfig, provideRlbI18n, sidebarsFeatureKey, translateBrowserLoaderFactory, verifyDeactivate };
 //# sourceMappingURL=open-rlb-ng-app.mjs.map