Merge pull request #40 from christroutner/linting

fixing dependencies so that prettier linting works in Atom

package.json

@@ -55,11 +55,11 @@
   "devDependencies": {
     "chai": "^4.1.2",
     "coveralls": "^3.0.2",
-    "eslint": "^6.0.0",
+    "eslint": "^5.16.0",
     "eslint-config-promise": "^2.0.0",
-    "eslint-config-standard": "^14.0.0",
+    "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-node": "^9.0.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
     "mocha": "^6.0.0",

src/middleware/validators.js

@@ -103,7 +103,11 @@ async function ensureTargetUserOrAdmin (ctx, next) {
   // console.log(`ctx.state.user: ${JSON.stringify(ctx.state.user, null, 2)}`)
   // Ensure the calling user and the target user are the same.
   if (ctx.state.user._id.toString() !== targetId.toString()) {
-    wlogger.verbose(`Calling user and target user do not match! Calling user: ${ctx.state.user._id}, Target user: ${targetId}`)
+    wlogger.verbose(
+      `Calling user and target user do not match! Calling user: ${
+        ctx.state.user._id
+      }, Target user: ${targetId}`
+    )
 
     // If they don't match, then the calling user better be an admin.
     if (ctx.state.user.type !== 'admin') {

src/models/users.js

@@ -19,13 +19,17 @@ User.pre('save', function preSave (next) {
 
   new Promise((resolve, reject) => {
     bcrypt.genSalt(10, (err, salt) => {
-      if (err) { return reject(err) }
+      if (err) {
+        return reject(err)
+      }
       resolve(salt)
     })
   })
     .then(salt => {
       bcrypt.hash(user.password, salt, (err, hash) => {
-        if (err) { throw new Error(err) }
+        if (err) {
+          throw new Error(err)
+        }
 
         user.password = hash
 
@@ -40,7 +44,9 @@ User.methods.validatePassword = function validatePassword (password) {
 
   return new Promise((resolve, reject) => {
     bcrypt.compare(password, user.password, (err, isMatch) => {
-      if (err) { return reject(err) }
+      if (err) {
+        return reject(err)
+      }
 
       resolve(isMatch)
     })

src/modules/auth/router.js

@@ -9,8 +9,6 @@ module.exports.routes = [
   {
     method: 'POST',
     route: '/',
-    handlers: [
-      auth.authUser
-    ]
+    handlers: [auth.authUser]
   }
 ]

src/modules/users/controller.js

@@ -138,7 +138,9 @@ async function getUser (ctx, next) {
     ctx.throw(500)
   }
 
-  if (next) { return next() }
+  if (next) {
+    return next()
+  }
 }
 
 /**

src/modules/users/router.js

@@ -8,42 +8,26 @@ module.exports.routes = [
   {
     method: 'POST',
     route: '/',
-    handlers: [
-      user.createUser
-    ]
+    handlers: [user.createUser]
   },
   {
     method: 'GET',
     route: '/',
-    handlers: [
-      validator.ensureUser,
-      user.getUsers
-    ]
+    handlers: [validator.ensureUser, user.getUsers]
   },
   {
     method: 'GET',
     route: '/:id',
-    handlers: [
-      validator.ensureUser,
-      user.getUser
-    ]
+    handlers: [validator.ensureUser, user.getUser]
   },
   {
     method: 'PUT',
     route: '/:id',
-    handlers: [
-      validator.ensureTargetUserOrAdmin,
-      user.getUser,
-      user.updateUser
-    ]
+    handlers: [validator.ensureTargetUserOrAdmin, user.getUser, user.updateUser]
   },
   {
     method: 'DELETE',
     route: '/:id',
-    handlers: [
-      validator.ensureTargetUserOrAdmin,
-      user.getUser,
-      user.deleteUser
-    ]
+    handlers: [validator.ensureTargetUserOrAdmin, user.getUser, user.deleteUser]
   }
 ]