Creates better way or returning data in a familiar format (#234)

* Adds ability to verifyOrRestrict, populateOrRestrict, or hasRoleOrRestrict to either add a query restriction to the query params when the user is not authenticated or authorized or else leave the query unrestricted.

* Now filters direct id routes.

* Adds restriction hooks missing from git.

* Fixes jshint errors.

* Adds check to make sure restriction methods are only used for find and get methods.

* Fixes jshint errors.

* Fixes pagination in restriction hooks.

* Fixes pagination issue.

src/hooks/has-role-or-restrict.js

@@ -52,15 +52,13 @@ export default function(options = {}){
       }
 
       return this.find({ query }, params).then(results => {
-        if(results.length >= 1) {
-          if(hook.id !== undefined && hook.id !== null) {
-            hook.result = results[0];
-          } else {
-            hook.result = results;
-          }
+        if(hook.method === 'get' && Array.isArray(results) && results.length === 1) {
+          hook.result = results[0];
+          return hook;
+        } else {
+          hook.result = results;
           return hook;
         }
-        throw new errors.NotFound(`No record found`);
       }).catch(() => {
         throw new errors.NotFound(`No record found`);
       });
@@ -133,15 +131,13 @@ export default function(options = {}){
       }
 
       return this.find({ query }, params).then(results => {
-        if(results.length >= 1) {
-          if(hook.id !== undefined && hook.id !== null) {
-            hook.result = results[0];
-          } else {
-            hook.result = results;
-          }
+        if(hook.method === 'get' && Array.isArray(results) && results.length === 1) {
+          hook.result = results[0];
+          return hook;
+        } else {
+          hook.result = results;
           return hook;
         }
-        throw new errors.NotFound(`No record found`);
       }).catch(() => {
         throw new errors.NotFound(`No record found`);
       });

src/hooks/populate-or-restrict.js

@@ -50,15 +50,13 @@ export default function(options = {}){
       }
 
       return this.find({ query }, params).then(results => {
-        if(results.length >= 1) {
-          if(hook.id !== undefined && hook.id !== null) {
-            hook.result = results[0];
-          } else {
-            hook.result = results;
-          }
+        if(hook.method === 'get' && Array.isArray(results) && results.length === 1) {
+          hook.result = results[0];
+          return hook;
+        } else {
+          hook.result = results;
           return hook;
         }
-        throw new errors.NotFound(`No record found`);
       }).catch(() => {
         throw new errors.NotFound(`No record found`);
       });
@@ -90,16 +88,13 @@ export default function(options = {}){
         }
 
         return this.find({ query }, params).then(results => {
-          if(results.length >= 1) {
-            if(hook.id !== undefined && hook.id !== null) {
-              hook.result = results[0];
-            } else {
-              hook.result = results;
-            }
+          if(hook.method === 'get' && Array.isArray(results) && results.length === 1) {
+            hook.result = results[0];
+            return hook;
+          } else {
+            hook.result = results;
             return hook;
           }
-
-          throw new errors.NotFound(`No record found`);
         }).catch(() => {
           throw new errors.NotFound(`No record found`);
         });

src/hooks/verify-or-restrict.js

@@ -11,6 +11,7 @@ export default function(options = {}){
     if (hook.method !== 'find' && hook.method !== 'get') {
       throw new Error(`'verifyOrRestrict' should only be used in a find or get hook.`);
     }
+
     // If it was an internal call then skip this hook
     if (!hook.params.provider) {
       return hook;
@@ -39,16 +40,13 @@ export default function(options = {}){
       }
 
       return this.find({ query }, params).then(results => {
-        if(results.length >= 1) {
-          if(hook.id !== undefined && hook.id !== null) {
-            hook.result = results[0];
-          } else {
-            hook.result = results;
-          }
+        if(hook.method === 'get' && Array.isArray(results) && results.length === 1) {
+          hook.result = results[0];
+          return hook;
+        } else {
+          hook.result = results;
           return hook;
         }
-
-        throw new errors.NotFound(`No record found`);
       }).catch(() => {
         throw new errors.NotFound(`No record found`);
       });