Add email, first name, last name to sign up. If not logged in and redirected to login page after trying to add a comment or story - get redirected back to new story and new comment after logging in

Author: overZellis133

Diff for: app.js

@@ -6,6 +6,7 @@ var methodOverride       = require("method-override"),
     flash                = require("connect-flash"),
     passport             = require("passport"),
     LocalStrategy        = require("passport-local"),
+    mongooseTypeEmail    = require("mongoose-type-email"),
     Story                = require("./models/story"),
     Comment              = require("./models/comment"),
     User                 = require("./models/user"),

Diff for: middleware/index.js

@@ -54,6 +54,7 @@ middlewareObj.isLoggedIn = function(req, res, next){
     if (req.isAuthenticated()) {
         return next();
     }
+    req.session.redirectTo = req.originalUrl;
     req.flash("error", "You need to be logged in to do that");
     res.redirect("/login");
 }

Diff for: models/user.js

@@ -1,8 +1,12 @@
 var mongoose = require("mongoose");
+// var mongooseTypeEmail = require("mongoose-type-email");
 var passportLocalMongoose = require("passport-local-mongoose");
 
 var userSchema = new mongoose.Schema({
    username: String,
+   firstName: String,
+   lastName: String,
+   email: String,
    password: String,
    stories: [
        {

Diff for: package.json

@@ -18,6 +18,7 @@
     "method-override": "^2.3.9",
     "moment": "^2.18.1",
     "mongoose": "^4.10.8",
+    "mongoose-type-email": "^1.0.5",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
     "passport-local-mongoose": "^4.0.0"

Diff for: routes/index.js

@@ -19,7 +19,13 @@ router.get("/register", function(req, res){
 
 // handle sign up logic
 router.post("/register", function(req, res){
-    var newUser = new User({username: req.body.username});
+    var newUser = new User(
+        {
+            username: req.body.username,
+            firstName: req.body.firstName,
+            lastName: req.body.lastName,
+            email: req.body.email
+        });
     User.register(newUser, req.body.password, function(err, user){
         if (err) {
             req.flash("error", err.message)
@@ -38,17 +44,27 @@ router.get("/login", function(req, res){
    res.render("login", {page: "login"});
 });
 
-router.post("/login", passport.authenticate("local", 
-    {
-        successRedirect: "/stories",
-        failureRedirect: "/login"
-    }), function(req, res){
+router.post("/login", function(req, res, next){
+    passport.authenticate('local', function(err, user, info){
+        if(err){
+            return next(err);
+        } if(!user) {
+            req.flash("error", "Username or password is incorrect.");
+            return res.redirect("/login");
+        }
+        req.logIn(user, function(err){
+            if(err){return next(err);}
+            var redirectTo = req.session.redirectTo ? req.session.redirectTo: "/stories";
+            delete req.session.redirectTo;
+            res.redirect(redirectTo);
+        });
+    })(req,res,next);
 });
 
 // logout route
 router.get("/logout", function(req, res){
    req.logout();
-   req.flash("success", "Logged you out!");
+   req.flash("success", "Logged out");
    res.redirect("/stories");
 });
 

Diff for: views/login.ejs

@@ -5,7 +5,7 @@
         <div class="form-style">
             <form action="/login" method="POST">
                 <div class="form-group">
-                    <input class="form-control" type="text" name="username" placeholder="your name">
+                    <input class="form-control" type="text" name="username" placeholder="username">
                 </div>
                 <div class="form-group">
                     <input class="form-control" type="password" name="password" placeholder="password">

Diff for: views/register.ejs

@@ -5,10 +5,19 @@
         <div class="form-style">
             <form action="/register" method="POST">
                 <div class="form-group">
-                    <input class="form-control" type="text" name="username" placeholder="your name">
+                    <input class="form-control" type="text" name="username" placeholder="username" required>
                 </div>
                 <div class="form-group">
-                    <input class="form-control" type="password" name="password" placeholder="password">
+                    <input class="form-control" type="text" name="firstName" placeholder="first name" required>
+                </div>
+                <div class="form-group">
+                    <input class="form-control" type="text" name="lastName" placeholder="last name" required>
+                </div>
+                <div class="form-group">
+                    <input class="form-control" type="email" name="email" placeholder="email" required>
+                </div>
+                <div class="form-group">
+                    <input class="form-control" type="password" name="password" placeholder="password" required>
                 </div>
                 <div class="form-group">
                     <button class="btn btn-lg btn-primary btn-block">Create Account</button>