Mongoose version updated and promise stuff refactored

Author: Joe Alves

generated/package.json

@@ -44,7 +44,7 @@
     "lodash": "^3.9.3",
     "mocha-mongoose": "^1.0.3",
     "mongodb": "^1.4.33",
-    "mongoose": "3.8.23",
+    "mongoose": "^4.0.7",
     "nodemon": "^1.3.7",
     "passport": "^0.2.1",
     "passport-facebook": "^1.0.3",

generated/server/app/configure/authentication/facebook.js

@@ -31,10 +31,10 @@ module.exports = function (app) {
 
             }).then(function (userToLogin) {
                 done(null, userToLogin);
-            }).catch(function (err) {
+            }, function (err) {
                 console.error('Error creating user from Facebook authentication', err);
                 done(err);
-            });
+            })
 
     };
 
@@ -48,4 +48,4 @@ module.exports = function (app) {
             res.redirect('/');
         });
 
-};
+};

generated/server/app/configure/authentication/google.js

@@ -32,7 +32,7 @@ module.exports = function (app) {
 
             }).then(function (userToLogin) {
                 done(null, userToLogin);
-            }).catch(function (err) {
+            }, function (err) {
                 console.error('Error creating user from Google authentication', err);
                 done(err);
             });
@@ -54,4 +54,4 @@ module.exports = function (app) {
             res.redirect('/');
         });
 
-};
+};

generated/server/app/configure/authentication/local.js

@@ -3,20 +3,25 @@ var passport = require('passport');
 var _ = require('lodash');
 var LocalStrategy = require('passport-local').Strategy;
 var mongoose = require('mongoose');
-var UserModel = mongoose.model('User');
+var User = mongoose.model('User');
 
 module.exports = function (app) {
 
     // When passport.authenticate('local') is used, this function will receive
     // the email and password to run the actual authentication logic.
     var strategyFn = function (email, password, done) {
-        UserModel.findOne({ email: email }, function (err, user) {
-            if (err) return done(err);
-            // user.correctPassword is a method from our UserModel schema.
-            if (!user || !user.correctPassword(password)) return done(null, false);
-            // Properly authenticated.
-            done(null, user);
-        });
+        User.findOne({ email: email })
+            .then(function (user) {
+                // user.correctPassword is a method from the User schema.
+                if (!user || !user.correctPassword(password)) {
+                    done(null, false);
+                } else {
+                    // Properly authenticated.
+                    done(null, user);
+                }
+            }, function (err) {
+                done(err);
+            });
     };
 
     passport.use(new LocalStrategy({ usernameField: 'email', passwordField: 'password' }, strategyFn));
@@ -29,7 +34,7 @@ module.exports = function (app) {
             if (err) return next(err);
 
             if (!user) {
-                var error = new Error('Invalid login credentials');
+                var error = new Error('Invalid login credentials.');
                 error.status = 401;
                 return next(error);
             }
@@ -38,7 +43,9 @@ module.exports = function (app) {
             req.logIn(user, function (loginErr) {
                 if (loginErr) return next(loginErr);
                 // We respond with a response object that has user with _id and email.
-                res.status(200).send({ user: _.omit(user.toJSON(), ['password', 'salt']) });
+                res.status(200).send({
+                    user: _.omit(user.toJSON(), ['password', 'salt'])
+                });
             });
 
         };
@@ -47,4 +54,4 @@ module.exports = function (app) {
 
     });
 
-};
+};

generated/server/app/configure/authentication/twitter.js

@@ -2,7 +2,6 @@
 
 var passport = require('passport');
 var TwitterStrategy = require('passport-twitter').Strategy;
-var Q = require('q');
 var mongoose = require('mongoose');
 var UserModel = mongoose.model('User');
 
@@ -17,14 +16,14 @@ module.exports = function (app) {
     };
 
     var createNewUser = function (token, tokenSecret, profile) {
-            return UserModel.create({
-                twitter: {
-                    id: profile.id,
-                    username: profile.username,
-                    token: token,
-                    tokenSecret: tokenSecret
-                }
-            });
+        return UserModel.create({
+            twitter: {
+                id: profile.id,
+                username: profile.username,
+                token: token,
+                tokenSecret: tokenSecret
+            }
+        });
     };
 
     var updateUserCredentials = function (user, token, tokenSecret, profile) {
@@ -33,17 +32,13 @@ module.exports = function (app) {
         user.twitter.tokenSecret = tokenSecret;
         user.twitter.username = profile.username;
 
-        return new Q(function (resolve, reject) {
-            user.save(function (err) {
-                if (err) return reject(err);
-                resolve(user);
-            });
-        });
+        return user.save();
+
     };
 
     var verifyCallback = function (token, tokenSecret, profile, done) {
 
-        UserModel.findOne({ 'twitter.id': profile.id }).exec()
+        UserModel.findOne({'twitter.id': profile.id}).exec()
             .then(function (user) {
                 if (user) { // If a user with this twitter id already exists.
                     return updateUserCredentials(user, token, tokenSecret, profile);
@@ -52,7 +47,7 @@ module.exports = function (app) {
                 }
             }).then(function (user) {
                 done(null, user);
-            }).catch(function (err) {
+            }, function (err) {
                 console.error('Error creating user from Twitter authentication', err);
                 done(err);
             });
@@ -64,9 +59,9 @@ module.exports = function (app) {
     app.get('/auth/twitter', passport.authenticate('twitter'));
 
     app.get('/auth/twitter/callback',
-            passport.authenticate('twitter', { failureRedirect: '/login' }),
-            function (req, res) {
-                res.redirect('/');
-            });
+        passport.authenticate('twitter', {failureRedirect: '/login'}),
+        function (req, res) {
+            res.redirect('/');
+        });
 
-};
+};