Chore: upgrade dependencies (aichbauer#8)

* Chore: upgrade dependencies

* Chore: missing packages

* Refactor: to new eslint rules and upgrade toJSON from sequelize

Author: aichbauer

api/controllers/UserController.js

@@ -4,8 +4,7 @@ const bcryptService = require('../services/bcrypt.service');
 
 const UserController = () => {
   const register = (req, res) => {
-    console.log(req.body);
-    const body = req.body;
+    const { body } = req;
 
     if (body.password === body.password2) {
       return User
@@ -28,8 +27,7 @@ const UserController = () => {
   };
 
   const login = (req, res) => {
-    const email = req.body.email;
-    const password = req.body.password;
+    const { email, password } = req.body;
 
     if (email && password) {
       User
@@ -59,10 +57,10 @@ const UserController = () => {
   };
 
   const validate = (req, res) => {
-    const tokenToVerify = req.body.token;
+    const { token } = req.body;
 
     authService
-      .verify(tokenToVerify, (err) => {
+      .verify(token, (err) => {
         if (err) {
           return res.status(401).json({ isvalid: false, err: 'Invalid Token!' });
         }

api/models/User.js

@@ -9,16 +9,6 @@ const hooks = {
   },
 };
 
-const instanceMethods = {
-  toJSON() {
-    const values = Object.assign({}, this.get());
-
-    delete values.password;
-
-    return values;
-  },
-};
-
 const tableName = 'users';
 
 const User = sequelize.define('User', {
@@ -29,6 +19,15 @@ const User = sequelize.define('User', {
   password: {
     type: Sequelize.STRING,
   },
-}, { hooks, instanceMethods, tableName });
+}, { hooks, tableName });
+
+// eslint-disable-next-line
+User.prototype.toJSON = function () {
+  const values = Object.assign({}, this.get());
+
+  delete values.password;
+
+  return values;
+};
 
 module.exports = User;

api/policies/auth.policy.js

@@ -2,7 +2,7 @@ const JWTService = require('../services/auth.service');
 
 // usually: "Authorization: Bearer [token]" or "token: [token]"
 module.exports = (req, res, next) => {
-  let token;
+  let tokenToVerify;
 
   if (req.header('Authorization')) {
     const parts = req.header('Authorization').split(' ');
@@ -12,21 +12,21 @@ module.exports = (req, res, next) => {
       const credentials = parts[1];
 
       if (/^Bearer$/.test(scheme)) {
-        token = credentials;
+        tokenToVerify = credentials;
       } else {
         return res.status(401).json({ msg: 'Format for Authorization: Bearer [token]' });
       }
     } else {
       return res.status(401).json({ msg: 'Format for Authorization: Bearer [token]' });
     }
   } else if (req.body.token) {
-    token = req.body.token;
+    tokenToVerify = req.body.token;
     delete req.query.token;
   } else {
     return res.status(401).json({ msg: 'No Authorization was found' });
   }
 
-  return JWTService.verify(token, (err, thisToken) => {
+  return JWTService.verify(tokenToVerify, (err, thisToken) => {
     if (err) return res.status(401).json({ err });
     req.token = thisToken;
     return next();

api/services/db.service.js

@@ -42,8 +42,7 @@ const dbService = (environment, migrate) => {
           .then(() => successfulDBStart())
           .catch((err) => errorDBStart(err))
       )
-        .catch((err) => errorDBStart(err)),
-      )
+        .catch((err) => errorDBStart(err)))
   );
 
   const startDev = () => (

config/database.js

@@ -18,7 +18,8 @@ switch (process.env.NODE_ENV) {
           min: 0,
           idle: 10000,
         },
-      });
+      },
+    );
     break;
   case 'testing':
     database = new Sequelize(
@@ -32,7 +33,8 @@ switch (process.env.NODE_ENV) {
           min: 0,
           idle: 10000,
         },
-      });
+      },
+    );
     break;
   default:
     database = new Sequelize(
@@ -47,7 +49,8 @@ switch (process.env.NODE_ENV) {
           idle: 10000,
         },
         storage: path.join(process.cwd(), 'db', 'database.sqlite'),
-      });
+      },
+    );
 }
 
 module.exports = database;

package.json

@@ -44,27 +44,27 @@
     ]
   },
   "dependencies": {
-    "babel-polyfill": "^6.23.0",
     "bcrypt-nodejs": "^0.0.3",
-    "body-parser": "^1.17.2",
-    "cors": "^2.8.3",
-    "express": "^4.15.3",
-    "express-routes-mapper": "^1.0.1",
-    "helmet": "^3.6.1",
-    "jsonwebtoken": "^7.4.1",
-    "nodemon": "^1.11.0",
-    "nyc": "^11.0.1",
-    "sequelize": "^3.30.4",
-    "sqlite3": "^3.1.8",
-    "supertest": "^3.0.0"
+    "body-parser": "^1.18.2",
+    "cors": "^2.8.4",
+    "express": "^4.16.3",
+    "express-routes-mapper": "^1.0.2",
+    "helmet": "^3.12.0",
+    "jsonwebtoken": "^8.2.1",
+    "sequelize": "^4.37.6",
+    "sqlite3": "^4.0.0"
   },
   "devDependencies": {
-    "ava": "^0.19.1",
-    "cross-env": "^5.1.1",
-    "eslint": "^3.19.0",
-    "eslint-config-airbnb-base": "^11.2.0",
-    "eslint-plugin-import": "^2.3.0",
-    "husky": "^0.13.4",
-    "shx": "^0.2.2"
+    "ava": "^0.25.0",
+    "babel-polyfill": "^6.26.0",
+    "cross-env": "^5.1.4",
+    "eslint": "^4.19.1",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-plugin-import": "^2.11.0",
+    "husky": "^0.14.3",
+    "nodemon": "^1.17.3",
+    "nyc": "^11.7.1",
+    "shx": "^0.2.2",
+    "supertest": "^3.0.0"
   }
 }

test/controllers/UserController.test.js

@@ -17,7 +17,7 @@ test.after(() => {
 });
 
 test.serial('User | create', async (t) => {
-  let id;
+  let userId;
 
   await request(api)
     .post('/public/user')
@@ -30,12 +30,12 @@ test.serial('User | create', async (t) => {
     .expect(200)
     .then((res) => {
       t.truthy(res.body.user);
-      id = res.body.user.id;
-      return id;
+      userId = res.body.user.id;
+      return userId;
     });
 
-  await User.findById(id).then((user) => {
-    t.is(user.id, id);
+  await User.findById(userId).then((user) => {
+    t.is(user.id, userId);
     t.is(user.email, '[email protected]');
     return user.destroy();
   });
@@ -67,7 +67,7 @@ test.serial('User | login', async (t) => {
 });
 
 test.serial('User | get all (auth)', async (t) => {
-  let token;
+  let userToken;
   let testUser;
   await User.create({
     email: '[email protected]',
@@ -87,14 +87,14 @@ test.serial('User | get all (auth)', async (t) => {
     .expect(200)
     .then((res) => {
       t.truthy(res.body.token);
-      token = res.body.token;
-      return token;
+      userToken = res.body.token;
+      return userToken;
     });
 
   await request(api)
     .get('/private/users')
     .set('Accept', /json/)
-    .set('Authorization', `Bearer ${token}`)
+    .set('Authorization', `Bearer ${userToken}`)
     .set('Content-Type', 'application/json')
     .expect(200)
     .then((res) => {