Change node bcrypt package from bcrypt-nodejs to bcrypt. Change response message on invalid username/pass and changed to bcrypt syntax for compare and hash.

This commit is contained in:
2019-07-24 22:54:04 +02:00
parent 3f04d9bc56
commit 8a5ab204e1
2 changed files with 46 additions and 47 deletions

View File

@@ -15,7 +15,7 @@
},
"dependencies": {
"axios": "^0.18.0",
"bcrypt-nodejs": "^0.0.3",
"bcrypt": "^3.0.6",
"body-parser": "~1.18.2",
"cross-env": "~5.1.4",
"express": "~4.16.0",

View File

@@ -1,4 +1,4 @@
const bcrypt = require('bcrypt-nodejs');
const bcrypt = require('bcrypt');
const UserRepository = require('src/user/userRepository');
class UserSecurity {
@@ -35,7 +35,7 @@ class UserSecurity {
return Promise.resolve()
.then(() => this.userRepository.retrieveHash(user))
.then(hash => UserSecurity.compareHashes(hash, clearPassword))
.catch(() => { throw new Error('Wrong username or password.'); });
.catch(() => { throw new Error('Incorrect username or password.'); });
}
/**
@@ -46,12 +46,10 @@ class UserSecurity {
*/
static compareHashes(hash, clearPassword) {
return new Promise((resolve, reject) => {
bcrypt.compare(clearPassword, hash, (error, matches) => {
if (matches === true) {
resolve();
} else {
reject();
}
bcrypt.compare(clearPassword, hash, (error, match) => {
if (match)
resolve()
reject()
});
});
}
@@ -63,7 +61,8 @@ class UserSecurity {
*/
static hashPassword(clearPassword) {
return new Promise((resolve) => {
bcrypt.hash(clearPassword, null, null, (error, hash) => {
const salatRounds = 10;
bcrypt.hash(clearPassword, saltRounds, (error, hash) => {
resolve(hash);
});
});