Mongoose now uses bluebird promises; implemented .catch where previously unavailable; couple random things to quiet the linter

Author: Joe Alves

generated/seed.js

@@ -21,7 +21,14 @@ var mongoose = require('mongoose');
 var Promise = require('bluebird');
 var chalk = require('chalk');
 var connectToDb = require('./server/db');
-var User = Promise.promisifyAll(mongoose.model('User'));
+var User = mongoose.model('User');
+
+var wipeCollections = function () {
+    var removeUsers = User.remove({});
+    return Promise.all([
+        removeUsers
+    ]);
+};
 
 var seedUsers = function () {
 
@@ -36,23 +43,22 @@ var seedUsers = function () {
         }
     ];
 
-    return User.createAsync(users);
+    return User.create(users);
 
 };
 
-connectToDb.then(function () {
-    User.findAsync({}).then(function (users) {
-        if (users.length === 0) {
-            return seedUsers();
-        } else {
-            console.log(chalk.magenta('Seems to already be user data, exiting!'));
-            process.kill(0);
-        }
-    }).then(function () {
+connectToDb
+    .then(function () {
+        return wipeCollections();
+    })
+    .then(function () {
+        return seedUsers();
+    })
+    .then(function () {
         console.log(chalk.green('Seed successful!'));
         process.kill(0);
-    }).catch(function (err) {
+    })
+    .catch(function (err) {
         console.error(err);
         process.kill(1);
     });
-});

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

@@ -29,9 +29,11 @@ module.exports = function (app) {
                     });
                 }
 
-            }).then(function (userToLogin) {
+            })
+            .then(function (userToLogin) {
                 done(null, userToLogin);
-            }, function (err) {
+            })
+            .catch(function (err) {
                 console.error('Error creating user from Facebook authentication', err);
                 done(err);
             })

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

@@ -30,9 +30,11 @@ module.exports = function (app) {
                     });
                 }
 
-            }).then(function (userToLogin) {
+            })
+            .then(function (userToLogin) {
                 done(null, userToLogin);
-            }, function (err) {
+            })
+            .catch(function (err) {
                 console.error('Error creating user from Google authentication', err);
                 done(err);
             });

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

@@ -1,7 +1,6 @@
 'use strict';
 var session = require('express-session');
 var MongoStore = require('connect-mongo')(session);
-var _ = require('lodash');
 var passport = require('passport');
 var path = require('path');
 var mongoose = require('mongoose');
@@ -64,4 +63,4 @@ module.exports = function (app) {
         require(path.join(__dirname, strategyName))(app);
     });
 
-};
+};

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

@@ -1,6 +1,5 @@
 'use strict';
 var passport = require('passport');
-var _ = require('lodash');
 var LocalStrategy = require('passport-local').Strategy;
 var mongoose = require('mongoose');
 var User = mongoose.model('User');
@@ -19,9 +18,8 @@ module.exports = function (app) {
                     // Properly authenticated.
                     done(null, user);
                 }
-            }, function (err) {
-                done(err);
-            });
+            })
+            .catch(done);
     };
 
     passport.use(new LocalStrategy({ usernameField: 'email', passwordField: 'password' }, strategyFn));

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

@@ -45,9 +45,11 @@ module.exports = function (app) {
                 } else { // If this twitter id has never been seen before and no user is attached.
                     return createNewUser(token, tokenSecret, profile);
                 }
-            }).then(function (user) {
+            })
+            .then(function (user) {
                 done(null, user);
-            }, function (err) {
+            })
+            .catch(function (err) {
                 console.error('Error creating user from Twitter authentication', err);
                 done(err);
             });

generated/server/db/index.js

@@ -8,6 +8,9 @@ var DATABASE_URI = require(path.join(__dirname, '../env')).DATABASE_URI;
 var mongoose = require('mongoose');
 var db = mongoose.connect(DATABASE_URI).connection;
 
+// Promises returned from mongoose queries/operations are BLUEBIRD promises
+mongoose.Promise = Promise;
+
 // Require our models -- these should register the model into mongoose
 // so the rest of the application can simply call mongoose.model('User')
 // anywhere the User model needs to be used.

generated/server/db/models/user.js

@@ -28,7 +28,7 @@ var schema = new mongoose.Schema({
 });
 
 // method to remove sensitive information from user objects before sending them out
-schema.methods.sanitize =  function () {
+schema.methods.sanitize = function () {
     return _.omit(this.toJSON(), ['password', 'salt']);
 };
 
@@ -63,4 +63,4 @@ schema.method('correctPassword', function (candidatePassword) {
     return encryptPassword(candidatePassword, this.salt) === this.password;
 });
 
-mongoose.model('User', schema);
+mongoose.model('User', schema);