Minor cleanup and better debugging

Author: Tom Kirkpatrick

lib/index.js

@@ -29,7 +29,7 @@ module.exports = function loopbackComponentAccess(app, options) {
 
   // Set up model opertion hooks.
   if (options.applyToStatic) {
-    accessUtils.setupModels();
+    accessUtils.setupFilters();
   }
 
 // TODO: Create Group Access model automatically if one hasn't been specified

lib/utils.js

@@ -49,7 +49,7 @@ module.exports = class AccessUtils {
   /**
    * Add operation hooks to limit access.
    */
-  setupModels() {
+  setupFilters() {
     const models = [ this.options.groupModel ].concat(this.getGroupContentModels());
 
     models.forEach(modelName => {
@@ -298,14 +298,13 @@ module.exports = class AccessUtils {
       this.app.loopback.getCurrentContext().set('groupAccessApplied', true);
 
       /**
-       * Basic application that does not cover static methods.
-       * Similar to $owner.
+       * Basic application that does not cover static methods. Similar to $owner. (RECOMMENDED)
        */
       if (!this.options.applyToStatic) {
-        if (!context || !context.model || !context.modelId) {
+        if (!context || !modelClass || !modelId) {
           process.nextTick(() => {
             debug('Deny access (context: %s, context.model: %s, context.modelId: %s)',
-              Boolean(context), Boolean(context.model), Boolean(context.modelId));
+              Boolean(context), Boolean(modelClass), Boolean(modelId));
             cb(null, false);
           });
           return cb.promise;
@@ -319,7 +318,7 @@ module.exports = class AccessUtils {
       }
 
       /**
-       * More complex application that also covers static methods.
+       * More complex application that also covers static methods. (EXPERIMENTAL)
        */
       Promise.join(this.getCurrentGroupId(context), this.getTargetGroupId(context),
         (currentGroupId, targetGroupId) => {
@@ -402,6 +401,7 @@ module.exports = class AccessUtils {
 
     // Is the modelClass GroupModel or a subclass of GroupModel?
     if (this.isGroupModel(modelClass)) {
+      debug('Access to Group Model %s attempted', modelId);
       this.hasRoleInGroup(userId, roleId, modelId)
         .then(res => cb(null, res));
       return cb.promise;
@@ -452,7 +452,7 @@ module.exports = class AccessUtils {
       .then(count => {
         const res = count > 0;
 
-        debug(`user ${userId} has role ${role} in group ${group}: ${res}`);
+        debug(`User ${userId} ${res ? 'HAS' : 'DOESNT HAVE'} ${role} role in group ${group}`);
         cb(null, res);
       });
     return cb.promise;