garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

fix password change (#805)

Browse Source
This commit is contained in:
Athou
2016-08-22 15:05:15 +02:00
parent 6f10d35a4c
commit 4b556bd3a9
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/commafeed/frontend/resource/UserREST.java
View File

@@ -208,6 +208,7 @@ public class UserREST {
return Response.status(Status.FORBIDDEN).build();
}
user = userDAO.findById(user.getId());
user.setEmail(StringUtils.trimToNull(request.getEmail()));
if (StringUtils.isNotBlank(request.getPassword())) {
byte[] password = encryptionService.getEncryptedPassword(request.getPassword(), user.getSalt());