From 24db4c2b5516e8d01119a78d2f6255a25f6798da Mon Sep 17 00:00:00 2001
From: Adrian Obelmejias <obeladrian@gmail.com>
Date: Thu, 11 Feb 2016 19:36:17 -0500
Subject: [PATCH] Fix promise not resolving

---
 src/models/users.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/models/users.js b/src/models/users.js
index ef10248..be2f4f4 100644
--- a/src/models/users.js
+++ b/src/models/users.js
@@ -19,7 +19,7 @@ User.pre('save', function preSave(next) {
   new Promise((resolve, reject) => {
     bcrypt.genSalt(10, (err, salt) => {
       if (err) { return reject(err) }
-      return salt
+      resolve(salt)
     })
   })
   .then(salt => {
@@ -28,12 +28,11 @@ User.pre('save', function preSave(next) {
 
       user.password = hash
       user.salt = salt
-      return user
+
+      next(null)
     })
   })
-  .then(() => {
-    next()
-  })
+  .catch(err => next(err))
 })
 
 User.methods.validatePassword = function validatePassword(password) {