From 107d6ad8cfeead5bafe90f2005fe341c849f36df Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Fri, 22 Jul 2016 21:37:34 -0400
Subject: Changed session storage to mongo

---
 app.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'app.js')

diff --git a/app.js b/app.js
index 9e96a9f..9ffab8d 100644
--- a/app.js
+++ b/app.js
@@ -11,6 +11,8 @@ var session = require('express-session');
 var passport = require('passport');
 var flash = require('connect-flash');
 
+var mongoStore = require('connect-mongo') (session); //for storing sessions in database
+
 var routes = require('./routes/index');
 var userRoutes = require('./routes/user');
 var adminRoutes = require('./routes/admin');
@@ -31,7 +33,13 @@ app.use(bodyParser.urlencoded({extended: true}));
 app.use(expressValidator());
 app.use(cookieParser());
 // session is stored in memory, change to storage in mongo later
-app.use(session({secret: 'pickBetterLater', resave: false, saveUninitialized: false}));
+app.use(session({
+    secret: 'pickBetterLater',
+    resave: false,
+    saveUninitialized: false,
+    store: new mongoStore({db : dbFile.mongodb}),
+    cookie: {maxAge: 120 * 60 * 1000} // in milliseconds - 120 mins, expires after this amount of time
+}));
 app.use(flash());
 app.use(passport.initialize());
 app.use(passport.session());
@@ -45,6 +53,7 @@ app.use(express.static(__dirname));
 // Gives errors for admin - need to figure out
 app.use(function(req, res, next) {
     res.locals.login = req.isAuthenticated(); // global variable
+    res.locals.session = req.session;
     next();
 });
 
-- 
cgit v1.2.3


From 5240b6ff1bd881b482caba3dc3c1b30597fb1353 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Fri, 22 Jul 2016 22:12:02 -0400
Subject: Fixed session storage. Fixed optional phone number in signup

---
 app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app.js')

diff --git a/app.js b/app.js
index 9ffab8d..7421fcf 100644
--- a/app.js
+++ b/app.js
@@ -11,7 +11,7 @@ var session = require('express-session');
 var passport = require('passport');
 var flash = require('connect-flash');
 
-var mongoStore = require('connect-mongo') (session); //for storing sessions in database
+var MongoStore = require('connect-mongo') (session); //for storing sessions in database
 
 var routes = require('./routes/index');
 var userRoutes = require('./routes/user');
@@ -37,7 +37,7 @@ app.use(session({
     secret: 'pickBetterLater',
     resave: false,
     saveUninitialized: false,
-    store: new mongoStore({db : dbFile.mongodb}),
+    store: new MongoStore({url : dbFile.uri}),
     cookie: {maxAge: 120 * 60 * 1000} // in milliseconds - 120 mins, expires after this amount of time
 }));
 app.use(flash());
-- 
cgit v1.2.3


From 218b2c014b1ab68ee8289210820d7b6b742bceef Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Fri, 22 Jul 2016 23:58:19 -0400
Subject: Populated user info into user_profile.hbs

---
 app.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app.js')

diff --git a/app.js b/app.js
index 7421fcf..4f398a9 100644
--- a/app.js
+++ b/app.js
@@ -54,6 +54,8 @@ app.use(express.static(__dirname));
 app.use(function(req, res, next) {
     res.locals.login = req.isAuthenticated(); // global variable
     res.locals.session = req.session;
+    res.locals.user = req.user;
+    console.log(res.locals.user);
     next();
 });
 
-- 
cgit v1.2.3