diff --git a/bin/server.js b/bin/server.js index c9b1055..05d715d 100644 --- a/bin/server.js +++ b/bin/server.js @@ -17,8 +17,8 @@ app.keys = [config.session] mongoose.connect(config.database) app.use(convert(logger())) -app.use(convert(bodyParser())) -app.use(convert(session())) +app.use(bodyParser()) +app.use(session()) app.use(errorMiddleware()) app.use(convert(mount('/docs', serve(`${process.cwd()}/docs`)))) diff --git a/config/passport.js b/config/passport.js index de19681..cee8ef9 100644 --- a/config/passport.js +++ b/config/passport.js @@ -1,4 +1,4 @@ -import passport from 'koa-passport'; +import passport from 'koa-passport' import User from '../src/models/users' import { Strategy } from 'passport-local' @@ -10,7 +10,7 @@ passport.deserializeUser(async (id, done) => { try { const user = await User.findById(id, '-password') done(null, user) - } catch(err) { + } catch (err) { done(err) } }) @@ -21,19 +21,19 @@ passport.use('local', new Strategy({ }, async (username, password, done) => { try { const user = await User.findOne({ username }) - if(!user) { return done(null, false) } + if (!user) { return done(null, false) } try { const isMatch = await user.validatePassword(password) - if(!isMatch) { return done(null, false) } + if (!isMatch) { return done(null, false) } done(null, user) - } catch(err) { + } catch (err) { done(err) } - } catch(err) { + } catch (err) { return done(err) } })) diff --git a/index.js b/index.js index 6f34cc9..7930742 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,3 @@ -require("babel-core/register")(); -require("babel-polyfill"); -require('./bin/server.js'); +require('babel-core/register')() +require('babel-polyfill') +require('./bin/server.js') diff --git a/package.json b/package.json index c42e203..492e973 100644 --- a/package.json +++ b/package.json @@ -39,10 +39,10 @@ "glob": "^7.0.0", "jsonwebtoken": "^5.5.4", "koa": "^2.0.0-alpha.3", - "koa-bodyparser": "^2.0.1", + "koa-bodyparser": "^3.0.0", "koa-convert": "^1.2.0", "koa-generic-session": "^1.10.1", - "koa-logger": "^1.3.0", + "koa-logger": "^2.0.0", "koa-mount": "^1.3.0", "koa-passport": "^2.0.1", "koa-router": "^7.0.1", @@ -52,12 +52,12 @@ }, "devDependencies": { "apidoc": "^0.15.1", - "babel-eslint": "^4.1.8", + "babel-eslint": "^6.0.2", "babel-register": "^6.5.1", "chai": "^3.5.0", - "eslint": "^1.10.3", - "eslint-config-airbnb": "^5.0.0", - "eslint-plugin-react": "^3.16.1", + "eslint": "^2.8.0", + "eslint-config-airbnb": "^7.0.0", + "eslint-plugin-react": "^4.3.0", "mocha": "^2.4.5", "nodemon": "^1.8.1", "supertest": "^1.2.0" diff --git a/test/users.spec.js b/test/users.spec.js index 0bbe43e..e6afe7c 100644 --- a/test/users.spec.js +++ b/test/users.spec.js @@ -66,7 +66,7 @@ describe('Users', () => { .get('/users') .set({ Accept: 'application/json', - Authorization: 'Unknown ${token}' + Authorization: `Unknown ${token}` }) .expect(401, done) })