Merge pull request #1688 from angular-fullstack/feat/update-bluebird

Awk34 · Awk34 · commit 8b04ec4aa34d · 2016-03-07T03:34:30.000-05:00
Bluebird 3.x.x
diff --git a/app/templates/_package.json b/app/templates/_package.json
@@ -18,7 +18,7 @@
     "jade": "^1.11.0",<% } %><% if (filters.html) { %>
     "ejs": "^2.3.3",<% } %><% if (filters.mongoose) { %>
     "mongoose": "^4.1.2",
-    "bluebird": "^2.9.34",
+    "bluebird": "^3.3.3",
     "connect-mongo": "^0.8.1",<% } %><% if (filters.sequelize) { %>
     "sequelize": "^3.5.1",
     "sqlite3": "~3.1.1",
diff --git a/app/templates/e2e/account(auth)/login/login.spec(jasmine).js b/app/templates/e2e/account(auth)/login/login.spec(jasmine).js
@@ -19,20 +19,19 @@ describe('Login View', function() {
   };
 
   beforeEach(function(done) {
-    <% if (filters.mongooseModels) { %>UserModel.removeAsync()<% }
+    <% if (filters.mongooseModels) { %>UserModel.remove()<% }
        if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} })<% } %>
       .then(function() {
-        <% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
-           if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
+        return UserModel.create(testUser)
+          .then(loadPage);
       })
-      .then(loadPage)
+      // .then(loadPage)
       .finally(function() {
         browser.wait(function() {
           //console.log('waiting for angular...');
           return browser.executeScript('return !!window.angular');
 
         }, 5000).then(done);
-
       });
   });
 
diff --git a/app/templates/e2e/account(auth)/login/login.spec(mocha).js b/app/templates/e2e/account(auth)/login/login.spec(mocha).js
@@ -21,17 +21,17 @@ describe('Login View', function() {
 
   before(function() {
     return UserModel
-      <% if (filters.mongooseModels) { %>.removeAsync()<% }
+      <% if (filters.mongooseModels) { %>.remove()<% }
          if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
       .then(function() {
-        <% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
+        <% if (filters.mongooseModels) { %>return UserModel.create(testUser);<% }
            if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
       })
       .then(loadPage);
   });
 
   after(function() {
-    <% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
+    <% if (filters.mongooseModels) { %>return UserModel.remove();<% }
        if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
   });
 
diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js b/app/templates/e2e/account(auth)/logout/logout.spec(jasmine).js
@@ -17,10 +17,10 @@ describe('Logout View', function() {
   };
 
   beforeEach(function(done) {
-    <% if (filters.mongooseModels) { %>UserModel.removeAsync()<% }
+    <% if (filters.mongooseModels) { %>UserModel.remove()<% }
        if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} })<% } %>
       .then(function() {
-        <% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
+        <% if (filters.mongooseModels) { %>return UserModel.create(testUser);<% }
            if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
       })
       .then(function() {
diff --git a/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js b/app/templates/e2e/account(auth)/logout/logout.spec(mocha).js
@@ -19,10 +19,10 @@ describe('Logout View', function() {
 
   beforeEach(function() {
     return UserModel
-      <% if (filters.mongooseModels) { %>.removeAsync()<% }
+      <% if (filters.mongooseModels) { %>.remove()<% }
          if (filters.sequelizeModels) { %>.destroy({ where: {} })<% } %>
       .then(function() {
-        <% if (filters.mongooseModels) { %>return UserModel.createAsync(testUser);<% }
+        <% if (filters.mongooseModels) { %>return UserModel.create(testUser);<% }
            if (filters.sequelizeModels) { %>return UserModel.create(testUser);<% } %>
       })
       .then(function() {
@@ -31,7 +31,7 @@ describe('Logout View', function() {
   });
 
   after(function() {
-    <% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
+    <% if (filters.mongooseModels) { %>return UserModel.remove();<% }
        if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
   })
 
diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js b/app/templates/e2e/account(auth)/signup/signup.spec(jasmine).js
@@ -52,7 +52,7 @@ describe('Signup View', function() {
   describe('with local auth', function() {
 
     beforeAll(function(done) {
-      <% if (filters.mongooseModels) { %>UserModel.removeAsync().then(done);<% }
+      <% if (filters.mongooseModels) { %>UserModel.remove().then(done);<% }
          if (filters.sequelizeModels) { %>UserModel.destroy({ where: {} }).then(done);<% } %>
     });
 
diff --git a/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js b/app/templates/e2e/account(auth)/signup/signup.spec(mocha).js
@@ -26,7 +26,7 @@ describe('Signup View', function() {
   });
 
   after(function() {
-    <% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
+    <% if (filters.mongooseModels) { %>return UserModel.remove();<% }
        if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
   });
 
@@ -55,7 +55,7 @@ describe('Signup View', function() {
   describe('with local auth', function() {
 
     before(function() {
-      <% if (filters.mongooseModels) { %>return UserModel.removeAsync();<% }
+      <% if (filters.mongooseModels) { %>return UserModel.remove();<% }
          if (filters.sequelizeModels) { %>return UserModel.destroy({ where: {} });<% } %>
     })
 
diff --git a/app/templates/server/api/user(auth)/user.controller.js b/app/templates/server/api/user(auth)/user.controller.js
@@ -25,8 +25,8 @@ function handleError(res, statusCode) {
  * restriction: 'admin'
  */
 export function index(req, res) {
-  <% if (filters.mongooseModels) { %>User.findAsync({}, '-salt -password')<% }
-     if (filters.sequelizeModels) { %>User.findAll({
+  <% if (filters.mongooseModels) { %>return User.find({}, '-salt -password').exec()<% }
+     if (filters.sequelizeModels) { %>return User.findAll({
     attributes: [
       '_id',
       'name',
@@ -48,13 +48,12 @@ export function create(req, res, next) {
   <% if (filters.mongooseModels) { %>var newUser = new User(req.body);
   newUser.provider = 'local';
   newUser.role = 'user';
-  newUser.saveAsync()<% }
+  newUser.save()<% }
      if (filters.sequelizeModels) { %>var newUser = User.build(req.body);
   newUser.setDataValue('provider', 'local');
   newUser.setDataValue('role', 'user');
-  newUser.save()<% } %>
-    <% if (filters.mongooseModels) { %>.spread(function(user) {<% }
-       if (filters.sequelizeModels) { %>.then(function(user) {<% } %>
+  return newUser.save()<% } %>
+    .then(function(user) {
       var token = jwt.sign({ _id: user._id }, config.secrets.session, {
         expiresIn: 60 * 60 * 5
       });
@@ -69,8 +68,8 @@ export function create(req, res, next) {
 export function show(req, res, next) {
   var userId = req.params.id;
 
-  <% if (filters.mongooseModels) { %>User.findByIdAsync(userId)<% }
-     if (filters.sequelizeModels) { %>User.find({
+  <% if (filters.mongooseModels) { %>return User.findById(userId).exec()<% }
+     if (filters.sequelizeModels) { %>return User.find({
     where: {
       _id: userId
     }
@@ -89,8 +88,8 @@ export function show(req, res, next) {
  * restriction: 'admin'
  */
 export function destroy(req, res) {
-  <% if (filters.mongooseModels) { %>User.findByIdAndRemoveAsync(req.params.id)<% }
-     if (filters.sequelizeModels) { %>User.destroy({ _id: req.params.id })<% } %>
+  <% if (filters.mongooseModels) { %>return User.findByIdAndRemove(req.params.id).exec()<% }
+     if (filters.sequelizeModels) { %>return User.destroy({ _id: req.params.id })<% } %>
     .then(function() {
       res.status(204).end();
     })
@@ -105,17 +104,16 @@ export function changePassword(req, res, next) {
   var oldPass = String(req.body.oldPassword);
   var newPass = String(req.body.newPassword);
 
-  <% if (filters.mongooseModels) { %>User.findByIdAsync(userId)<% }
-     if (filters.sequelizeModels) { %>User.find({
+  <% if (filters.mongooseModels) { %>return User.findById(userId).exec()<% }
+     if (filters.sequelizeModels) { %>return User.find({
     where: {
       _id: userId
     }
   })<% } %>
     .then(user => {
       if (user.authenticate(oldPass)) {
         user.password = newPass;
-        <% if (filters.mongooseModels) { %>return user.saveAsync()<% }
-           if (filters.sequelizeModels) { %>return user.save()<% } %>
+        return user.save()
           .then(() => {
             res.status(204).end();
           })
@@ -132,8 +130,8 @@ export function changePassword(req, res, next) {
 export function me(req, res, next) {
   var userId = req.user._id;
 
-  <% if (filters.mongooseModels) { %>User.findOneAsync({ _id: userId }, '-salt -password')<% }
-     if (filters.sequelizeModels) { %>User.find({
+  <% if (filters.mongooseModels) { %>return User.findOne({ _id: userId }, '-salt -password').exec()<% }
+     if (filters.sequelizeModels) { %>return User.find({
     where: {
       _id: userId
     },
diff --git a/app/templates/server/api/user(auth)/user.integration.js b/app/templates/server/api/user(auth)/user.integration.js
@@ -10,7 +10,7 @@ describe('User API:', function() {
 
   // Clear users before testing
   before(function() {
-    return <% if (filters.mongooseModels) { %>User.removeAsync().then(function() {<% }
+    return <% if (filters.mongooseModels) { %>User.remove().then(function() {<% }
        if (filters.sequelizeModels) { %>User.destroy({ where: {} }).then(function() {<% } %>
       <% if (filters.mongooseModels) { %>user = new User({<% }
          if (filters.sequelizeModels) { %>user = User.build({<% } %>
@@ -19,14 +19,14 @@ describe('User API:', function() {
         password: 'password'
       });
 
-      return <% if (filters.mongooseModels) { %>user.saveAsync();<% }
+      return <% if (filters.mongooseModels) { %>user.save();<% }
          if (filters.sequelizeModels) { %>user.save();<% } %>
     });
   });
 
   // Clear users after testing
   after(function() {
-    <% if (filters.mongooseModels) { %>return User.removeAsync();<% }
+    <% if (filters.mongooseModels) { %>return User.remove();<% }
        if (filters.sequelizeModels) { %>return User.destroy({ where: {} });<% } %>
   });
 
diff --git a/app/templates/server/api/user(auth)/user.model(mongooseModels).js b/app/templates/server/api/user(auth)/user.model(mongooseModels).js
@@ -1,7 +1,8 @@
 'use strict';
 
 import crypto from 'crypto';
-var mongoose = require('bluebird').promisifyAll(require('mongoose'));
+import mongoose from 'mongoose';
+mongoose.Promise = require('bluebird');
 import {Schema} from 'mongoose';<% if (filters.oauth) { %>
 
 const authTypes = ['github', 'twitter', 'facebook', 'google'];<% } %>
@@ -78,7 +79,7 @@ UserSchema
   .path('email')
   .validate(function(value, respond) {
     var self = this;
-    return this.constructor.findOneAsync({ email: value })
+    return this.constructor.findOne({ email: value }).exec()
       .then(function(user) {
         if (user) {
           if (self.id === user.id) {
diff --git a/app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js b/app/templates/server/api/user(auth)/user.model.spec(mongooseModels).js
@@ -16,40 +16,40 @@ var genUser = function() {
 describe('User Model', function() {
   before(function() {
     // Clear users before testing
-    return User.removeAsync();
+    return User.remove();
   });
 
   beforeEach(function() {
     genUser();
   });
 
   afterEach(function() {
-    return User.removeAsync();
+    return User.remove();
   });
 
   it('should begin with no users', function() {
-    return <%= expect() %>User.findAsync({})<%= to() %>
+    return <%= expect() %>User.find({}).exec()<%= to() %>
       .eventually.have.length(0);
   });
 
   it('should fail when saving a duplicate user', function() {
-    return <%= expect() %>user.saveAsync()
+    return <%= expect() %>user.save()
       .then(function() {
         var userDup = genUser();
-        return userDup.saveAsync();
+        return userDup.save();
       })<%= to() %>.be.rejected;
   });
 
   describe('#email', function() {
     it('should fail when saving without an email', function() {
       user.email = '';
-      return <%= expect() %>user.saveAsync()<%= to() %>.be.rejected;
+      return <%= expect() %>user.save()<%= to() %>.be.rejected;
     });
   });
 
   describe('#password', function() {
     beforeEach(function() {
-      return user.saveAsync();
+      return user.save();
     });
 
     it('should authenticate user if valid', function() {
@@ -62,8 +62,8 @@ describe('User Model', function() {
 
     it('should remain the same hash unless the password is updated', function() {
       user.name = 'Test User';
-      return <%= expect() %>user.saveAsync()
-        .spread(function(u) {
+      return <%= expect() %>user.save()
+        .then(function(u) {
           return u.authenticate('password');
         })<%= to() %>.eventually.be.true;
     });
diff --git a/app/templates/server/auth(auth)/auth.service.js b/app/templates/server/auth(auth)/auth.service.js
@@ -28,7 +28,7 @@ export function isAuthenticated() {
     })
     // Attach user to request
     .use(function(req, res, next) {
-      <% if (filters.mongooseModels) { %>User.findByIdAsync(req.user._id)<% }
+      <% if (filters.mongooseModels) { %>User.findById(req.user._id).exec()<% }
          if (filters.sequelizeModels) { %>User.find({
         where: {
           _id: req.user._id
diff --git a/app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js b/app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js
@@ -12,10 +12,8 @@ export function setup(User, config) {
     ]
   },
   function(accessToken, refreshToken, profile, done) {
-    <% if (filters.mongooseModels) { %>User.findOneAsync({<% }
-       if (filters.sequelizeModels) { %>User.find({where:{<% } %>
-      'facebook.id': profile.id
-    <% if (filters.sequelizeModels) { %>}<% } %>})
+    <% if (filters.mongooseModels) { %>User.findOne({'facebook.id': profile.id}).exec()<% }
+       if (filters.sequelizeModels) { %>User.find({where:{'facebook.id': profile.id}})<% } %>
       .then(user => {
         if (user) {
           return done(null, user);
@@ -29,8 +27,7 @@ export function setup(User, config) {
           provider: 'facebook',
           facebook: profile._json
         });
-        <% if (filters.mongooseModels) { %>user.saveAsync()<% }
-           if (filters.sequelizeModels) { %>user.save()<% } %>
+        user.save()
           .then(user => done(null, user))
           .catch(err => done(err));
       })
diff --git a/app/templates/server/auth(auth)/google(googleAuth)/passport.js b/app/templates/server/auth(auth)/google(googleAuth)/passport.js
@@ -8,10 +8,8 @@ export function setup(User, config) {
     callbackURL: config.google.callbackURL
   },
   function(accessToken, refreshToken, profile, done) {
-    <% if (filters.mongooseModels) { %>User.findOneAsync({<% }
-       if (filters.sequelizeModels) { %>User.find({where:{<% } %>
-      'google.id': profile.id
-    <% if (filters.sequelizeModels) { %>}<% } %>})
+    <% if (filters.mongooseModels) { %>User.findOne({'google.id': profile.id}).exec()<% }
+       if (filters.sequelizeModels) { %>User.find({where:{'google.id': profile.id}})<% } %>
       .then(user => {
         if (user) {
           return done(null, user);
@@ -26,7 +24,7 @@ export function setup(User, config) {
           provider: 'google',
           google: profile._json
         });
-        <% if (filters.mongooseModels) { %>user.saveAsync()<% }
+        <% if (filters.mongooseModels) { %>user.save()<% }
            if (filters.sequelizeModels) { %>user.save()<% } %>
           .then(user => done(null, user))
           .catch(err => done(err));
diff --git a/app/templates/server/auth(auth)/local/passport.js b/app/templates/server/auth(auth)/local/passport.js
@@ -2,9 +2,9 @@ import passport from 'passport';
 import {Strategy as LocalStrategy} from 'passport-local';
 
 function localAuthenticate(User, email, password, done) {
-  <% if (filters.mongooseModels) { %>User.findOneAsync({
+  <% if (filters.mongooseModels) { %>User.findOne({
     email: email.toLowerCase()
-  })<% }
+  }).exec()<% }
      if (filters.sequelizeModels) { %>User.find({
     where: {
       email: email.toLowerCase()
diff --git a/app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js b/app/templates/server/auth(auth)/twitter(twitterAuth)/passport.js
@@ -8,10 +8,8 @@ export function setup(User, config) {
     callbackURL: config.twitter.callbackURL
   },
   function(token, tokenSecret, profile, done) {
-    <% if (filters.mongooseModels) { %>User.findOneAsync({<% }
-       if (filters.sequelizeModels) { %>User.find({where:{<% } %>
-      'twitter.id': profile.id
-    <% if (filters.sequelizeModels) { %>}<% } %>})
+    <% if (filters.mongooseModels) { %>User.findOne({'twitter.id': profile.id}).exec()<% }
+       if (filters.sequelizeModels) { %>User.find({where:{'twitter.id': profile.id}})<% } %>
       .then(user => {
         if (user) {
           return done(null, user);
@@ -25,7 +23,7 @@ export function setup(User, config) {
           provider: 'twitter',
           twitter: profile._json
         });
-        <% if (filters.mongooseModels) { %>user.saveAsync()<% }
+        <% if (filters.mongooseModels) { %>user.save()<% }
            if (filters.sequelizeModels) { %>user.save()<% } %>
           .then(user => done(null, user))
           .catch(err => done(err));
diff --git a/app/templates/server/config/seed(models).js b/app/templates/server/config/seed(models).js
diff --git a/endpoint/templates/basename.controller.js b/endpoint/templates/basename.controller.js
diff --git a/endpoint/templates/basename.model(mongooseModels).js b/endpoint/templates/basename.model(mongooseModels).js
