Updates password hashing to be async

Author: Raywire

server/controllers/users.js

@@ -43,8 +43,8 @@ async function login(req, res) {
     });
   }
 
-  return user.comparePassword(req.body.password, (err, isMatch) => {
-    if (isMatch && !err) {
+  return user.comparePassword(req.body.password, (match) => {
+    if (match) {
       const token = jwt.sign(JSON.parse(JSON.stringify(
         { userId: user.id, username: user.username },
       )), secretKey, { expiresIn: 86400 * 30 });

server/models/user.js

@@ -13,19 +13,18 @@ module.exports = (sequelize, DataTypes) => {
     },
   });
 
-  User.beforeSave((user) => {
+  User.beforeSave(async (user) => {
     if (user.changed('password')) {
-      user.password = bcrypt.hashSync(user.password, bcrypt.genSaltSync(10), null);
+      user.password = await bcrypt.hash(user.password, 10);
     }
   });
 
-  function comparePassword(passw, cb) {
-    bcrypt.compare(passw, this.password, (err, isMatch) => {
-      if (err) {
-        return cb(err);
-      }
-      return cb(null, isMatch);
-    });
+  async function comparePassword(password, cb) {
+    const match = await bcrypt.compare(password, this.password);
+    if (match) {
+      return cb(match);
+    }
+    return cb(false);
   }
 
   User.prototype.comparePassword = comparePassword;