@autofleet/zehut 3.1.2-beta.12 → 3.1.2-beta.13

package/lib/user/ApiUser.js

@@ -10,6 +10,7 @@ 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 });
@@ -81,21 +82,13 @@ class ApiUser {
         return Object.keys(this.privatePermissions[key] || {});
     }
     get elevatedPermissions() {
-        const permissions = {
+        let permissions = {
             fleets: {},
             businessModels: {},
             demandSources: {},
         };
-        [...this.privateElevatedPermissionsHash.values()].forEach((p) => {
-            Object.keys(p).forEach((topLevelKey) => {
-                if (!permissions[topLevelKey]) {
-                    permissions[topLevelKey] = {};
-                }
-                // Merge each [entityId => string[]]
-                Object.entries(p[topLevelKey]).forEach(([entityId, perms]) => {
-                    permissions[topLevelKey][entityId] = (permissions[topLevelKey][entityId] || []).concat(perms);
-                });
-            });
+        [...this.privateElevatedPermissionsHash.values()].forEach((elevatedPermissions) => {
+            permissions = (0, utils_1.mergePermissions)(permissions, elevatedPermissions);
         });
         return permissions;
     }
@@ -103,17 +96,8 @@ class ApiUser {
         if (!this.privatePermissions) {
             throw new Error('Cannot get permissions without calling (async) getUserPermissions before');
         }
-        const base = JSON.parse(JSON.stringify(this.privatePermissions));
-        Object.keys(this.elevatedPermissions).forEach((topLevelKey) => {
-            if (!base[topLevelKey]) {
-                base[topLevelKey] = {};
-            }
-            // Merge each [entityId => string[]]
-            Object.entries(this.elevatedPermissions[topLevelKey]).forEach(([entityId, perms]) => {
-                base[topLevelKey][entityId] = (base[topLevelKey][entityId] || []).concat(perms);
-            });
-        });
-        return base;
+        const permissions = (0, utils_1.mergePermissions)(this.privatePermissions, this.elevatedPermissions);
+        return permissions;
     }
     elevatePermissions(addedPermissions) {
         const elevationId = (0, uuid_1.v4)();

package/lib/user/api-user-flows.test.js

@@ -136,7 +136,7 @@ describe('E2E', () => {
         closeServer1();
         expect(error.message).toEqual('Entity id on elevatePermissions is not a valid UUID, provided: nnn');
     });
-    it('should correctly handle elevation of permissions and their reversion', async () => {
+    it.only('should correctly handle elevation of permissions and their reversion', async () => {
         let capturedError = null;
         // Snapshots to capture state after each step
         let afterFirstElevationElevated = {
@@ -257,7 +257,6 @@ describe('E2E', () => {
         // Basic assertions
         expect(response.status).toEqual(200);
         expect(capturedError).toBeNull();
-        console.log('afterFirstElevationElevated', afterFirstElevationElevated);
         // ---------------------
         // Assertions After First Elevation
         // ---------------------

package/lib/utils.d.ts

@@ -3,3 +3,4 @@ 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.getContextAttributes = exports.getEntitiesFromContext = exports.parsePermissions = exports.decodeBearer = exports.getAuthFromBearer = void 0;
+exports.mergePermissions = 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,3 +97,14 @@ const getContextAttributes = (contextId, decodedToken) => {
     return attributes;
 };
 exports.getContextAttributes = getContextAttributes;
+const mergePermissions = (target, sources) => {
+    const base = JSON.parse(JSON.stringify(target));
+    Object.keys(sources).forEach((topLevelKey) => {
+        base[topLevelKey] ?? (base[topLevelKey] = {});
+        Object.entries(sources[topLevelKey]).forEach(([entityId, perms]) => {
+            base[topLevelKey][entityId] = (base[topLevelKey][entityId] || []).concat(perms);
+        });
+    });
+    return base;
+};
+exports.mergePermissions = mergePermissions;

package/package.json

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