@dynamatix/gb-schemas 0.23.4 → 0.23.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/gb-schemas",
-  "version": "0.23.4",
+  "version": "0.23.6",
   "description": "All the schemas for gatehouse bank back-end",
   "main": "lookup.service.js",
   "scripts": {

package/utils/encryption.js

@@ -56,7 +56,7 @@ export const encryptObject = (obj, collectionName) => {
 
     let encryptedObj = {};
     for (const key in obj) {
-        if (key === '_id' || isObjectIdOrArray(obj[key])) {
+        if (key === '_id' || isObjectIdOrArray(obj[key]) || key.startsWith("$")) {
             encryptedObj[key] = obj[key]; // Keep _id and ObjectId references unchanged
         } else {
             try {

package/utils/encryption.middleware.js

@@ -32,20 +32,28 @@ export default function mongooseEncryption(schema, options) {
         next();
     });
 
-    // Encrypt before update operations (single or multiple documents)
-    schema.pre("update", function (result) {
-        if (Array.isArray(result)) {
-            result.forEach(doc => doc.set(decryptObject(doc.toObject(), collectionName)));
-        } else {
-            result.set(encryptObject(result.toObject(), collectionName)); // Decrypt single document
-        }
+    // 🔹 Encrypt fields before `updateMany` or `update`
+    schema.pre(["update", "updateMany"], function (next) {
+        const update = this.getUpdate();
+
+        if (!update) return next(); // ✅ Skip if no update object
+
+        // ✅ Ensure we are not modifying _id or ObjectIds
+        this.setUpdate(encryptObject(update, this.mongooseCollection.name));
+
+        next();
     });
 
-    // Encrypt after updateOne operations
-    schema.pre(["updateOne","findOneAndUpdate"], function (result) {
-        if (result && result.toObject) {
-            result.set(encryptObject(result.toObject(), collectionName)); // Decrypt single document
-        }
+    // 🔹 Encrypt fields before `updateOne` or `findOneAndUpdate`
+    schema.pre(["updateOne", "findOneAndUpdate"], function (next) {
+        const update = this.getUpdate();
+
+        if (!update) return next(); // ✅ Skip if no update object
+
+        // ✅ Encrypt only the modified fields
+        this.setUpdate(encryptObject(update, this.mongooseCollection.name));
+
+        next();
     });
 
     // Encrypt before bulkWrite operations
@@ -113,32 +121,30 @@ export default function mongooseEncryption(schema, options) {
     });
 
 
-
-
     // Decrypt after update operations (single or multiple documents)
-    schema.post("update", function (result) {
+    schema.post(["update","create","save"], function (result, next) {
         if (Array.isArray(result)) {
             result.forEach(doc => doc.set(decryptObject(doc.toObject(), collectionName)));
         } else {
             result.set(decryptObject(result.toObject(), collectionName)); // Decrypt single document
         }
+        next();
     });
 
-    // Decrypt after updateOne operations
-    schema.post("updateOne", function (result) {
-        if (result && result.toObject) {
-            result.set(decryptObject(result.toObject(), collectionName)); // Decrypt single document
-        }
-    });
-
-
     // Decrypt after findOneAndUpdate operations
-    schema.post(["findOneAndUpdate","findOneAndDelete","deleteOne","remove"], function (doc) {
+    schema.post(["findOneAndUpdate","updateOne","findOneAndDelete","deleteOne","remove"], function (doc) {
         if (doc) {
             doc.set(decryptObject(doc.toObject(), collectionName)); // Decrypt single document
         }
     });
 
+     // Decrypt after deleteMany operations
+    schema.post("updateMany", function (result) {
+        if (Array.isArray(result)) {
+            result.forEach(doc => doc.set(decryptObject(doc.toObject(), collectionName))); // Decrypt document fields
+        }
+    });
+
     // Decrypt after deleteMany operations
     schema.post("deleteMany", function (result) {
         if (Array.isArray(result)) {