return argeoUser;
}
- // @RequestMapping("/login.security")
- // @ModelAttribute(ANSWER_MODEL_KEY)
- // public ArgeoUser login(@RequestParam("username") String username,
- // @RequestParam("password") String password) {
- // //SecurityContextHolder.getContext().getAuthentication().
- // return securityService.getSecurityDao().getCurrentUser();
- // }
- //
- // @RequestMapping("/logout.security")
- // @ModelAttribute(ANSWER_MODEL_KEY)
- // public ServerAnswer logout() {
- // return ServerAnswer.ok("Logged out");
- // }
-
@RequestMapping("/getUsersList.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public List<ArgeoUser> getUsersList() {
@RequestMapping("/createUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(Reader reader) {
- ArgeoUser user = userDeserializer.deserialize(reader, ArgeoUser.class);
+ ArgeoUser user = userDeserializer.deserialize(reader,
+ SimpleArgeoUser.class);
// cleanUserBeforeCreate(user);
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
@RequestMapping("/updateUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser updateUser(Reader reader) {
- ArgeoUser user = userDeserializer.deserialize(reader, ArgeoUser.class);
+ ArgeoUser user = userDeserializer.deserialize(reader,
+ SimpleArgeoUser.class);
securityService.updateUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
}
- /*
- * @RequestMapping("/createUser2.security")
- *
- * @ModelAttribute(ANSWER_MODEL_KEY) public ArgeoUser
- * createUser(@RequestParam("body") String body) { if (log.isDebugEnabled())
- * log.debug("body:\n" + body); StringReader reader = new
- * StringReader(body); ArgeoUser user = null; try { user = (ArgeoUser)
- * userDeserializer.deserialize(reader); } finally {
- * IOUtils.closeQuietly(reader); } cleanUserBeforeCreate(user);
- * securityService.newUser(user); return
- * securityService.getSecurityDao().getUser(user.getUsername()); }
- */
+ @RequestMapping("/updateUserSelf.security")
+ @ModelAttribute(ANSWER_MODEL_KEY)
+ /** Will only update the user natures.*/
+ public ArgeoUser updateUserSelf(Reader reader) {
+ ArgeoUser user = securityService.getSecurityDao().getCurrentUser();
+ ArgeoUser userForNatures = userDeserializer.deserialize(reader,
+ SimpleArgeoUser.class);
+ user.updateUserNatures(userForNatures.getUserNatures());
+ securityService.updateUser(user);
+ return securityService.getSecurityDao().getUser(user.getUsername());
+ }
@RequestMapping("/deleteUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
@RequestMapping("/updatePassword.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ServerAnswer updatePassword(
- @RequestParam("password") String password,
- @RequestParam("oldPassword") String oldPassword) {
- securityService.getSecurityDao().updatePassword(oldPassword, password);
+ @RequestParam("oldPassword") String oldPassword,
+ @RequestParam("password") String password) {
+ securityService.updateCurrentUserPassword(oldPassword, password);
return ServerAnswer.ok("Password updated");
}
- // protected void cleanUserBeforeCreate(ArgeoUser user) {
- // user.getUserNatures().clear();
- // }
-
public void setUserDeserializer(Deserializer userDeserializer) {
this.userDeserializer = userDeserializer;
}