Add expandPaths option to en/disable options.as path expansion (#30)

* Add `expandPaths` option * Add `expandPaths` option * Fix changes.
feathersjs-ecosystem · Oct 11, 2017 · 5931887 · 5931887
1 parent 0223c28
commit 5931887
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/query-with-current-user.js b/src/query-with-current-user.js
@@ -3,7 +3,8 @@ import set from 'lodash.set';
 
 const defaults = {
   idField: '_id',
-  as: 'userId'
+  as: 'userId',
+  expandPaths: true
 };
 
 export default function (options = {}) {
@@ -28,6 +29,10 @@ export default function (options = {}) {
       throw new Error(`Current user is missing '${options.idField}' field.`);
     }
 
-    set(hook.params, `query.${options.as}`, id);
+    if (options.expandPaths) {
+      set(hook.params, `query.${options.as}`, id);
+    } else {
+      hook.params.query[options.as] = id;
+    }
   };
 }
diff --git a/src/restrict-to-owner.js b/src/restrict-to-owner.js
@@ -5,7 +5,8 @@ import queryWithCurrentUser from './query-with-current-user';
 
 const defaults = {
   idField: '_id',
-  ownerField: 'userId'
+  ownerField: 'userId',
+  expandPaths: true
 };
 
 export default function (options = {}) {
@@ -24,7 +25,8 @@ export default function (options = {}) {
     if (hook.method === 'find' || hook.id === null) {
       return queryWithCurrentUser({
         idField: options.idField,
-        as: options.ownerField
+        as: options.ownerField,
+        expandPaths: options.expandPaths
       })(hook);
     }