Merge whitelist to always include (#348)

feathersjs-ecosystem · Oct 7, 2019 · 65d5685 · 65d5685
1 parent fda4b02
commit 65d5685
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/service.js b/lib/service.js
@@ -11,15 +11,18 @@ class Service extends AdapterService {
       throw new Error('You must provide a Mongoose Model');
     }
 
+    const { whitelist = ['$regex'] } = options;
+
     super(Object.assign({
       id: '_id',
-      whitelist: ['$and', '$regex'],
       filters: Object.assign({
         $populate (value) {
           return value;
         }
       }, options.filters)
-    }, options));
+    }, options, {
+      whitelist: whitelist.concat('$and')
+    }));
 
     this.discriminatorKey = this.Model.schema.options.discriminatorKey;
     this.discriminators = {};

diff --git a/test/index.test.js b/test/index.test.js
@@ -162,6 +162,10 @@ describe('Feathers Mongoose Service', () => {
       expect(people.id).to.equal('_id');
     });
 
+    it('merges whitelist parameters (#347)', () => {
+      expect(people.options.whitelist).to.deep.equal(['$populate', '$and']);
+    });
+
     it('when missing the overwrite option sets the default to be true', () => {
       expect(people.overwrite).to.be.true;
     });