Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-23 20:20:55 +08:00
commit 7e4118817f

View File

@ -43,12 +43,12 @@ const hashPassword = async (pass = '') => {
* @return {boolean}
*/
const comparePassword = async (password = '', hash = '') => {
if (typeof password !== 'string' || password.trim().length === 0) return null
if (typeof hash !== 'string' || hash.trim().length === 0) return null
if (typeof password !== 'string' || password.trim().length === 0) return false
if (typeof hash !== 'string' || hash.trim().length === 0) return false
let check = new Promise((resolve, reject) => {
bcrypt.compare(password, hash, (err, res) => {
if (err) {
reject(err)
resolve(false)
return
}
resolve(res)