@open-rlb/ng-app 3.1.16 → 3.1.17

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

@@ -1633,19 +1633,21 @@ class CompanyInterceptor {
             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 mapping = this.config.acl?.interceptorMapping;
+            // If no mapping is defined, just return the request
+            if (!mapping || !app?.data) {
+                return req;
             }
-            // If no companyId and productId presented call as is
-            return req;
+            let params = req.params;
+            // DYNAMIC LOOP:
+            // Iterate over all keys defined in the environment config
+            Object.entries(mapping).forEach(([httpParamName, storeDataKey]) => {
+                const value = app.data[storeDataKey];
+                if (value !== undefined && value !== null) {
+                    params = params.set(httpParamName, value.toString());
+                }
+            });
+            return req.clone({ params });
         }), switchMap$1(clonedReq => 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 }); }