@open-rlb/ng-app 3.1.16 → 3.1.18

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

@@ -15,20 +15,20 @@ 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 as take$1 } from 'rxjs';
+import { filter, switchMap, map, BehaviorSubject, of, 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';
 import * as i1$3 from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { provideTranslateHttpLoader } from '@ngx-translate/http-loader';
-import { take, map as map$1, switchMap as switchMap$1, tap as tap$1 } from 'rxjs/operators';
 import * as i1$6 from '@angular/common';
 import { isPlatformServer, CommonModule } from '@angular/common';
 import * as i3 from '@angular/forms';
 import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import * as i1$7 from '@angular/cdk/layout';
 import { Breakpoints } from '@angular/cdk/layout';
+import { tap as tap$1, map as map$1, switchMap as switchMap$1 } from 'rxjs/operators';
 
 // export const RLB_CFG = 'rlb.options';
 const RLB_CFG = new InjectionToken('rlb.options');
@@ -1632,21 +1632,18 @@ class CompanyInterceptor {
         if (!isAllowed || !authConfig?.enableCompanyInterceptor) {
             return next.handle(req);
         }
-        return this.store.select(state => state[appContextFeatureKey].currentApp).pipe(take(1), map$1((app) => {
-            // Get the correct keys from config
-            const companyKey = this.config.acl?.interceptorMapping?.companyIdKey ?? 'companyId';
-            const productKey = this.config.acl?.interceptorMapping?.productIdKey ?? 'productId';
-            const companyId = app?.data?.companyId;
-            const productId = app?.data?.productId;
-            if (companyId && productId) {
-                const params = req.params
-                    .set(companyKey, companyId)
-                    .set(productKey, productId);
-                return req.clone({ params });
+        const currentApp = this.store.selectSignal(state => state[appContextFeatureKey].currentApp)();
+        const data = currentApp?.data;
+        const mapping = this.config.acl?.interceptorMapping || {};
+        const map = Object.keys(mapping).forEach((key) => {
+            const storeKey = mapping[key];
+            const value = data?.[storeKey];
+            if (!!value) {
+                req.params.set(key, value);
             }
-            // If no companyId and productId presented call as is
-            return req;
-        }), switchMap$1(clonedReq => next.handle(clonedReq)));
+        });
+        const clonedReq = req.clone({ params: req.params });
+        return next.handle(clonedReq);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: CompanyInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.4", ngImport: i0, type: CompanyInterceptor }); }
@@ -2551,7 +2548,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.4", ngImpor
 
 const oauthGuard = (route, state) => {
     const authService = inject(AuthenticationService);
-    return authService.isAuthenticated$.pipe(take$1(1), map((isAuthenticated) => {
+    return authService.isAuthenticated$.pipe(take(1), map((isAuthenticated) => {
         if (!isAuthenticated) {
             authService.login(state.url);
             return false;
@@ -2566,7 +2563,7 @@ const permissionGuard = (route) => {
     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(1), map(() => store.hasPermission(resource, action)
+    return toObservable(store.loaded).pipe(filter(Boolean), take(1), map(() => store.hasPermission(resource, action)
         ? true
         : router.createUrlTree(['/notFound'])));
 };