File tree Expand file tree Collapse file tree 2 files changed +10
-10
lines changed Expand file tree Collapse file tree 2 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 1- const { isIDGood, handleError } = require ( '../../middleware/utils' )
2- const { matchedData } = require ( 'express-validator' )
3- const auth = require ( '../../middleware/auth' )
41const {
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 ) )
Original file line number Diff line number Diff 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 )
You can’t perform that action at this time.
0 commit comments