@open-rlb/ng-app 3.1.20 → 3.1.22

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

@@ -15,7 +15,7 @@ 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 { filter, switchMap, map, BehaviorSubject, of, share, lastValueFrom, from, zip, EMPTY, catchError, Observable, tap, shareReplay, distinctUntilChanged, take } from 'rxjs';
+import { of, filter, switchMap, map, BehaviorSubject, share, lastValueFrom, from, zip, EMPTY, catchError, Observable, tap, 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';
@@ -420,7 +420,8 @@ class AdminApiService {
     }
     resourcesByUser$() {
         if (!this.aclConfig) {
-            throw new Error("ACL configuration is missing. Provide 'acl' in ProjectConfiguration.");
+            console.error("ACL configuration is missing. Provide 'acl' in ProjectConfiguration.");
+            return of([]);
         }
         const endpoint = this.config.endpoints?.[this.aclConfig.endpointKey];
         if (!endpoint) {
@@ -501,11 +502,13 @@ const DEFAULT_ROUTES_CONFIG = [
 ];
 
 class AppsService {
-    constructor(store, activatedRoute, router, loggerService, confAuth) {
+    constructor(store, activatedRoute, router, loggerService, confAuth, confAcl) {
         this.store = store;
         this.activatedRoute = activatedRoute;
         this.router = router;
         this.loggerService = loggerService;
+        this.confAuth = confAuth;
+        this.confAcl = confAcl;
         this.logger = this.loggerService.for(this.constructor.name);
         this.logger.log('AppsService initialized');
         this.initAuthProviders(store, confAuth);
@@ -515,8 +518,38 @@ class AppsService {
         return window.location.hostname;
     }
     get apps() {
-        return this.store.selectSignal(state => state[appContextFeatureKey].apps)()
-            .filter(app => app.id && (app.domains === undefined || app.domains == null || app.domains.includes(this.currentDomain)));
+        const apps = this.store.selectSignal(state => state[appContextFeatureKey].apps)();
+        const resources = this.store.selectSignal(state => state[aclFeatureKey].resources)();
+        const confAcl = this.confAcl;
+        return apps.filter(app => {
+            // Basic domain check
+            const isDomainAllowed = !app.domains || app.domains.includes(this.currentDomain);
+            if (!isDomainAllowed)
+                return false;
+            // If acl config doesnt exist return apps filtered by domain
+            if (!confAcl)
+                return true;
+            if (!resources && app.actions?.length)
+                return true;
+            if (!resources && app.actions && app.actions.length > 0)
+                return false;
+            return resources?.some(userResource => {
+                // Matching by Business ID
+                // IMPORTANT: app.data must have key, name of this key is in confAcl
+                const appBusId = app.data?.[confAcl.businessIdKey];
+                const matchBusId = userResource.resourceBusinessId === appBusId;
+                if (!matchBusId)
+                    return false;
+                // Matching by Resource ID
+                return userResource.resources.some(res => {
+                    const appResId = app.data?.[confAcl.resourceIdKey];
+                    const matchResId = res.resourceId === appResId;
+                    if (!matchResId)
+                        return false;
+                    return res.actions.some(action => app.actions?.includes(action));
+                });
+            });
+        });
     }
     get currentApp() {
         const app = this.store.selectSignal(state => state[appContextFeatureKey].currentApp)();
@@ -739,7 +772,7 @@ class AppsService {
         }
         return segments.join('/');
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: AppsService, deps: [{ token: i1$1.Store }, { token: i2.ActivatedRoute }, { token: i2.Router }, { token: AppLoggerService }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: AppsService, deps: [{ token: i1$1.Store }, { token: i2.ActivatedRoute }, { token: i2.Router }, { token: AppLoggerService }, { token: RLB_CFG_AUTH, optional: true }, { token: RLB_CFG_ACL, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: AppsService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: AppsService, decorators: [{
@@ -752,6 +785,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
                     args: [RLB_CFG_AUTH]
                 }, {
                     type: Optional
+                }] }, { type: undefined, decorators: [{
+                    type: Inject,
+                    args: [RLB_CFG_ACL]
+                }, {
+                    type: Optional
                 }] }] });
 
 class LanguageService {
@@ -885,6 +923,8 @@ 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;
@@ -1629,21 +1669,21 @@ class CompanyInterceptor {
     intercept(req, next) {
         const authConfig = this.config.auth;
         const isAllowed = authConfig?.allowedUrls?.some(url => req.url.includes(url));
-        console.log('CompanyInterceptor: isAllowed', isAllowed, 'enableCompanyInterceptor', authConfig?.enableCompanyInterceptor);
         if (!isAllowed || !authConfig?.enableCompanyInterceptor) {
             return next.handle(req);
         }
         const currentApp = this.store.selectSignal(state => state[appContextFeatureKey].currentApp)();
         const data = currentApp?.data;
         const mapping = this.config.acl?.interceptorMapping || {};
-        const params = req.params;
-        Object.keys(mapping).forEach((key) => {
+        let params = req.params;
+        for (const key of Object.keys(mapping)) {
             const storeKey = mapping[key];
             const value = data?.[storeKey];
             if (!!value) {
-                params.set(key, value);
+                params = params.set(key, value);
             }
-        });
+        }
+        ;
         const clonedReq = req.clone({ params });
         return next.handle(clonedReq);
     }
@@ -3053,16 +3093,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
 
 const appFeature = createFeature({
     name: appContextFeatureKey,
-    reducer: createReducer(initialAppContextState, on(AppContextActionsInternal.setCurrentApp, (state, { app, mode, url }) => ({ ...state, currentApp: app ? { ...app, viewMode: mode, navigationUrl: url } : null })), on(AppContextActions.removeApp, (state, { appType }) => ({ ...state, apps: state.apps.filter(a => a.type !== appType) })), on(AppContextActions.finalizeApp, (state, { appType, data, appId }) => {
+    reducer: createReducer(initialAppContextState, on(AppContextActionsInternal.setCurrentApp, (state, { app, mode, url }) => ({ ...state, currentApp: app ? { ...app, viewMode: mode, navigationUrl: url } : null })), on(AppContextActions.removeApp, (state, { appType }) => ({ ...state, apps: state.apps.filter(a => a.type !== appType) })), on(AppContextActions.finalizeApp, (state, { appType, data, appId, actions }) => {
         const appsOfType = state.apps.filter(a => a.type === appType);
         if (appsOfType.length === 0)
             throw new Error(`App type: ${appType} not found. Cannot finalize app.`);
         let updatedAppsOfType;
         if (appsOfType.length === 1 && !appsOfType[0].id) {
-            updatedAppsOfType = [{ ...appsOfType[0], data, id: appId, }];
+            updatedAppsOfType = [{ ...appsOfType[0], data, id: appId, actions }];
         }
         else {
-            updatedAppsOfType = [...appsOfType, { ...appsOfType[0], data, id: appId, }];
+            updatedAppsOfType = [...appsOfType, { ...appsOfType[0], data, id: appId, actions }];
         }
         const remainingApps = state.apps.filter(a => a.type !== appType);
         return { ...state, apps: [...remainingApps, ...updatedAppsOfType], };
@@ -3279,6 +3319,11 @@ function provideRlbConfig(env) {
             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 },
@@ -3332,5 +3377,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, 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, 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 };
 //# sourceMappingURL=open-rlb-ng-app.mjs.map