projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix various issues:
[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 88dc15589b33732e071d515a2e2385a94e99e7c6..923a1864d14e9343f6dd7fa8bc385d0dfbed8f2e 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
@@
-1,12
+1,8
@@
package org.argeo.security.mvc;
import java.io.Reader;
package org.argeo.security.mvc;
import java.io.Reader;
-import java.io.StringReader;
import java.util.List;
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;
import org.argeo.security.ArgeoSecurityService;
import org.argeo.security.ArgeoUser;
import org.argeo.server.BooleanAnswer;
@@
-20,19
+16,13
@@
import org.springframework.web.bind.annotation.RequestParam;
@Controller
public class UsersRolesController implements MvcConstants {
@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;
private ArgeoSecurityService securityService;
private ServerDeserializer userDeserializer = null;
- // @InitBinder
- // public void initBinder(WebDataBinder binder) {
- // binder.registerCustomEditor(SimpleArgeoUser.class,
- // new DeserializingEditor(userDeserializer));
- // }
-
/* USER */
@RequestMapping("/getCredentials.security")
/* USER */
@RequestMapping("/getCredentials.security")
@@
-58,7
+48,7
@@
public class UsersRolesController implements MvcConstants {
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(Reader reader) {
ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
@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());
}
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
}
@@
-67,10
+57,10
@@
public class UsersRolesController implements MvcConstants {
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser updateUser(Reader reader) {
ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
@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());
}
return securityService.getSecurityDao().getUser(user.getUsername());
}
-
+/*
@RequestMapping("/createUser2.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(@RequestParam("body") String body) {
@RequestMapping("/createUser2.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(@RequestParam("body") String body) {
@@
-86,7
+76,7
@@
public class UsersRolesController implements MvcConstants {
cleanUserBeforeCreate(user);
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
cleanUserBeforeCreate(user);
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
- }
+ }
*/
@RequestMapping("/deleteUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
@RequestMapping("/deleteUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
@@
-140,10
+130,9
@@
public class UsersRolesController implements MvcConstants {
return ServerAnswer.ok("Password updated");
}
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;
public void setUserDeserializer(ServerDeserializer userDeserializer) {
this.userDeserializer = userDeserializer;