Add controllers, update routes, middleware, change circle ci, update test

Author: ddnguyen

index.js

@@ -5,8 +5,6 @@ import helmet from 'helmet';
 import morgan from 'morgan';
 import { join } from 'path';
 import rfs from 'rotating-file-stream';
-import session from 'express-session';
-import errorHandler from 'errorhandler';
 import dotenv from 'dotenv';
 import logger from './src/logger/logger';
 import connectDatabase from './src/configs/db.config';
@@ -16,6 +14,7 @@ dotenv.config();
 
 // configure isProduction variable
 const isProduction = process.env.NODE_ENV === 'production';
+const port = process.env.PORT || 3000;
 
 // defining the Express app
 const app = express();
@@ -38,19 +37,12 @@ const accessLogStream = rfs('access.log', {
 // adding morgan to log HTTP requests
 app.use(morgan('combined', { stream: accessLogStream }));
 
-// configure session
-app.use(session({
-  secret: 'vedgno',
-  cookie: { maxAge: 60000 },
-  resave: false,
-  saveUninitialized: false,
-}));
-
 // connect to mongo
 connectDatabase();
 
 if (!isProduction) {
-  app.use(errorHandler());
+  // eslint-disable-next-line global-require
+  app.use(require('errorhandler')());
 }
 
 app.get('/', (req, res) => {
@@ -92,8 +84,8 @@ app.use((err, req, res) => {
 });
 
 // starting the server
-app.listen(3001, () => {
-  logger.info('listening on port 3001');
+app.listen(port, () => {
+  logger.info(`listening on port ${port}`);
 });
 
 // Export our app for testing purposes

package-lock.json

@@ -12,12 +12,12 @@
     "errorhandler": "^1.5.1",
     "express": "^4.17.1",
     "express-jwt": "^5.3.1",
-    "express-session": "^1.17.0",
     "helmet": "^3.21.1",
     "jsonwebtoken": "^8.5.1",
-    "mongoose": "^5.7.5",
+    "mongoose": "^5.7.13",
     "morgan": "^1.9.1",
     "rotating-file-stream": "^1.4.4",
+    "sinon-test": "^2.4.1",
     "validator": "^12.0.0"
   },
   "devDependencies": {
@@ -46,10 +46,10 @@
   "scripts": {
     "start": "node index.js",
     "start-local": "nodemon --exec babel-node ./index.js",
-    "prod": "node dist/api.bundle.js",
+    "prod": "node dist/api.bundle.js env NODE_ENV=production",
     "build": "webpack",
-    "test": "nyc --reporter=text mocha --require @babel/register ./src/tests/**/*.test.js --exit",
-    "test-debug": "nyc --reporter=text mocha --require @babel/register ./src/tests/**/*.test.js --exit --inspect-brk",
+    "test": "nyc --reporter=text mocha --require @babel/register ./src/tests/**/**/*.test.js --exit",
+    "test-debug": "nyc --reporter=text mocha --require @babel/register ./src/tests/**/**/*.test.js --exit --inspect-brk",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "eslint:win": "eslint.cmd ./",
     "eslint-fix:win": "eslint.cmd ./ --fix",

package.json

@@ -8,6 +8,9 @@ const connectDatabase = () => {
   mongoose
     .connect(`mongodb://${process.env.MONGO_HOST}:${process.env.MONGO_PORT}/${process.env.MONGO_DB}`, {
       useNewUrlParser: true,
+      useUnifiedTopology: true,
+      useCreateIndex: true,
+      useFindAndModify: false,
     })
     .then(() => {
       logger.info('Successfully connected to the database');

src/configs/db.config.js

@@ -0,0 +1,59 @@
+import AuthService from '../services/auth.service';
+
+const AuthController = {};
+
+AuthController.login = async (req, res) => {
+  try {
+    const { email, password } = req.body;
+    const userData = await AuthService.login({
+      email,
+      password,
+    });
+    return res.status(200).json({ status: 200, data: userData, message: 'Succesfully logged in' });
+  } catch (error) {
+    return res.status(400).json({ status: 400, message: error.message });
+  }
+};
+
+AuthController.register = async (req, res) => {
+  try {
+    const { email, fullName, password } = req.body;
+    const userData = await AuthService.register({
+      email,
+      fullName,
+      password,
+    });
+    return res.status(200).json({ status: 200, data: userData, message: 'Succesfully registered' });
+  } catch (error) {
+    return res.status(400).json({ status: 400, message: error.message });
+  }
+};
+
+AuthController.getCurrent = async (req, res) => res
+  .status(200)
+  .json({ status: 200, data: { email: req.user.email, fullName: req.user.fullName } });
+
+AuthController.logout = async (req, res) => {
+  try {
+    AuthService.logout({
+      user: req.user,
+      foundToken: req.token,
+    });
+    res.send();
+  } catch (error) {
+    res.status(500).send(error);
+  }
+};
+
+AuthController.logoutAll = async (req, res) => {
+  try {
+    AuthService.logoutAll({
+      user: req.user,
+    });
+    res.send();
+  } catch (error) {
+    res.status(500).send(error);
+  }
+};
+
+export default AuthController;

src/controllers/auth.controller.js

@@ -0,0 +1,24 @@
+import jwt from 'jsonwebtoken';
+import UserModel from '../models/user.model';
+import logger from '../logger/logger';
+
+/* istanbul ignore next */
+const auth = async (req, res, next) => {
+  const token = req.header('Authorization').replace('Bearer ', '');
+  const data = jwt.verify(token, process.env.JWT_KEY);
+  logger.info(`Verified token: ${token}`);
+  try {
+    // eslint-disable-next-line no-underscore-dangle
+    const user = await UserModel.findOne({ _id: data._id, 'tokens.token': token });
+    if (!user) {
+      throw new Error();
+    }
+    req.user = user;
+    req.token = token;
+    next();
+  } catch (error) {
+    res.status(401).send({ error: 'Not authorized to access this resource' });
+  }
+};
+
+export default auth;

src/middlewares/auth.middleware.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-use-before-define */
+/* eslint-disable no-underscore-dangle */
 import mongoose from 'mongoose';
 import bcrypt from 'bcryptjs';
 import jwt from 'jsonwebtoken';
@@ -56,18 +58,25 @@ UserSchema.pre('save', async function hashPassword(next) {
 UserSchema.methods.generateAuthToken = async function generateAuthToken() {
   // Generate an auth token for the user
   const user = this;
-  // eslint-disable-next-line no-underscore-dangle
   const token = jwt.sign({ _id: user._id }, process.env.JWT_KEY);
-  user.tokens = user.tokens.concat({ token });
-  await user.save();
+  await UserModel.findByIdAndUpdate(user._id, { $set: { tokens: user.tokens.concat({ token }) } });
   return token;
 };
 
+// This hook is already tested, just cannot create an individual tests for it
+/* istanbul ignore next */
+UserSchema.statics.removeAllTokens = async function removeAllTokens(userId) {
+  try {
+    await UserModel.findByIdAndUpdate(userId, { $set: { tokens: [] } });
+  } catch (error) {
+    throw new Error('Removing tokens failed!');
+  }
+};
+
 // This hook is already tested, just cannot create an individual tests for it
 /* istanbul ignore next */
 UserSchema.statics.findByCredentials = async function findByCredentials(email, password) {
   // Search for a user by email and password.
-  // eslint-disable-next-line no-use-before-define
   const user = await UserModel.findOne({ email });
   if (!user) {
     throw new Error('Login failed! Check authentication credentials');