Skip to content

Commit 69c69fc

Browse files
committed
Fix check password
1 parent 37ae84d commit 69c69fc

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

app/controllers/profile/changePassword.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
const { isIDGood, handleError } = require('../../middleware/utils')
2-
const { matchedData } = require('express-validator')
3-
const auth = require('../../middleware/auth')
41
const {
5-
findUser,
6-
passwordsDoNotMatch,
7-
changePasswordInDB
8-
} = require('./helpers')
2+
isIDGood,
3+
handleError,
4+
buildErrObject
5+
} = require('../../middleware/utils')
6+
const { matchedData } = require('express-validator')
7+
const { checkPassword } = require('../../middleware/auth')
8+
const { findUser, changePasswordInDB } = require('./helpers')
99

1010
/**
1111
* Change password function called by route
@@ -17,9 +17,9 @@ const changePassword = async (req, res) => {
1717
const id = await isIDGood(req.user._id)
1818
const user = await findUser(id)
1919
req = matchedData(req)
20-
const isPasswordMatch = await auth.checkPassword(req.oldPassword, user)
20+
const isPasswordMatch = await checkPassword(req.oldPassword, user)
2121
if (!isPasswordMatch) {
22-
handleError(res, await passwordsDoNotMatch())
22+
return handleError(res, buildErrObject(409, 'WRONG_PASSWORD'))
2323
} else {
2424
// all ok, proceed to change password
2525
res.status(200).json(await changePasswordInDB(id, req))

app/middleware/auth/checkPassword.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const checkPassword = (password, user) => {
1010
return new Promise((resolve, reject) => {
1111
user.comparePassword(password, (err, isMatch) => {
1212
if (err) {
13-
reject(buildErrObject(422, err.message))
13+
return reject(buildErrObject(422, err.message))
1414
}
1515
if (!isMatch) {
1616
resolve(false)

0 commit comments

Comments
 (0)