From e0da9feb10efd002f6ebaa99870b4317687a4557 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Fri, 22 Jul 2016 01:29:28 -0400
Subject: minor fix

---
 node_simple.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'node_simple.js')

diff --git a/node_simple.js b/node_simple.js
index b2321f2..5c0666b 100644
--- a/node_simple.js
+++ b/node_simple.js
@@ -130,7 +130,6 @@ exports.add_user = function (fields, callbackUser) {
                             var users = db.collection('users');
                             var logins = db.collection('logins');
 
-<<<<<<< HEAD
                             // Add users, and login through callbacks
                             users.insertOne( user_data, function (err) {
                                 if (err) {
-- 
cgit v1.2.3


From 2a7e01b63e58db7ce0ef19210aef9874e022a7c5 Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Fri, 22 Jul 2016 04:18:26 -0400
Subject: Added validation checks for signup

---
 node_simple.js | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'node_simple.js')

diff --git a/node_simple.js b/node_simple.js
index 5c0666b..fa46447 100644
--- a/node_simple.js
+++ b/node_simple.js
@@ -137,7 +137,7 @@ exports.add_user = function (fields, callbackUser) {
                                 }
 
                                 else {// user insert successfull
-                                    logins.insertOne( login_data, function (err) {
+                                    logins.insertOne(login_data, function (err) {
                                         if (err) {
                                             callbackUser(false, true, "Error : User has not been added.");
                                         }
@@ -193,6 +193,34 @@ exports.find_user_name = function (user_name, callbackUser, callback) {
         })
 };
 
+/*
+  Retrieves the user object based on the username.
+*/
+
+exports.retrieveUser = function (username, callback) {
+    mongoFactory.getConnection(uri).then(function (db) {
+        var users = db.collection('users');
+
+        users.find({user_name: username}).toArray(function (err, result) {
+            if (err) {
+                // callback(success, error, user, message)
+                callback(false, true,  null, "Error : Could not retrieve user.");
+            }
+
+            else if (result.length) {
+                callback(true, false, result, "User retrieved");
+            }
+
+            else {
+                callback(false, false, null, "Username is undefined.");
+            }
+
+        });
+    });
+}
+
+
+
 /*
  * This (helper) function returns true IFF email already exists in the database
  * */
-- 
cgit v1.2.3