@autofleet/zehut 3.1.2-beta.15 → 3.1.2-beta.16

package/lib/user/ApiUser.js

@@ -10,10 +10,30 @@ const object_hash_1 = __importDefault(require("object-hash"));
 const uuid_1 = require("uuid");
 const outbreak_1 = require("@autofleet/outbreak");
 const services_1 = require("../services");
-const utils_1 = require("../utils");
 exports.ELEVATED_PERMISSIONS_HEADER = 'x-af-elevated-permissions';
 exports.CONTEXTS_IDS_HEADER = 'x-af-context-ids';
 const userCache = new node_cache_1.default({ stdTTL: 10 });
+const mergePermissions = (target, sources) => {
+    const permissions = {
+        ...(target || {}),
+        fleets: { ...target?.fleets },
+        businessModels: { ...target?.businessModels },
+        demandSources: { ...target?.demandSources },
+        // Clone other nested objects as needed
+    };
+    // eslint-disable-next-line no-restricted-syntax
+    for (const source of sources) {
+        Object.keys(source).forEach((entityType) => {
+            // eslint-disable-next-line no-param-reassign
+            permissions[entityType] ?? (permissions[entityType] = {});
+            Object.entries(source[entityType]).forEach(([entityId, perms]) => {
+                // eslint-disable-next-line no-param-reassign
+                permissions[entityType][entityId] = (permissions[entityType][entityId] || []).concat(perms);
+            });
+        });
+    }
+    return permissions;
+};
 class ApiUser {
     constructor(id, accountType, elevatedPermissions, contextIds) {
         this.id = id;
@@ -82,29 +102,13 @@ class ApiUser {
         return Object.keys(this.privatePermissions[key] || {});
     }
     get elevatedPermissions() {
-        const permissions = {
-            fleets: {},
-            businessModels: {},
-            demandSources: {},
-        };
-        [...this.privateElevatedPermissionsHash.values()].forEach((elevatedPermissions) => {
-            (0, utils_1.mergePermissions)(permissions, elevatedPermissions);
-        });
-        return permissions;
+        return mergePermissions(undefined, this.privateElevatedPermissionsHash.values());
     }
     get permissions() {
         if (!this.privatePermissions) {
             throw new Error('Cannot get permissions without calling (async) getUserPermissions before');
         }
-        const permissions = {
-            ...this.privatePermissions,
-            fleets: { ...this.privatePermissions.fleets },
-            businessModels: { ...this.privatePermissions.businessModels },
-            demandSources: { ...this.privatePermissions.demandSources },
-            // Clone other nested objects as needed
-        };
-        (0, utils_1.mergePermissions)(permissions, this.elevatedPermissions);
-        return permissions;
+        return mergePermissions(this.privatePermissions, this.privateElevatedPermissionsHash.values());
     }
     elevatePermissions(addedPermissions) {
         const elevationId = (0, uuid_1.v4)();

package/lib/utils.d.ts

@@ -3,4 +3,3 @@ export declare const decodeBearer: (bearer: string, appSecret?: string) => any;
 export declare const parsePermissions: (contextId: any, decodedToken: any) => any;
 export declare const getEntitiesFromContext: (contextId: string, decodedToken: any) => any;
 export declare const getContextAttributes: (contextId: string, decodedToken: any) => any;
-export declare const mergePermissions: (target: any, sources: any) => any;

package/lib/utils.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergePermissions = exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.getAuthFromBearer = void 0;
+exports.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.getAuthFromBearer = void 0;
 /* eslint-disable prefer-destructuring */
 const jwt = __importStar(require("jsonwebtoken"));
 const secret_getter_1 = require("./secret-getter");
@@ -97,15 +97,3 @@ const getContextAttributes = (contextId, decodedToken) => {
     return attributes;
 };
 exports.getContextAttributes = getContextAttributes;
-const mergePermissions = (target, sources) => {
-    Object.keys(sources).forEach((topLevelKey) => {
-        // eslint-disable-next-line no-param-reassign
-        target[topLevelKey] ?? (target[topLevelKey] = {});
-        Object.entries(sources[topLevelKey]).forEach(([entityId, perms]) => {
-            // eslint-disable-next-line no-param-reassign
-            target[topLevelKey][entityId] = (target[topLevelKey][entityId] || []).concat(perms);
-        });
-    });
-    return target;
-};
-exports.mergePermissions = mergePermissions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "3.1.2-beta.15",
+  "version": "3.1.2-beta.16",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",