package org.argeo.security.mvc;
import java.io.Reader;
-import java.io.StringReader;
import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.argeo.security.ArgeoSecurityService;
import org.argeo.security.ArgeoUser;
import org.argeo.server.BooleanAnswer;
@Controller
public class UsersRolesController implements MvcConstants {
- private final static Log log = LogFactory
- .getLog(UsersRolesController.class);
+// private final static Log log = LogFactory
+// .getLog(UsersRolesController.class);
private ArgeoSecurityService securityService;
private ServerDeserializer userDeserializer = null;
- // @InitBinder
- // public void initBinder(WebDataBinder binder) {
- // binder.registerCustomEditor(SimpleArgeoUser.class,
- // new DeserializingEditor(userDeserializer));
- // }
-
/* USER */
@RequestMapping("/getCredentials.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(Reader reader) {
ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
- cleanUserBeforeCreate(user);
+ //cleanUserBeforeCreate(user);
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
}
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser updateUser(Reader reader) {
ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
- securityService.getSecurityDao().update(user);
+ securityService.updateUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
}
-
+/*
@RequestMapping("/createUser2.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(@RequestParam("body") String body) {
cleanUserBeforeCreate(user);
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
- }
+ }*/
@RequestMapping("/deleteUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
return ServerAnswer.ok("Password updated");
}
- protected void cleanUserBeforeCreate(ArgeoUser user) {
- user.getUserNatures().clear();
- user.getRoles().clear();
- }
+// protected void cleanUserBeforeCreate(ArgeoUser user) {
+// user.getUserNatures().clear();
+// }
public void setUserDeserializer(ServerDeserializer userDeserializer) {
this.userDeserializer = userDeserializer;