Merge pull request #61 from oslabs-beta/cleanup

cleaned  up server-side

Author: jackyuan1

server/app.js

@@ -3,10 +3,8 @@ const path = require('path');
 const cors = require('cors');
 const colors = require('colors');
 
-// Routers
-// sign up for sysadmin to add new users to their account
 const signupRouter = require('./routes/signupRouter');
-// sign up for new sysadmin users
+
 const signupSysAdminRouter = require('./routes/signupSysAdminRouter');
 const loginRouter = require('./routes/loginRouter');
 const adminRouter = require('./routes/adminRouter');
@@ -19,9 +17,9 @@ const settingsRouter = require('./routes/settingsRouter');
 
 const app = express();
 
-app.use(express.json()); // parses the request body
-app.use(express.urlencoded({ extended: true })); // parses urlencoded payloads
-app.use(cors()); // enables ALL cors requests
+app.use(express.json()); 
+app.use(express.urlencoded({ extended: true })); 
+app.use(cors()); 
 
 app.use('/test', (req, res) => {
   res.status(200).json({
@@ -31,30 +29,18 @@ app.use('/test', (req, res) => {
 
 app.use('/settings', settingsRouter);
 app.use('/init', initRouter);
-// sign up for sysadmin to add new users to their account
 app.use('/signup', signupRouter);
-// sign up for new sysadmin users
-// app.use('/signupsysadmin', signupSysAdminRouter);
 app.use('/login', loginRouter);
 app.use('/admin', adminRouter);
 app.use('/account', accountRouter);
 app.use('/api', apiRouter);
 app.use('/db', dbRouter);
 app.use('/logout', logoutRouter);
 
-// Unknown Endpoint Error Handler
 app.use('/', (req, res) => {
-  /*
-    Reads the current URL (explains why electron crashes)
-    const url = new URL(`${req.protocol}://${req.get('host')}${req.originalUrl}`);
-    console.log('current url',url);
-  */
-  // for development purposes, so we don't have to reopen electron everytime
   return res.status(404).redirect('/');
-  // return res.status(404).json('404 Not Found')
 });
 
-// Global Error Handler
 app.get('/', (req, res, next, err) => {
   const defaultErr = {
     log: 'Express error handler caught unknown middleware error',
@@ -66,3 +52,9 @@ app.get('/', (req, res, next, err) => {
 });
 
 module.exports = app;
+
+/*
+    Reads the current URL (explains why electron crashes)
+    const url = new URL(`${req.protocol}://${req.get('host')}${req.originalUrl}`);
+    console.log('current url',url);
+*/

server/controllers/apiController.js

@@ -2,13 +2,12 @@
  * @module API Controller
  * @description Contains middleware that sends emails to user for container issues and signup information
  */
-const nodemailer = require('nodemailer');
-const email = require('../../security/email');
+const nodemailer = require("nodemailer");
+const email = require("../../security/email");
 
 const apiController = {};
 
-// create transporter object
-// make sure these values are filled out in email.js
+// create transporter object to make sure these values are filled out in email.js
 const transporter = nodemailer.createTransport({
   host: email.host,
   port: email.port,
@@ -24,7 +23,7 @@ apiController.sendEmailAlert = (req, res, next) => {
   const { email, containerName, time, date, stopped } = req.body;
   let emailBody;
 
-  if (stopped === 'true') {
+  if (stopped === "true") {
     emailBody = `
       <h2>Alert: ${containerName} has stopped!</h2>
       <h3>Container <b>${containerName}</b> stopped running at <b>${time}</b> on <b>${date}</b>.</h3>
@@ -45,9 +44,9 @@ apiController.sendEmailAlert = (req, res, next) => {
   }
 
   const mailDetails = {
-    from: '[email protected]',
+    from: "[email protected]",
     to: email,
-    subject: 'Docketeer: Container Issue',
+    subject: "Docketeer: Container Issue",
     html: `${emailBody}`,
   };
 
@@ -60,7 +59,7 @@ apiController.sendEmailAlert = (req, res, next) => {
       return next({
         log: `Error in apiController sendEmailAlert: ${err}`,
         message: {
-          err: 'An error occured creating new user in database. See apiController.sendEmailAlert.',
+          err: "An error occured creating new user in database. See apiController.sendEmailAlert.",
         },
       });
     });
@@ -71,9 +70,9 @@ apiController.signupEmail = (req, res, next) => {
   const { email, username, password } = req.body;
 
   const mailDetails = {
-    from: '[email protected]',
+    from: "[email protected]",
     to: email,
-    subject: 'Docketeer: Account Details',
+    subject: "Docketeer: Account Details",
     html: `
       <h1>Welcome to Docketeer</h1>
       <p>We are so excited to have you onboard!</p>
@@ -94,7 +93,7 @@ apiController.signupEmail = (req, res, next) => {
       return next({
         log: `Error in apiController signupEmail: ${err}`,
         message: {
-          err: 'An error occured creating new user in database. See apiController.signupEmail.',
+          err: "An error occured creating new user in database. See apiController.signupEmail.",
         },
       });
     });

server/controllers/bcryptController.js

@@ -2,8 +2,8 @@
  * @module Bcrypt Controller
  * @description Contains middleware that encrypts password before storing in database and compares a user's inputted password to their stored password
  */
-const db = require('../models/cloudModel');
-const bcrypt = require('bcryptjs');
+const db = require("../models/cloudModel");
+const bcrypt = require("bcryptjs");
 
 const bcryptController = {};
 
@@ -12,69 +12,80 @@ bcryptController.hashPassword = (req, res, next) => {
   const { password } = req.body;
   const saltRounds = 10;
 
-  bcrypt.hash(password, saltRounds)
+  bcrypt
+    .hash(password, saltRounds)
     .then((hash) => {
       res.locals.hash = hash;
       return next();
     })
     .catch((err) => {
       return next({
         log: `Error in bcryptController hashPassword: ${err}`,
-        message: { err: 'An error occured creating hash with bcrypt. See bcryptController.hashPassword.' },
+        message: {
+          err: "An error occured creating hash with bcrypt. See bcryptController.hashPassword.",
+        },
       });
     });
 };
 
 // Hash new user password with bCrypt - User updated password
 bcryptController.hashNewPassword = async (req, res, next) => {
-
   // if there is an error property on res.locals, return next(). i.e., incorrect password entered
-  if (Object.prototype.hasOwnProperty.call(res.locals, 'error')){
+  if (Object.prototype.hasOwnProperty.call(res.locals, "error")) {
     return next();
   }
   // else bCrypt the new password and move to next middleware
   const { newPassword } = req.body;
   const saltRounds = 10;
 
-  await bcrypt.hash(newPassword, saltRounds)
+  await bcrypt
+    .hash(newPassword, saltRounds)
     .then((hash) => {
       res.locals.hash = hash;
       return next();
     })
     .catch((err) => {
       return next({
         log: `Error in bcryptController hashNewPassword: ${err}`,
-        message: { err: 'An error occured creating hash with bcrypt. See bcryptController.hashNewPassword.' },
+        message: {
+          err: "An error occured creating hash with bcrypt. See bcryptController.hashNewPassword.",
+        },
       });
     });
 };
 
 /**
  * @description hashes the locals property cookie. Creates a column in the database to store the hashed cookie
  */
-bcryptController.hashCookie = (req, res, next) =>{
+
+bcryptController.hashCookie = (req, res, next) => {
   const { role_id, username } = res.locals.user;
   const saltRounds = 10;
   if (role_id === 1) {
-    bcrypt.hash(res.locals.cookie, saltRounds)
+    bcrypt
+      .hash(res.locals.cookie, saltRounds)
       .then((hash) => {
         res.locals.user.token = hash;
-        db.query('ALTER TABLE users ADD COLUMN IF NOT EXISTS token varchar(250)');
-        db.query('UPDATE users SET token=$1 WHERE username=$2', [res.locals.user.token, username]);
+        db.query(
+          "ALTER TABLE users ADD COLUMN IF NOT EXISTS token varchar(250)"
+        );
+        db.query("UPDATE users SET token=$1 WHERE username=$2", [
+          res.locals.user.token,
+          username,
+        ]);
         return next();
       })
       .catch((err) => {
         return next({
           log: `Error in bcryptController hashCookeis: ${err}`,
-          message: { err: 'An error occured creating hash with bcrypt. See bcryptController.hashCookies.' },
+          message: {
+            err: "An error occured creating hash with bcrypt. See bcryptController.hashCookies.",
+          },
         });
       });
   } else {
     return next();
   }
 };
 
-
-
-
-module.exports = bcryptController;
+module.exports = bcryptController;

server/controllers/cookieController.js

@@ -3,8 +3,6 @@
  * @description Contains middleware that stores the user id in a HTTP-only cookie and sets HTTP-only cookie specifically for admins
  */
 
-
-
 const cookieController = {};
 
 // store the user id in a cookie

server/controllers/userController.js

@@ -93,19 +93,14 @@ userController.verifyUser =  (req, res, next) => {
   const getUser = `SELECT * FROM users WHERE username='${username}';`;
 
   db.query(getUser)
-    .then(async (data) => {
-      // console.log('hello');
-      // console.log(password);
-      // console.log(data.rows[0].password);
-      const match = await bcrypt.compare(password, data.rows[0].password);
-      // console.log(match);
+    .then(async (data) => {  
+      const match = await bcrypt.compare(password, data.rows[0].password); 
       if (data.rows[0] && match) {
         res.locals.user = data.rows[0]; 
         return next();
       } else {
         res.locals.error = 'Incorrect username or password.';
         delete res.locals.user;
-        // return next();
       }
 
     })

server/interfaces/interfaces.ts

@@ -1,9 +1,8 @@
-const app = require('./app');
-const colors = require('colors');
+const app = require("./app");
+const colors = require("colors");
 
 const PORT = process.env.PORT || 3000;
 
-// Open up server on PORT
 app.listen(PORT, () => {
   console.log(`server is listening on port ${PORT}`.green.inverse);
 });