promise meeeee hashPW and checkUser

Author: Simon Dupree

src/bcrypt.js

@@ -1,21 +1,35 @@
 // const querystring = require('querystring');
 const bcrypt = require('bcryptjs');
 
-const hashPassword = (password, callback) => {
-  bcrypt.hash(password, 10, callback);
+const hashPassword = (password) => {
+  return new Promise((resolve, reject) => {
+    bcrypt.hash(password, 10, (err, hash) => {
+      if (err) reject(err)
+      resolve(hash)
+    });
+  })
 };
 
-const comparePasswords = (password, hashedPassword, callback) => {
-  bcrypt.compare(password, hashedPassword, function (err, res) {
-    if (err) {
-      console.log('booooooooooo')
-      callback(err)
-    } else {
-      console.log('achievement')
-      callback(null, res);
-    }
-  });
+const comparePasswords = (password, hash) => {
+  return new Promise((resolve, reject) =>
+    bcrypt.compare(password, hash, (err, res) => {
+      if (err) reject(err)
+      resolve(res)
+    })
+  )
 };
 
+// const comparePasswords = (password, hashedPassword, callback) => {
+//   bcrypt.compare(password, hashedPassword, function (err, res) {
+//     if (err) {
+//       console.log('booooooooooo')
+//       callback(err)
+//     } else {
+//       console.log('achievement')
+//       callback(null, res);
+//     }
+//   });
+// };
+
 
 module.exports = { hashPassword, comparePasswords }

src/dbQueries.js

@@ -28,10 +28,8 @@ const dbQuery = {
     },
     storeUser: function (username, admin, password, email, cb) {
         admin = false;
-        hashPassword(password, (err, res) => {
-            if (err) {
-                console.log('storeuser pass hash error')
-            } else {
+        hashPassword(password)
+            .then(res => {
                 let query = `BEGIN;
                 INSERT INTO users (username, is_admin, pass, email)
                 VALUES ('${username}', '${admin}', '${res}', '${email}');
@@ -41,25 +39,22 @@ const dbQuery = {
                         cb("Error!", null);
                     }
                     cb(null, res);
-                });
-            }
-        });
+                })
+            }).catch(console.log)
     },
+
     checkUser: function (name, password, cb) {
         let query = `SELECT * FROM users WHERE username='${name}'`;
         databaseConnection.query(query, (err, res) => {
             if (err) {
                 // cb("Errorrrrrrrrrr!", null);
                 console.log('errorrrrrr')
             } else {
-                comparePasswords(password, res.rows[0].pass, (err, res) => {
-                    if (err) {
-                        cb("Terror!", null)
-                    } else {
-                        console.log(res)
-                        cb(null, res)
-                    }
-                })
+                comparePasswords(password, res.rows[0].pass)
+                    .then(res => {
+                        cb(null, res);
+                    })
+                    .catch(console.log);
             }
         });
     },

tests/test.bcrypt.js

@@ -8,32 +8,54 @@ tape('check tape is working', (t) => {
   t.end();
 });
 
-tape('check bcrypt is hashing', (t) => {
-  hashPassword(password, (err, res) => {
-    t.equal(err, null, 'error should be null');
-    t.equal(res.substring(0, 4), '$2a$');
-    t.end();
-  })
-});
+// tape('check bcrypt is hashing', (t) => {
+//   hashPassword(password, (err, res) => {
+//     t.equal(err, null, 'error should be null');
+//     t.equal(res.substring(0, 4), '$2a$');
+//     t.end();
+//   })
+// });
 
-tape('check passwords correct', (t) => {
-  hashPassword(password, (err, res) => {
-    t.equal(err, null, 'err should be nully');
-    comparePasswords(password, res, (err, correct) => {
-      t.equal(err, null, 'err should be very null')
-      t.equal(correct, true);
+tape('check bcrypt promise is hashing', (t) => {
+  hashPassword(password)
+    .then(res => {
+      t.equal(res.substring(0, 4), '$2a$');
       t.end();
     })
-  })
+    .catch(console.log)
 });
 
+tape('check passwords correct', (t) => {
+  hashPassword(password)
+    .then(res => {
+      comparePasswords(password, res)
+        .then(res => {
+          t.equal(res, true);
+          t.end();
+        })
+    })
+    .catch(console.log)
+})
+
+
+// tape('check passwords correct', (t) => {
+//   hashPassword(password, (err, res) => {
+//     t.equal(err, null, 'err should be nully');
+//     comparePasswords(password, res, (err, correct) => {
+//       t.equal(err, null, 'err should be very null')
+//       t.equal(correct, true);
+//       t.end();
+//     })
+//   })
+// });
+
 tape('check passwords incorrectcorrect', (t) => {
-  hashPassword(password, (err, res) => {
-    t.equal(err, null, 'err should be nully');
-    comparePasswords('notpassword', res, (err, correct) => {
-      t.equal(err, null, 'err should be very null')
-      t.equal(correct, false);
-      t.end();
+  hashPassword(password)
+    .then(res => {
+      comparePasswords('notpassword', res)
+        .then(res => {
+          t.equal(res, false);
+          t.end();
+        })
     })
-  })
 });