Merge branch 'creatorden' into lean-for-post-find-findone

Author: doguhanokumus

lib/mongoose-field-encryption.js

@@ -191,6 +191,19 @@ const fieldEncryption = function (schema, options) {
     }
   }
 
+  function findHook(_next) {
+    const next = getCompatitibleNextFunc(_next);
+    if (this.$useProjection) {
+      Object.keys(this._fields).forEach(key => {
+        if (fieldsToEncrypt.indexOf(key) === -1) return;
+        if (!this._fields[key] || (this._fields[key] !== 1 && this._fields[key] !== true)) return;
+        this._fields[`__enc_${key}`] = 1;
+        this._fields[`__enc_${key}_d`] = 1;
+      })
+    }
+    next()
+  }
+
   function updateHook(_next) {
     const next = getCompatitibleNextFunc(_next);
     for (const field of fieldsToEncrypt) {
@@ -300,7 +313,7 @@ const fieldEncryption = function (schema, options) {
       next();
     }
   })
-
+  schema.pre(['find', 'findOne'], findHook);
   schema.pre("findOneAndUpdate", updateHook);
 
   schema.pre("update", updateHook);