Move LDAP mappers location

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.mvc / src / main / java / org / argeo / security / mvc / UsersRolesController.java

diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
index 4f9c723fb150474b827dafff097e4d233aa2a5bc..d553c31c3d2451e42695b9d27fdf49330a7e1d91 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
+++ b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
@@ -66,7 +66,8 @@ public class UsersRolesController implements MvcConstants {
        @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());
@@ -75,23 +76,23 @@ public class UsersRolesController implements MvcConstants {
        @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)
@@ -145,10 +146,6 @@ public class UsersRolesController implements MvcConstants {
                return ServerAnswer.ok("Password updated");
        }
 
-       // protected void cleanUserBeforeCreate(ArgeoUser user) {
-       // user.getUserNatures().clear();
-       // }
-
        public void setUserDeserializer(Deserializer userDeserializer) {
                this.userDeserializer = userDeserializer;
        }