Reverted jsonwebtoken to fix minor auth issues

Author: jackcook

app.js

@@ -46,4 +46,3 @@ require('./app/server/routes')(app);
 // listen (start app with node server.js) ======================================
 app.listen(port);
 console.log("App listening on port " + port);
-

app/server/controllers/UserController.js

@@ -255,7 +255,7 @@ UserController.getPage = function(query, callback){
  * @param  {Function} callback args(err, user)
  */
 UserController.getById = function (id, callback){
-  User.findById(id, callback);
+  User.findById(id).exec(callback);
 };
 
 /**
@@ -324,7 +324,7 @@ UserController.updateProfileById = function (id, profile, callback){
  */
 UserController.updateConfirmationById = function (id, confirmation, callback){
 
-  User.findById(id, function(err, user){
+  User.findById(id).exec(function(err, user){
 
     if(err || !user){
       return callback(err);
@@ -412,7 +412,7 @@ UserController.verifyByToken = function(token, callback){
  * @param  {Function} callback args(err, users)
  */
 UserController.getTeammates = function(id, callback){
-  User.findById(id, function(err, user){
+  User.findById(id).exec(function(err, user){
     if (err || !user){
       return callback(err, user);
     }

app/server/models/User.js

@@ -281,7 +281,7 @@ schema.statics.generateHash = function(password) {
  * @param  {Function} cb    args(err, email)
  */
 schema.statics.verifyEmailVerificationToken = function(token, callback){
-  jwt.verify(token, JWT_SECRET, function(err, email){
+  jwt.verify(token, JWT_SECRET, function(err, email) {
     return callback(err, email);
   });
 };