minor fixes

4 files changed, 49 insertions, 18 deletions

diff --git a/config/passport.js b/config/passport.js
index 27f835f..66c134d 100644
--- a/config/passport.js
+++ b/config/passport.js
@@ -7,20 +7,39 @@ var exports = module.exports = {};
 
 var encryptPassword = exports.encryptPassword = function (password) {
     return bcrypt.hashSync(password, bcrypt.genSaltSync(5), null);
-}
+};
 
 var comparePassword = function (password1, password2) {
     return bcrypt.compareSync(password1, password2);
-}
+};
+
 
 passport.serializeUser(function (user, done) {
+    console.log("In serialize User");
+    console.log(user);
     done(null, user);
 });
 
 passport.deserializeUser(function(user, done) {
+    console.log("In de-serialize User: " + user.email);
     done(null, user);
 });
 
+/*
+passport.serializeUser(function (user, done) {
+    console.log("In serialize User");
+    console.log(user);
+    done(null, user._id);
+});
+
+
+passport.deserializeUser(function(id, done) {
+    console.log("In de-serialize User");
+    dbFile.findUserByID(id, function(err, user){
+        done(err, user);
+    });
+});*/
+
 
 
 // fields - [email, user_name, f_name, l_name, uni, department, password, phone_num]
diff --git a/node_simple.js b/node_simple.js
index 74a28db..cb649c2 100644
--- a/node_simple.js
+++ b/node_simple.js
@@ -279,11 +279,11 @@ exports.add_user = function (fields, callbackUser) {
     };
 
     // find out if this user already exists by checking their email
-    exports.find_user( fields[0] ,callbackUser, function (result, callbackUser) {
+    exports.find_user( fields[0], function (result) {
         if  (result == false) {
 
             // find out if the user_name is taken
-            exports.find_user_name( fields[1], callbackUser,  function (docs) {
+            exports.find_user_name( fields[1], function (docs) {
                 if (docs == false) {        // if not ...
                     // continue
                     console.log("user name is valid");
@@ -337,7 +337,7 @@ exports.add_user = function (fields, callbackUser) {
  * This (helper) function returns true IFF user_name already exists in the database
  * Params: user_name - the user name
  * */
-exports.find_user_name = function (user_name, callbackUser, callback) {
+exports.find_user_name = function (user_name, callback) {
     // make a connection
     mongoFactory.getConnection(uri)
         .then(function (db) {
@@ -364,6 +364,7 @@ exports.find_user_name = function (user_name, callbackUser, callback) {
 */
 
 exports.retrieveUser = function (username, callback) {
+
     mongoFactory.getConnection(uri).then(function (db) {
         var users = db.collection('users');
 
@@ -392,7 +393,6 @@ exports.retrieveUser = function (username, callback) {
  */
 
 exports.retrievePassword = function (username, callback) {
-
     mongoFactory.getConnection(uri).then(function (db) {
 
          var collection = db.collection('logins');
@@ -415,7 +415,7 @@ exports.retrievePassword = function (username, callback) {
 /*
  * This (helper) function returns true IFF email already exists in the database
  * */
-exports.find_user = function (email, callbackUser, callback) {
+exports.find_user = function (email, callback) {
     // make a connection
     console.log("inside find_user");
     mongoFactory.getConnection(uri)
@@ -425,10 +425,10 @@ exports.find_user = function (email, callbackUser, callback) {
             logins.find( { email: email } ).toArray(function (err, result) {
                 if (err) throw err;
                 else if (result.length == 0) {  // nothing was found  so this user is new
-                    callback(false, callbackUser);
+                    callback(false);
                 }
                 else {
-                    callback(true, callbackUser);
+                    callback(true);
                 }
             });
             // db.close();
@@ -1024,6 +1024,23 @@ exports.adminExists = function (username, callback) {
 
 
 
+exports.findUserByID = function (id, callback) {
+    // make a connection
+    console.log("inside findUserByID");
+    mongoFactory.getConnection(uri)
+        .then(function (db) {
+            var logins = db.collection('logins');
+            logins.find( { _id : id }, function (err, result) {
+                callback(err, result);
+                db.close();
+            });
+        })
+        .catch(function (err) {
+            console.err(err);
+        })
+};
+
+
 
 
 
diff --git a/routes/index.js b/routes/index.js
index 6d5fdac..961a60d 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -11,7 +11,7 @@ var bcrypt = require('bcrypt-nodejs');
 
 /* Render/GET homepage. */
 router.get('/', function(req, res, next) {
-    addFirstAdmin();
+    //addFirstAdmin();
     res.render('index');
     req.session.errors = null;
     req.session.success = null;
@@ -75,7 +75,6 @@ router.get('/exams/:id', function(req, res, next) {
                 minExamInfoArray.push(minExamInfo);
             }
         }
-        console.log(minExamInfoArray);
         res.render('exams',  {query: req.params.id, result: minExamInfoArray});
     });
 });
@@ -137,9 +136,6 @@ router.get('/questions/:exam_id', function (req,res) {
             };
             res.render('questions', {query: qList, examInfo: examInfo});
         });
-
-
-        console.log(exam);
     });
 
     /*dbFile.get_exam_info_by_ID(examID, function (questions) {
@@ -193,7 +189,6 @@ router.get('/solutions/:exam_id/:q_num', function (req, res) {
             soln.commentCount = soln.comments.length;
         });
         res.render('user_solutions', {query: solutions, examID: examID, qID: qID});
-        console.log(solutions);
     });
 });
 
@@ -204,11 +199,11 @@ router.post('/add_solutions/submit', function (req, res) {
 /**** Helpers ****/
 
 function addFirstAdmin() {
-    console.log("Inside addFirstAdmin()");
+    //console.log("Inside addFirstAdmin()");
     //admin_data = {fname: firstname, lname: lastname, username: username, password: password}
     var password = 'lamptable';
     var hash_pwd = passport_file.encryptPassword(password);
-    console.log("Admin hashed: " + hash_pwd);
+    //console.log("Admin hashed: " + hash_pwd);
     var admin_data = {
         fname: 'Admin',
         lname: 'Admin',
diff --git a/routes/user.js b/routes/user.js
index 6ae0d80..1e5a006 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -91,7 +91,7 @@ router.post('/submit_solution/:examID/:qID', function(req,res){
 
         //Redirect to solutions page again
         res.redirect('/solutions/' + examID + '/' + qID);
-        
+
     });
 
 });