From 0bf7b0764bc49fdd40e775f4a5ee6bfac056bc79 Mon Sep 17 00:00:00 2001
From: madelinegr <laura_wilson@brown.edu>
Date: Mon, 18 Feb 2019 20:31:57 -0500
Subject: merged with server

---
 src/server/authentication/config/passport.ts  |  2 +-
 src/server/authentication/controllers/user.ts |  2 ++
 src/server/index.ts                           | 15 ++++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/authentication/config/passport.ts b/src/server/authentication/config/passport.ts
index 05f6c3133..9f1303135 100644
--- a/src/server/authentication/config/passport.ts
+++ b/src/server/authentication/config/passport.ts
@@ -18,7 +18,7 @@ passport.deserializeUser<any, any>((id, done) => {
 });
 
 // AUTHENTICATE JUST WITH EMAIL AND PASSWORD
-passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, done) => {
+passport.use(new LocalStrategy({ usernameField: 'email', passReqToCallback: true }, (req, email, password, done) => {
     User.findOne({ email: email.toLowerCase() }, (error: any, user: any) => {
         if (error) return done(error);
         if (!user) return done(undefined, false, { message: "Invalid email or password" }) // invalid email
diff --git a/src/server/authentication/controllers/user.ts b/src/server/authentication/controllers/user.ts
index 03ebbe0d4..c75eaab3c 100644
--- a/src/server/authentication/controllers/user.ts
+++ b/src/server/authentication/controllers/user.ts
@@ -31,6 +31,8 @@ export let postSignup = (req: Request, res: Response, next: NextFunction) => {
     req.assert("confirmPassword", "Passwords do not match").equals(req.body.password);
     req.sanitize("email").normalizeEmail({ gmail_remove_dots: false });
 
+    req.flash("Working on something!!!");
+
     const errors = req.validationErrors();
 
     if (errors) {
diff --git a/src/server/index.ts b/src/server/index.ts
index d05e1fca6..3b8659d0e 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -24,8 +24,10 @@ const port = 1050; // default port to listen
 const serverPort = 1234;
 import * as expressValidator from 'express-validator';
 import expressFlash = require('express-flash');
+import flash = require('express-flash');
 import * as bodyParser from 'body-parser';
 import * as session from 'express-session';
+import * as cookieParser from 'cookie-parser';
 import c = require("crypto");
 const MongoStore = require('connect-mongo')(session);
 const mongoose = require('mongoose');
@@ -44,18 +46,21 @@ mongoose.connection.on('connected', function () {
     console.log("connected");
 })
 
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
-app.use(expressValidator());
-app.use(expressFlash());
-app.use(require('express-session')({
+app.use(cookieParser("secret"));
+app.use(session({
     secret: `${c.randomBytes(64)}`,
     resave: true,
+    cookie: { maxAge: 60000 },
     saveUninitialized: true,
     store: new MongoStore({
         url: 'mongodb://localhost:27017/Dash'
     })
 }));
+app.use(flash());
+app.use(expressFlash());
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: true }));
+app.use(expressValidator());
 app.use(passport.initialize());
 app.use(passport.session());
 app.use((req, res, next) => {
-- 
cgit v1.2.3-70-g09d2