added swagger, fix user auth bug, more linted code, remove lint gulp task

Author: spipley-systango

.eslintignore

@@ -1,4 +1,3 @@
 **/node_modules/**
 **/cert/**
-**/static/**
-**/test/**
+**/static/**

bin/server.js

@@ -17,20 +17,20 @@ const app = new Koa()
 app.keys = [config.session]
 
 // replace these with your certificate information
-const options = {  
-  cert:  fs.readFileSync('./cert/localhost.cert'),
+const options = {
+  cert: fs.readFileSync('./cert/localhost.cert'),
   key: fs.readFileSync('./cert/localhost.key')
 }
 
 // --------------------- start -------------------------
-//Instead of calling convert for all legacy middlewares 
-//just use the following to convert them all at once
+// Instead of calling convert for all legacy middlewares 
+// just use the following to convert them all at once
 
 const _use = app.use
 app.use = x => _use.call(app, convert(x))
 
-//The code above avoids writting the following
-//app.use(convert(logger()))
+// The code above avoids writting the following
+// app.use(convert(logger()))
 // ---------------------- end --------------------------
 
 mongoose.Promise = global.Promise
@@ -42,27 +42,32 @@ app.use(bodyParser())
 app.use(session())
 app.use(errorMiddleware())
 
-//Mount static API documents generated by api-generator
+// Mount static API documents generated by api-generator
 app.use(mount('/docs', serve(`${process.cwd()}/docs`)))
 
-//Using Passport for authentication
+// Using Passport for authentication
 require('../config/passport')
 app.use(passport.initialize())
 app.use(passport.session())
 
-//Using module wise routing
+// Using module wise routing
 const modules = require('../src/modules')
 modules(app)
 
-//Using http2 to work with http/2 instead of http/1.x
-http2  
+// Show swagger only if the NODE_ENV is development
+if (!process.env.NODE_ENV || process.env.NODE_ENV === 'devlopment') {
+  app.use(mount('/swagger', serve(`${process.cwd()}/swagger`)))
+}
+
+// Using http2 to work with http/2 instead of http/1.x
+http2
   .createServer(options, app.callback())
   .listen(config.port, () => {
     console.log(`Server started on ${config.port}`)
-})
+  })
 
-//app.listen(config.port, () => {
-  //console.log(`Server started on ${config.port}`)
-//})
+// app.listen(config.port, () => {
+  // console.log(`Server started on ${config.port}`)
+// })
 
 export default app

config/passport.js

@@ -32,7 +32,6 @@ passport.use('local', new Strategy({
     } catch (err) {
       done(err)
     }
-
   } catch (err) {
     return done(err)
   }

gulpfile.js

@@ -6,7 +6,7 @@ const RequireDir = require('require-dir')
 // Load tasks
 RequireDir('./tasks')
 
-Gulp.task('dev', ['lint', 'dotenv', 'yaml2json', 'nodemon'])
-Gulp.task('prod', ['lint', 'pm2'])
+Gulp.task('dev', ['dotenv', 'yaml2json', 'nodemon'])
+Gulp.task('prod', ['pm2'])
 
 Gulp.task('default', ['dev'])

src/models/users.js

@@ -23,16 +23,16 @@ User.pre('save', function preSave (next) {
       resolve(salt)
     })
   })
-  .then(salt => {
-    bcrypt.hash(user.password, salt, (err, hash) => {
-      if (err) { throw new Error(err) }
+    .then(salt => {
+      bcrypt.hash(user.password, salt, (err, hash) => {
+        if (err) { throw new Error(err) }
 
-      user.password = hash
+        user.password = hash
 
-      next(null)
+        next(null)
+      })
     })
-  })
-  .catch(err => next(err))
+    .catch(err => next(err))
 })
 
 User.methods.validatePassword = function validatePassword (password) {

src/modules/auth/controller.js

@@ -51,8 +51,8 @@ import passport from 'koa-passport'
  */
 
 export async function authUser (ctx, next) {
-  return passport.authenticate('local', (user) => {
-    if (!user) {
+  return passport.authenticate('local', (err, user) => {
+    if (err || !user) {
       ctx.throw(401)
     }
 

src/modules/home/controller.js

@@ -4,4 +4,4 @@ export async function getHome (ctx) {
 
 export async function getLogin (ctx) {
   ctx.body = '<b>The KOACH login page is WIP.</b>'
-}
+}

src/modules/index.js

@@ -21,7 +21,7 @@ exports = module.exports = function initModules (app) {
 
         const lastHandler = handlers.pop()
 
-        instance[method.toLowerCase()](route, ...handlers, async function(ctx) {
+        instance[method.toLowerCase()](route, ...handlers, async function (ctx) {
           await lastHandler(ctx)
         })