Fix multiple lint issues

Author: Tom Kirkpatrick

lib/index.js

@@ -32,5 +32,5 @@ module.exports = function loopbackComponentAccess(app, options) {
     accessUtils.setupModels();
   }
 
-  // TODO: Create Group Access model automatically if one hasn't been specified
+// TODO: Create Group Access model automatically if one hasn't been specified
 };

lib/middleware/user-context.js

@@ -23,7 +23,6 @@ module.exports = function userContextMiddleware() {
     loopbackContext.set('accessToken', req.accessToken.id);
     const app = req.app;
     const UserModel = app.accessUtils.options.userModel || 'User';
-    const GroupAccessModel = app.accessUtils.options.groupAccessModel || 'GroupAccess';
 
     return Promise.join(
       app.models[UserModel].findById(req.accessToken.userId),

lib/utils.js

@@ -111,7 +111,7 @@ module.exports = class AccessUtils {
    */
   buildFilter(userId, Model) {
     const filter = { };
-    const key = this.isGroupModel(Model)? Model.getIdName() : this.options.foreignKey;
+    const key = this.isGroupModel(Model) ? Model.getIdName() : this.options.foreignKey;
     // TODO: Support key determination based on the belongsTo relationship.
 
     return this.getUserGroups(userId)
@@ -177,7 +177,7 @@ module.exports = class AccessUtils {
         rel = modelClass.relations[rel];
         // debug('Checking relation %s to %s: %j', r, rel.modelTo.modelName, rel);
         if (rel.type === 'belongsTo' && this.isGroupModel(rel.modelTo)) {
-          return models.push(modelName);
+          models.push(modelName);
         }
       }
     });
@@ -230,6 +230,7 @@ module.exports = class AccessUtils {
   getCurrentUser() {
     const ctx = this.app.loopback.getCurrentContext();
     const currentUser = ctx && ctx.get('currentUser') || null;
+
     return currentUser;
   }
 
@@ -241,6 +242,7 @@ module.exports = class AccessUtils {
   getCurrentUserGroups() {
     const ctx = this.app.loopback.getCurrentContext();
     const currentUserGroups = ctx && ctx.get('currentUserGroups') || [];
+
     return currentUserGroups;
   }
 
@@ -274,6 +276,7 @@ module.exports = class AccessUtils {
     const Role = this.app.models[this.options.roleModel];
 
     Role.registerResolver(accessGroup, (role, context, cb) => {
+      cb = cb || createPromiseCallback();
       const modelClass = context.model;
       const modelId = context.modelId;
       const userId = context.getUserId();
@@ -287,9 +290,9 @@ module.exports = class AccessUtils {
       if (!userId) {
         process.nextTick(() => {
           debug('Deny access for anonymous user');
-          if (cb) cb(null, false);
+          cb(null, false);
         });
-        return;
+        return cb.promise;
       }
 
       this.app.loopback.getCurrentContext().set('groupAccessApplied', true);
@@ -302,23 +305,23 @@ module.exports = class AccessUtils {
         if (!context || !context.model || !context.modelId) {
           process.nextTick(() => {
             debug('Deny access (context: %s, context.model: %s, context.modelId: %s)',
-              !!context, !!context.model, !!context.modelId);
-            if (cb) cb(null, false);
+              Boolean(context), Boolean(context.model), Boolean(context.modelId));
+            cb(null, false);
           });
-          return;
+          return cb.promise;
         }
 
-        return this.isGroupMemberWithRole(modelClass, modelId, userId, roleName)
-          .then(res => {
-            cb(null, res);
-          })
+        this.isGroupMemberWithRole(modelClass, modelId, userId, roleName)
+          .then(res => cb(null, res))
           .catch(cb);
+
+        return cb.promise;
       }
 
       /**
        * More complex application that also covers static methods.
        */
-      return Promise.join(this.getCurrentGroupId(context), this.getTargetGroupId(context),
+      Promise.join(this.getCurrentGroupId(context), this.getTargetGroupId(context),
         (currentGroupId, targetGroupId) => {
           if (!currentGroupId) {
             // TODO: Use promise cancellation to abort the chain early.
@@ -329,10 +332,7 @@ module.exports = class AccessUtils {
           scope.currentGroupId = currentGroupId;
           scope.targetGroupId = targetGroupId;
           const actions = [ ];
-          const conditions = {
-            userId: userId,
-            role: roleName
-          };
+          const conditions = { userId, role: roleName };
 
           conditions[this.options.foreignKey] = currentGroupId;
           actions.push(GroupAccess.count(conditions));
@@ -375,9 +375,9 @@ module.exports = class AccessUtils {
           return cb(null, res);
         })
         .catch(cb);
-
-      });
-  };
+      return cb.promise;
+    });
+  }
 
   /**
    * Check if a given user ID has a given role in the model instances group.
@@ -410,59 +410,51 @@ module.exports = class AccessUtils {
     modelClass.findById(modelId, (err, inst) => {
       if (err || !inst) {
         debug('Model not found for id %j', modelId);
-        if (cb) cb(err, false);
-        return;
+        return cb(err, false);
       }
       debug('Model found: %j', inst);
-      var groupId = inst[this.options.foreignKey];
+      const groupId = inst[this.options.foreignKey];
+
       // Ensure groupId exists and is not a function/relation
-      if (groupId && 'function' !== typeof groupId) {
-        if (cb) {
-          return this.hasRoleInGroup(userId, roleId, groupId)
-            .then(res => cb(null, res));
-        }
-      } else {
-        // Try to follow belongsTo
-        for (var r in modelClass.relations) {
-          var rel = modelClass.relations[r];
-          if (rel.type === 'belongsTo' && isGroupModel(rel.modelTo)) {
-            debug('Checking relation %s to %s: %j', r, rel.modelTo.modelName, rel);
-            inst[r](processRelatedGroup);
-            return;
-          }
-        }
-        debug('No matching belongsTo relation found for model %j and group: %j', modelId, groupId);
-        if (cb) cb(null, false);
+      if (groupId && typeof groupId !== 'function') {
+        return this.hasRoleInGroup(userId, roleId, groupId)
+          .then(res => cb(null, res));
       }
+      // Try to follow belongsTo
+      for (const relName in modelClass.relations) {
+        const rel = modelClass.relations[relName];
 
-      function processRelatedGroup(err, group) {
-        if (!err && group) {
-          debug('Group found: %j', group.getId());
-          if (cb) cb(null, this.hasRoleInGroup(userId, roleId, group.getId()));
-        } else {
-          if (cb) cb(err, false);
+        if (rel.type === 'belongsTo' && this.isGroupModel(rel.modelTo)) {
+          debug('Checking relation %s to %s: %j', relName, rel.modelTo.modelName, rel);
+          return inst[relName](function processRelatedGroup(error, group) {
+            if (!error && group) {
+              debug('Group found: %j', group.getId());
+              return cb(null, this.hasRoleInGroup(userId, roleId, group.getId()));
+            }
+            return cb(error, false);
+          });
         }
       }
+      debug('No matching belongsTo relation found for model %j and group: %j', modelId, groupId);
+      return cb(null, false);
     });
     return cb.promise;
-  };
+  }
 
   hasRoleInGroup(userId, role, group, cb) {
     debug('hasRoleInGroup: role: %o, group: %o, userId: %o', role, group, userId);
     cb = cb || createPromiseCallback();
     const GroupAccess = this.app.models[this.options.groupAccessModel];
-    const conditions = {
-      userId,
-      role,
-    }
+    const conditions = { userId, role };
+
     conditions[this.options.foreignKey] = group;
     GroupAccess.count(conditions)
       .then(count => {
         const res = count > 0;
 
         debug(`user ${userId} has role ${role} in group ${group}: ${res}`);
         cb(null, res);
-      })
+      });
     return cb.promise;
   }