delete checkUserToken, add getUserByToken

routes/methods.js

@@ -83,19 +83,22 @@ var methods = {
             callback(err, user);
         });
     },
-    checkUserToken: function(token, callback) {
+    getUserByToken: function(token, callback) {
         var user;
-        dbconn.user.query('SELECT user_id FROM credential WHERE resetPasswordToken = "'+token+'" and resetPasswordExpires > '+Date.now(), function (err, rows, fields) {
-            if (err) {
-                throw err;
-            }
-            else {
-                if ( rows.length > 0) {
-                    user = rows[0];
+        dbconn.user.query('SELECT t1.user_id, t2.email FROM userdb.credential AS t1 INNER JOIN userdb.user AS t2 ON t1.user_id = t2.id AND t1.resetPasswordToken = "'
+            +token+'" and resetPasswordExpires > '+Date.now(), function (err, rows, fields) {
+                if (err) {
+                    throw err;
+                }
+                else {
+                    if ( rows.length > 0) {
+                        user = rows[0]
+                        console.log(user)
+                    }
                 }
+                callback(err, user);
             }
-            callback(err, user);
-        });
+        );
     },
 	updateUser: function(userData, callback) {
 		dbconn.user.query('UPDATE user SET ? WHERE email = "' +userData.email+'"', userData, function (err, rows, fields) {