Skip to content
Snippets Groups Projects
Commit 4e5ac003 authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Merge branch 'user_update' into development

Related: !96
parents 256d0d05 26c967d4
No related branches found
No related tags found
1 merge request!116Release v1.0.0
Pipeline #
...@@ -208,6 +208,8 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), (req, r ...@@ -208,6 +208,8 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), (req, r
}}); }});
} }
console.log(req.body);
user.email = req.body.email || user.email; user.email = req.body.email || user.email;
user.name = req.body.name || user.name; user.name = req.body.name || user.name;
user.nickname = req.body.nickname || user.nickname || user.name; user.nickname = req.body.nickname || user.nickname || user.name;
...@@ -226,6 +228,25 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), (req, r ...@@ -226,6 +228,25 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), (req, r
user.citesegment = req.body.citesegment || user.citesegment; user.citesegment = req.body.citesegment || user.citesegment;
user.citerole = req.body.citerole || user.citerole; user.citerole = req.body.citerole || user.citerole;
// console.log(user.checkPassword(req.body.password));
if ((req.body.password) && (req.body.newpassword)) {
if (req.body.password != req.body.newpassword) {
if (user.checkPassword(req.body.password)) {
user.password = req.body.newpassword;
} else {
res.statusCode = 500;
return res.json({error: {
message: 'A senha atual está incorreta'
}});
}
} else {
res.statusCode = 500;
return res.json({error: {
message: 'A nova senha é a mesma da senha atual'
}});
}
}
user.save(err => { user.save(err => {
if(err) { if(err) {
log.error(err); log.error(err);
...@@ -235,7 +256,7 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), (req, r ...@@ -235,7 +256,7 @@ userApp.put('/:id', passport.authenticate('bearer', { session: false }), (req, r
delete u.hashedPassword; delete u.hashedPassword;
delete u.salt; delete u.salt;
res.json({user: u}); res.json({user: u});
}) })
}) })
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment