fix: update password hashing

This commit is contained in:
Sebastian Rindom committed 2020-08-30 16:04:57 +02:00
1 parent 0433cee8cf
commit 16d3c88c4f
5 files changed
+23 -19

No files matched your search

+3 -3
View File
@@ -1,4 +1,4 @@
import { verifyKdf } from "scrypt"
import Scrypt from "scrypt-kdf"
import { BaseService } from "medusa-interfaces"
/**
@@ -23,8 +23,8 @@ class AuthService extends BaseService {
* @return {bool} the result of the comparison
*/
async comparePassword_(password, hash) {
const buf = new Buffer(hash, "base64")
return verifyKdf(buf, password)
const buf = Buffer.from(hash, "base64")
return Scrypt.verify(buf, password)
}
/**
+2 -2
View File
@@ -1,5 +1,5 @@
import jwt from "jsonwebtoken"
import { kdf } from "scrypt"
import Scrypt from "scrypt-kdf"
import _ from "lodash"
import { Validator, MedusaError } from "medusa-core-utils"
import { BaseService } from "medusa-interfaces"
@@ -166,7 +166,7 @@ class CustomerService extends BaseService {
* @return hashed password
*/
async hashPassword_(password) {
const buf = await kdf(password, { N: 1, r: 1, p: 1 })
const buf = await Scrypt.kdf(password, { logN: 1, r: 1, p: 1 })
return buf.toString("base64")
}
+13 -2
View File
@@ -1,5 +1,5 @@
import _ from "lodash"
import bcrypt from "bcrypt"
import Scrypt from "scrypt-kdf"
import jwt from "jsonwebtoken"
import { Validator, MedusaError } from "medusa-core-utils"
import { BaseService } from "medusa-interfaces"
@@ -133,6 +133,17 @@ class UserService extends BaseService {
}
return user
}
/**
* Hashes a password
* @param {string} password - the value to hash
* @return hashed password
*/
async hashPassword_(password) {
const buf = await Scrypt.kdf(password, { logN: 1, r: 1, p: 1 })
return buf.toString("base64")
}
/**
* Creates a user with username being validated.
* Fails if email is not a valid format.
@@ -141,7 +152,7 @@ class UserService extends BaseService {
*/
async create(user, password) {
const validatedEmail = this.validateEmail_(user.email)
const hashedPassword = await bcrypt.hash(password, 10)
const hashedPassword = await this.hashPassword_(password)
user.email = validatedEmail
user.password_hash = hashedPassword
return this.userModel_.create(user).catch(err => {