@autofleet/zehut 3.1.2-beta.5 → 3.1.2-beta.7

package/lib/user/ApiUser.js

@@ -7,10 +7,10 @@ exports.CONTEXTS_IDS_HEADER = exports.ELEVATED_PERMISSIONS_HEADER = void 0;
 /* eslint-disable consistent-return */
 const node_cache_1 = __importDefault(require("node-cache"));
 const object_hash_1 = __importDefault(require("object-hash"));
-const merge_deep_1 = __importDefault(require("merge-deep"));
 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 });
@@ -88,7 +88,7 @@ class ApiUser {
             demandSources: {},
         };
         [...this.privateElevatedPermissionsHash.values()].forEach((p) => {
-            permissions = (0, merge_deep_1.default)(permissions, p);
+            permissions = (0, utils_1.mergeDeep)(permissions, p);
         });
         return permissions;
     }
@@ -96,7 +96,7 @@ class ApiUser {
         if (!this.privatePermissions) {
             throw new Error('Cannot get permissions without calling (async) getUserPermissions before');
         }
-        const permissions = (0, merge_deep_1.default)(this.privatePermissions, this.elevatedPermissions);
+        const permissions = (0, utils_1.mergeDeep)(this.privatePermissions, this.elevatedPermissions);
         return permissions;
     }
     elevatePermissions(addedPermissions) {

package/lib/utils.d.ts

@@ -3,3 +3,11 @@ 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;
+/**
+ * Custom deep merge function that merges `source` into `target`.
+ *
+ * @param target - The object to receive merged properties.
+ * @param source - The object whose properties are merged into the target.
+ * @returns The modified `target` object.
+ */
+export declare const mergeDeep: <T extends object>(target: T, source: Partial<T>) => T;

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.mergeDeep = 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,34 @@ const getContextAttributes = (contextId, decodedToken) => {
     return attributes;
 };
 exports.getContextAttributes = getContextAttributes;
+/**
+ * A simple helper to check if a value is a plain object.
+ */
+const isObject = (value) => (typeof value === 'object'
+    && value !== null
+    && !Array.isArray(value));
+/**
+ * Custom deep merge function that merges `source` into `target`.
+ *
+ * @param target - The object to receive merged properties.
+ * @param source - The object whose properties are merged into the target.
+ * @returns The modified `target` object.
+ */
+const mergeDeep = (target, source) => {
+    if (!isObject(target) || !isObject(source)) {
+        throw new Error('Both arguments must be objects to merge');
+    }
+    Object.keys(source).forEach((key) => {
+        const sourceValue = source[key];
+        const targetValue = target[key];
+        if (isObject(sourceValue) && isObject(targetValue)) {
+            (0, exports.mergeDeep)(targetValue, sourceValue);
+        }
+        else {
+            // eslint-disable-next-line no-param-reassign
+            target[key] = sourceValue;
+        }
+    });
+    return target;
+};
+exports.mergeDeep = mergeDeep;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/zehut",
-  "version": "3.1.2-beta.5",
+  "version": "3.1.2-beta.7",
   "description": "manage user's identity",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -28,7 +28,6 @@
     "axios": "^0.27.2",
     "express": "^4.18.1",
     "jsonwebtoken": "^8.5.1",
-    "merge-deep": "^3.0.3",
     "methods": "^1.1.2",
     "moment": "^2.29.1",
     "nock": "^13.2.9",
@@ -50,7 +49,7 @@
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
-    "@autofleet/shtinker": "1.2.3-beta.5"
+    "@autofleet/shtinker": "^1.2.0"
   },
   "peerDependenciesMeta": {
     "@autofleet/shtinker": {