Fix eslint issues

Author: Tane Morgan

.eslintignore

@@ -0,0 +1,2 @@
+_coverage/
+node_modules/

lib/articles/controller.js

@@ -4,7 +4,14 @@ const errorCatcher = require('async-error-catcher').default;
 
 exports.create = errorCatcher(async (req, res) => {
   const {body: {article: payload} = {}, user} = req;
-  const {app: {locals: {services: {articles}}}, locals: {trx}} = res;
+  const {
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
+    locals: {trx},
+  } = res;
 
   const article = await articles.create({...payload, author: user.id}, {trx});
 
@@ -15,7 +22,11 @@ exports.create = errorCatcher(async (req, res) => {
 
 exports.del = errorCatcher(async (req, res) => {
   const {
-    app: {locals: {services: {articles}}},
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
     locals: {article, trx} = {},
   } = res;
 
@@ -26,7 +37,13 @@ exports.del = errorCatcher(async (req, res) => {
 
 exports.feed = errorCatcher(async (req, res) => {
   const {query: {limit, offset} = {}, user} = req;
-  const {app: {locals: {services: {articles}}}} = res;
+  const {
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
+  } = res;
 
   const feedJSON = await articles.getFeedJSON(
     {
@@ -41,7 +58,13 @@ exports.feed = errorCatcher(async (req, res) => {
 
 exports.index = errorCatcher(async (req, res) => {
   const {query: {author, favorited, limit, offset, tag} = {}, user} = req;
-  const {app: {locals: {services: {articles}}}} = res;
+  const {
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
+  } = res;
 
   const articlesJSON = await articles.getArticlesJSON(
     {
@@ -59,15 +82,26 @@ exports.index = errorCatcher(async (req, res) => {
 
 exports.show = errorCatcher(async (req, res) => {
   const {user} = req;
-  const {app: {locals: {services: {articles}}}, locals: {article} = {}} = res;
+  const {
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
+    locals: {article} = {},
+  } = res;
 
   res.json({article: await articles.toJSON(article, user)});
 });
 
 exports.update = errorCatcher(async (req, res) => {
   const {body: {article: payload} = {}, user} = req;
   const {
-    app: {locals: {services: {articles}}},
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
     locals: {article, trx} = {},
   } = res;
 

lib/comments/controller.js

@@ -4,7 +4,14 @@ const errorCatcher = require('async-error-catcher').default;
 
 exports.index = errorCatcher(async (req, res) => {
   const {user} = req;
-  const {app: {locals: {services: {articles}}}, locals: {article} = {}} = res;
+  const {
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
+    locals: {article} = {},
+  } = res;
 
   const commentsJSON = await articles.getCommentsJSON(article, user);
 
@@ -14,7 +21,11 @@ exports.index = errorCatcher(async (req, res) => {
 exports.create = errorCatcher(async (req, res) => {
   const {body: {comment: {body: commentBody} = {}} = {}, user} = req;
   const {
-    app: {locals: {services: {comments}}},
+    app: {
+      locals: {
+        services: {comments},
+      },
+    },
     locals: {article, trx} = {},
   } = res;
 
@@ -33,7 +44,11 @@ exports.create = errorCatcher(async (req, res) => {
 
 exports.del = errorCatcher(async (req, res) => {
   const {
-    app: {locals: {services: {comments}}},
+    app: {
+      locals: {
+        services: {comments},
+      },
+    },
     locals: {comment, trx} = {},
   } = res;
 

lib/favorites/controller.js

@@ -5,7 +5,11 @@ const errorCatcher = require('async-error-catcher').default;
 exports.favorite = errorCatcher(async (req, res) => {
   const {user} = req;
   const {
-    app: {locals: {services: {articles, favorites}}},
+    app: {
+      locals: {
+        services: {articles, favorites},
+      },
+    },
     locals: {article, trx} = {},
   } = res;
 
@@ -17,7 +21,11 @@ exports.favorite = errorCatcher(async (req, res) => {
 exports.unfavorite = errorCatcher(async (req, res) => {
   const {user} = req;
   const {
-    app: {locals: {services: {articles, favorites}}},
+    app: {
+      locals: {
+        services: {articles, favorites},
+      },
+    },
     locals: {article, trx} = {},
   } = res;
 

lib/followers/controller.js

@@ -5,7 +5,11 @@ const errorCatcher = require('async-error-catcher').default;
 exports.create = errorCatcher(async (req, res) => {
   const {user: authenticatedUser} = req;
   const {
-    app: {locals: {services: {followers, users}}},
+    app: {
+      locals: {
+        services: {followers, users},
+      },
+    },
     locals: {trx, user: userToFollow} = {},
   } = res;
 
@@ -31,7 +35,11 @@ exports.create = errorCatcher(async (req, res) => {
 exports.del = errorCatcher(async (req, res) => {
   const {user: authenticatedUser} = req;
   const {
-    app: {locals: {services: {followers, users}}},
+    app: {
+      locals: {
+        services: {followers, users},
+      },
+    },
     locals: {trx, user: userToUnfollow} = {},
   } = res;
 

lib/initializers/03-model-registry.js

@@ -29,7 +29,11 @@ module.exports = app => {
     value => value.Model,
     requireDirectory(module, path.join(__dirname, '..'), {
       include: /\/model\.js$/,
-      rename: compose(upperFirst, camelCase, replace(/s\b/g, '')),
+      rename: compose(
+        upperFirst,
+        camelCase,
+        replace(/s\b/g, ''),
+      ),
       visit: fn => fn(app.locals.bookshelf),
     }),
   );

lib/initializers/05-passport-local.js

@@ -15,7 +15,7 @@ module.exports = app => {
         let user;
         try {
           user = await app.locals.services.users.fetch({email});
-          if (!await user.isValidPassword(password, user)) {
+          if (!(await user.isValidPassword(password, user))) {
             return done(Boom.badData('', {password: ['is invalid']}));
           }
         } catch (error) {

lib/middleware/handle-comment-id.js

@@ -7,7 +7,9 @@ module.exports = errorCatcher(async (req, res, next) => {
     app: {locals: {services: {comments}} = {}} = {},
     params: {commentId} = {},
   } = req;
-  const {locals: {trx}} = res;
+  const {
+    locals: {trx},
+  } = res;
 
   const comment = await comments.fetch({id: commentId}, {trx});
   res.locals.comment = comment;

lib/middleware/handle-slug.js

@@ -3,8 +3,17 @@
 const errorCatcher = require('async-error-catcher').default;
 
 module.exports = errorCatcher(async (req, res, next) => {
-  const {app: {locals: {services: {articles}}}, params: {slug} = {}} = req;
-  const {locals: {trx}} = res;
+  const {
+    app: {
+      locals: {
+        services: {articles},
+      },
+    },
+    params: {slug} = {},
+  } = req;
+  const {
+    locals: {trx},
+  } = res;
 
   const article = await articles.fetch({slug}, {trx});
   res.locals.article = article;

lib/middleware/handle-username.js

@@ -3,8 +3,17 @@
 const errorCatcher = require('async-error-catcher').default;
 
 module.exports = errorCatcher(async (req, res, next) => {
-  const {app: {locals: {services: {users}}}, params: {username} = {}} = req;
-  const {locals: {trx}} = res;
+  const {
+    app: {
+      locals: {
+        services: {users},
+      },
+    },
+    params: {username} = {},
+  } = req;
+  const {
+    locals: {trx},
+  } = res;
 
   const user = await users.fetch({username}, {trx});
   res.locals.user = user;

lib/middleware/jwt-auth.js

@@ -9,7 +9,14 @@ const callback = (req, res, next) => async (
   {userId} = {},
   info = {},
 ) => {
-  const {app: {locals: {services: {users}}}, locals: {trx}} = res;
+  const {
+    app: {
+      locals: {
+        services: {users},
+      },
+    },
+    locals: {trx},
+  } = res;
 
   if (error) {
     return next(error);

lib/middleware/rollback-transaction.js

@@ -3,7 +3,9 @@
 const errorCatcher = require('async-error-catcher').default;
 
 const rollbackTransaction = errorCatcher(async (err, req, res, next) => {
-  const {locals: {trx}} = res;
+  const {
+    locals: {trx},
+  } = res;
 
   // `rollback` requires an error to reject the promise with.
   if (trx) {

lib/profiles/controller.js

@@ -4,7 +4,14 @@ const errorCatcher = require('async-error-catcher').default;
 
 exports.get = errorCatcher(async (req, res) => {
   const {user: authenticatedUser} = req;
-  const {app: {locals: {services: {users}}}, locals: {user} = {}} = res;
+  const {
+    app: {
+      locals: {
+        services: {users},
+      },
+    },
+    locals: {user} = {},
+  } = res;
 
   res.json({profile: await users.getProfileJSON(user, authenticatedUser)});
 });

lib/tags/controller.js

@@ -3,7 +3,13 @@
 const errorCatcher = require('async-error-catcher').default;
 
 exports.index = errorCatcher(async (req, res) => {
-  const {app: {locals: {services: {tags}}}} = res;
+  const {
+    app: {
+      locals: {
+        services: {tags},
+      },
+    },
+  } = res;
 
   const allTags = await tags.index();
 

lib/users/controller.js

@@ -2,11 +2,17 @@
 
 const ExtractJwt = require('passport-jwt').ExtractJwt;
 const errorCatcher = require('async-error-catcher').default;
-const {isUndefined} = require('lodash/fp');
 
 exports.create = errorCatcher(async (req, res) => {
   const {body: {user: {email, password, username} = {}} = {}} = req;
-  const {app: {locals: {services: {users}}}, locals: {trx}} = res;
+  const {
+    app: {
+      locals: {
+        services: {users},
+      },
+    },
+    locals: {trx},
+  } = res;
 
   const user = await users.create(
     {
@@ -24,14 +30,26 @@ exports.create = errorCatcher(async (req, res) => {
 
 exports.login = (req, res) => {
   const {user} = req;
-  const {app: {locals: {services: {users}}}} = res;
+  const {
+    app: {
+      locals: {
+        services: {users},
+      },
+    },
+  } = res;
 
   res.json({user: users.getAuthJSON(user)});
 };
 
 exports.get = errorCatcher(async (req, res) => {
   const {user} = req;
-  const {app: {locals: {services: {users}}}} = res;
+  const {
+    app: {
+      locals: {
+        services: {users},
+      },
+    },
+  } = res;
 
   const token = ExtractJwt.fromAuthHeaderWithScheme('Token')(req);
 
@@ -42,7 +60,14 @@ exports.get = errorCatcher(async (req, res) => {
 
 exports.update = errorCatcher(async (req, res) => {
   const {body: {user: payload} = {}, user} = req;
-  const {app: {locals: {services: {users}}}, locals: {trx}} = res;
+  const {
+    app: {
+      locals: {
+        services: {users},
+      },
+    },
+    locals: {trx},
+  } = res;
 
   const token = ExtractJwt.fromAuthHeaderWithScheme('Token')(req);
   const updatedUser = await users.update(user, payload, {trx});