Fix lint issues

Author: Tom Kirkpatrick

lib/middleware/user-context.js

@@ -8,38 +8,37 @@ module.exports = function userContextMiddleware() {
   return function userContext(req, res, next) {
     const loopbackContext = loopback.getCurrentContext();
 
-    if (loopbackContext) {
-      if (!req.accessToken) {
-        debug('No user context (access token not found)');
-        return next();
-      }
-
-      loopbackContext.set('accessToken', req.accessToken.id);
-      const app = req.app;
-      const UserModel = app.accessUtils.options.userModel || 'User';
-
-      Promise.join(
-        app.models[UserModel].findById(req.accessToken.userId),
-        app.models.Team.find({
-          where: {
-            userId: req.accessToken.userId
-          }
-        }),
-        (user, groups) => {
-          if (!user) {
-            return next(new Error('No user with this access token was found.'));
-          }
-          loopbackContext.set('currentUser', user);
-          loopbackContext.set('currentUserGroups', groups);
-          debug('currentUser', user);
-          debug('currentUserGroups', groups);
-          return next();
-        })
-        .catch(next);
-    }
-    else {
+    if (!loopbackContext) {
       debug('No user context (loopback current context not found)');
       return next();
     }
+
+    if (!req.accessToken) {
+      debug('No user context (access token not found)');
+      return next();
+    }
+
+    loopbackContext.set('accessToken', req.accessToken.id);
+    const app = req.app;
+    const UserModel = app.accessUtils.options.userModel || 'User';
+
+    return Promise.join(
+      app.models[UserModel].findById(req.accessToken.userId),
+      app.models.Team.find({
+        where: {
+          userId: req.accessToken.userId
+        }
+      }),
+      (user, groups) => {
+        if (!user) {
+          return next(new Error('No user with this access token was found.'));
+        }
+        loopbackContext.set('currentUser', user);
+        loopbackContext.set('currentUserGroups', groups);
+        debug('currentUser', user);
+        debug('currentUserGroups', groups);
+        return next();
+      })
+      .catch(next);
   };
 };

lib/utils.js

@@ -71,7 +71,7 @@ module.exports = class AccessUtils {
             debug('%s observe access: query=%s, options=%o, hookState=%o',
               Model.modelName, JSON.stringify(ctx.query, null, 4), ctx.options, ctx.hookState);
 
-            this.buildFilter(currentUser.getId())
+            return this.buildFilter(currentUser.getId())
               .then(filter => {
                 debug('filter: %o', filter);
                 const where = ctx.query.where ? {
@@ -80,12 +80,9 @@ module.exports = class AccessUtils {
 
                 ctx.query.where = where;
                 debug('where query modified to: %s', JSON.stringify(ctx.query, null, 4));
-                next();
               });
           }
-          else {
-            return next();
-          }
+          return next();
         });
       }
     });

package.json

@@ -71,7 +71,7 @@
     "esformatter-use-strict": "2.0.2",
     "eslint": "2.0.0-rc.0",
     "eslint-config-fullcube": "https://github.com/fullcube/eslint-config-fullcube/tarball/master",
-    "eslint-config-strict": "https://github.com/fullcube/eslint-config-strict/tarball/84cf461e49efa918558d69aaa99733b65c606c2d",
+    "eslint-config-strict": "https://github.com/fullcube/eslint-config-strict/tarball/f235fa38289b17e305a65be38ff9cfdf4c1eb31c",
     "isparta": "4.0.0",
     "leasot": "3.1.2",
     "loopback-boot": "2.16.0",

test/rest-test.js

@@ -496,6 +496,7 @@ describe('REST API', function() {
           if (invoiceId) {
             return app.models.Invoice.destroyById(invoiceId);
           }
+          return null;
         });
       });
       // end create
@@ -589,10 +590,12 @@ describe('REST API', function() {
           });
         }
         else {
-          return logInAs(user.username)
-            .then(res => json('put', `/api/invoices/1?access_token=${res.body.id}`)
-              .send({ someprop: 'someval' })
-              .expect(401));
+          it('should update a teams invoice attributes', function() {
+            return logInAs(user.username)
+              .then(res => json('put', `/api/invoices/1?access_token=${res.body.id}`)
+                .send({ someprop: 'someval' })
+                .expect(401));
+          });
         }
 
         it('should not update another teams invoice attributes', function() {