Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix api key generation

Browse Source
This commit is contained in:
Athou
2017-05-09 08:59:31 +02:00
parent d14a6d8311
commit d4db98fd64
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/backend/dao/GenericDAO.java
View File

@@ -30,6 +30,10 @@ public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T>
models.forEach(m -> persist(m)); models.forEach(m -> persist(m));
} }
public void update(T model) {
currentSession().merge(model);
}
public T findById(Long id) { public T findById(Long id) {
return get(id); return get(id);
} }

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

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