@dynamatix/gb-schemas 0.21.17 → 0.21.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamatix/gb-schemas",
-  "version": "0.21.17",
+  "version": "0.21.19",
   "description": "All the schemas for gatehouse bank back-end.",
   "main": "index.js",
   "scripts": {

package/utils/encryption.js

@@ -34,6 +34,9 @@ const deriveIV = (value) => {
 
 // **Encrypt a Single Value Deterministically**
 const encryptValue = (value) => {
+    if(!value) {
+        return value;
+    }
     const iv = deriveIV(value); // Same IV for same value (allows searching)
     const cipher = crypto.createCipheriv('aes-256-gcm', SECRET_KEY, iv);
 
@@ -80,7 +83,8 @@ export const decryptObject = (obj, collectionName) => {
             decryptedObj[key] = obj[key]; // Keep _id and ObjectId references unchanged
         } else {
             try {
-                if(Array.isArray(obj[key])) {
+                if(Array.isArray(obj[key]) || !obj[key]) {
+                    decryptedObj[key] = obj[key];
                     continue;
                 }
                 const [ivHex, authTagHex, encryptedData] = obj[key].split(':');

package/utils/encryption.middleware.js

@@ -64,12 +64,19 @@ export default function mongooseEncryption(schema, options) {
     
 
     // Decrypt result after querying
-    schema.post(['find', 'findOne', 'findById'], function (docs) {
+    schema.post(['find', 'findOne', 'findById'], function (docs, next) {
         if (Array.isArray(docs)) {
-            docs.forEach((doc) => doc && doc.set(decryptObject(doc.toObject(), collectionName)));
+            docs.forEach((doc, index) => {
+                if (doc) {
+                    const decrypted = decryptObject(doc.toObject(), this.collection.name);
+                    Object.assign(docs[index], decrypted); // ✅ Ensure changes persist
+                }
+            });
         } else if (docs) {
-            docs.set(decryptObject(docs.toObject(), collectionName));
+            const decrypted = decryptObject(docs.toObject(), this.collection.name);
+            Object.assign(docs, decrypted); // ✅ Ensure changes persist
         }
+        next();
     });
 
     // Decrypt after update operations (single or multiple documents)