fix: Add whitelist and filter support to common adapter service (#1132)

feathersjs · Dec 17, 2018 · df1daaa · df1daaa
1 parent f83c28c
commit df1daaa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/packages/adapter-commons/lib/service.js b/packages/adapter-commons/lib/service.js
@@ -34,11 +34,16 @@ module.exports = class AdapterService {
     return this.options.events;
   }
 
-  filterQuery (params = {}, options = {}) {
+  filterQuery (params = {}, opts = {}) {
     const paginate = typeof params.paginate !== 'undefined'
       ? params.paginate : this.options.paginate;
     const { query = {} } = params;
-    const result = filterQuery(query, Object.assign({ paginate }, options));
+    const options = Object.assign({
+      operators: this.options.whitelist || [],
+      filters: this.options.filters,
+      paginate
+    }, opts);
+    const result = filterQuery(query, options);
 
     return Object.assign(result, { paginate });
   }

diff --git a/packages/adapter-commons/test/service.test.js b/packages/adapter-commons/test/service.test.js
@@ -100,8 +100,10 @@ describe('@feathersjs/adapter-commons/service', () => {
     });
   });
 
-  it('getFilters', () => {
-    const service = new CustomService();
+  it('filterQuery', () => {
+    const service = new CustomService({
+      whitelist: [ '$something' ]
+    });
     const filtered = service.filterQuery({
       query: { $limit: 10, test: 'me' }
     });
@@ -111,5 +113,15 @@ describe('@feathersjs/adapter-commons/service', () => {
       filters: { $limit: 10 },
       query: { test: 'me' }
     });
+
+    const withWhitelisted = service.filterQuery({
+      query: { $limit: 10, $something: 'else' }
+    });
+
+    assert.deepStrictEqual(withWhitelisted, {
+      paginate: {},
+      filters: { $limit: 10 },
+      query: { $something: 'else' }
+    });
   });
 });