diff options
| author | HumairAK <humair88@hotmail.com> | 2016-07-22 04:59:42 +0000 |
|---|---|---|
| committer | HumairAK <humair88@hotmail.com> | 2016-07-22 04:59:42 +0000 |
| commit | dcde34904acf5722a19559bb06052061723c2110 (patch) | |
| tree | 3d8b471b9e39d3f8ce6318294b75eef35932d576 /node_simple.js | |
| parent | 05368e45b7d06bb6833577194de62dea7787ef9e (diff) | |
| parent | bfd3ed8dff51c70ab3a18bee286a1e4c01c95cbc (diff) | |
resolved conflict
Diffstat (limited to 'node_simple.js')
| -rw-r--r-- | node_simple.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/node_simple.js b/node_simple.js index 26e8811..4c290f5 100644 --- a/node_simple.js +++ b/node_simple.js @@ -112,7 +112,7 @@ 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) { + exports.find_user( fields[0] ,callbackUser, function (result, callbackUser) { console.log("inside find_user"); if (result == false) { console.log("no such user found"); @@ -132,19 +132,19 @@ exports.add_user = function (fields, callbackUser) { users.insertOne( user_data, function (err) { if (err) callbackUser(false, true, "Unable to add user."); - else { + /*else { console.log("user has been added to users"); callbackUser(true, false, "User has been added."); - } + }*/ }); logins.insertOne( login_data, function (err) { if (err) callbackUser(false, true, "Login has not been added."); - else{ + /*else{ callbackUser(true, false, "Login added."); - } + }*/ }); - + callbackUser(true, false, "User has been added."); db.close(); }) .catch(function (err) { |