login and signup almost complete

Author: andrewjcho84

package.json

@@ -123,6 +123,7 @@
     "autoprefixer": "^9.0.1",
     "babel-polyfill": "^6.26.0",
     "bcryptjs": "^2.4.3",
+    "body-parser": "^1.19.0",
     "classnames": "^2.2.6",
     "cli-spinner": "^0.2.8",
     "commander": "^2.17.1",

server/controllers/cookieController.js

@@ -5,12 +5,16 @@ const cookieController = {};
 cookieController.setCookie = (req, res, next) => {
   // set cookie with key of 'secret' and value of a random number between 0 and 1000
   res.cookie('secret', Math.floor(Math.random() * 1000));
+  console.log('Successful setCookie');
   return next();
 };
 
 // setSSIDCookie - store the user id from database in cookie
 cookieController.setSSIDCookie = (req, res, next) => {
   // set cookie with key 'ssid' and value to user's id, also set http only
   res.cookie('ssid', res.locals.id, { httpOnly: true });
+  console.log('Successful setSSIDCookie');
   return next();
 };
+
+module.exports = cookieController;

server/controllers/sessionController.js

@@ -1,41 +1,43 @@
-const Session = require('../models/sessionModel')
+const Session = require('../models/sessionModel');
 const sessionController = {};
 
 // isLoggedIn finds appropriate session for this request in database, then verifies whether or not the session is still valid
 sessionController.isLoggedIn = (req, res, next) => {
   // find cookie with current user's ssid value
-  Session.findOne({cookieId: req.cookies.ssid}, (err, session) => {
-  if (err) {
-    return next({
-      log: `Error in sessionController.isLoggedIn: ${err}`,
-      message: {
-        err: `Error in sessionController.isLoggedIn, check server logs for details`
-      }
-    })
-    // no session found, redirect to signup page
-  } else if (!session) {
-    return res.redirect('/signup')
-  } else {
-    // session found, move onto next middleware
-    return next();
-  }
-})
-}
+  Session.findOne({ cookieId: req.cookies.ssid }, (err, session) => {
+    if (err) {
+      return next({
+        log: `Error in sessionController.isLoggedIn: ${err}`,
+        message: {
+          err: `Error in sessionController.isLoggedIn, check server logs for details`
+        }
+      });
+      // no session found, redirect to signup page
+    } else if (!session) {
+      return res.redirect('/signup');
+    } else {
+      // session found, move onto next middleware
+      return next();
+    }
+  });
+};
 
 // startSession - create and save a new session into the database
 sessionController.startSession = (req, res, next) => {
   // if valid user logged in/signed up, res.locals.id should be user's id generated from mongodb
-  Session.create({cookieId: res.locals.id}, (err) => {
+  console.log('Inside startSession');
+  Session.create({ cookieId: res.locals.id }, err => {
     if (err) {
       return next({
         log: `Error in sessionController.startSession: ${err}`,
         message: {
           err: `Error in sessionController.startSession, check server logs for details`
         }
-      })
+      });
     }
+    console.log('Successful startSession');
     return next();
-  })
-}
+  });
+};
 
-module.exports = sessionController;
+module.exports = sessionController;

server/controllers/userController.js

@@ -6,7 +6,7 @@ const userController = {};
 const bcrypt = require('bcryptjs');
 
 userController.createUser = (req, res, next) => {
-  console.log('Inside createUser')
+  console.log('Inside createUser');
   const { username, password } = req.body;
   // error handling if username or password is missing
   if (!username || !password) {
@@ -24,6 +24,7 @@ userController.createUser = (req, res, next) => {
       });
     } else {
       // this id property will be used in other middleware for cookie
+      console.log('Successfule createUser');
       res.locals.id = newUser.id;
       return next();
     }
@@ -34,6 +35,7 @@ userController.createUser = (req, res, next) => {
 // the appropriate user in the database, and then authenticate the submitted password against the password stored in the database.
 
 userController.verifyUser = (req, res, next) => {
+  console.log('Inside verifyUser');
   const { username, password } = req.body;
   Users.findOne({ username }, (err, user) => {
     if (err) {
@@ -48,11 +50,12 @@ userController.verifyUser = (req, res, next) => {
       bcrypt.compare(password, user.password).then(isMatch => {
         if (isMatch) {
           // if password matches, save user id for following middleware
+          console.log('Successful verifyUser');
           res.locals.id = user.id;
           return next();
         } else {
           // if password does not match, redirect to ?
-          res.redirect('/login');
+          return res.redirect('/login');
         }
       });
     }

server/server.js

@@ -1,9 +1,10 @@
 const express = require('express');
-const mongoose = require('mongoose')
+const mongoose = require('mongoose');
 const path = require('path');
 const cookieParser = require('cookie-parser');
-const userController = require('./controllers/userController')
-const cookieController = require('./controllers/cookieController')
+const userController = require('./controllers/userController');
+const cookieController = require('./controllers/cookieController');
+const sessionController = require('./controllers/sessionController');
 const app = express();
 const PORT = 8080;
 
@@ -28,17 +29,29 @@ app.use(cookieParser());
 // statically serve everything in build folder
 app.use('/build', express.static(path.resolve(__dirname, '../build')));
 
-// app.get('/', cookieController.setCookie, (req, res) => {
-//   res.status(200).sendFile('../build/index.html');
-// })
+app.get('/', cookieController.setCookie, (req, res) => {
+  res.status(200).sendFile(path.resolve(__dirname, '../src/public/index.html'));
+});
 
-app.post('/signup', userController.createUser, (req, res) => {
-  return res.status(200).json(res.locals.newUser)
-})
+app.post(
+  '/signup',
+  userController.createUser,
+  cookieController.setSSIDCookie,
+  sessionController.startSession,
+  (req, res) => {
+    return res.status(200).json(res.locals.newUser);
+  }
+);
 
-app.post('/login', userController.verifyUser, (req, res) => {
-  return res.status(200).json(res.locals.id)
-})
+app.post(
+  '/login',
+  userController.verifyUser,
+  cookieController.setSSIDCookie,
+  sessionController.startSession,
+  (req, res) => {
+    return res.status(200).json(res.locals.id);
+  }
+);
 
 // catch-all route handler
 app.use('*', (req, res) => {