X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fmvc%2FUsersRolesController.java;h=0366096aa6fcfa35a2d90fcc06b371c6f672d4b3;hb=3a9e434fc0f80eab9568b1e5b8bb90f9fcc4310e;hp=a4a2e4556360051f0cb078384d2d5c827fa9151c;hpb=12f0ab4fa622e3507570f5dcbe586c05131a0050;p=lgpl%2Fargeo-commons.git

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 a4a2e4556..0366096aa 100644
--- 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,53 +1,39 @@
 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.security.SimpleArgeoUser;
-import org.argeo.security.core.ArgeoUserDetails;
 import org.argeo.server.BooleanAnswer;
-import org.argeo.server.DeserializingEditor;
+import org.argeo.server.Deserializer;
 import org.argeo.server.ServerAnswer;
-import org.argeo.server.ServerDeserializer;
 import org.argeo.server.mvc.MvcConstants;
-import org.springframework.security.Authentication;
-import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @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));
-	}
+	private Deserializer userDeserializer = null;
 
 	/* USER */
 
-	@RequestMapping("/getCredentials.security")
+	@RequestMapping("/getCredentials.ria")
 	@ModelAttribute(ANSWER_MODEL_KEY)
 	public ArgeoUser getCredentials() {
-		Authentication authentication = SecurityContextHolder.getContext()
-				.getAuthentication();
-		return ArgeoUserDetails.asArgeoUser(authentication);
+		ArgeoUser argeoUser = securityService.getSecurityDao().getCurrentUser();
+		if (argeoUser == null)
+			return new SimpleArgeoUser();
+		else
+			return argeoUser;
 	}
 
 	@RequestMapping("/getUsersList.security")
@@ -66,8 +52,9 @@ public class UsersRolesController implements MvcConstants {
 	@RequestMapping("/createUser.security")
 	@ModelAttribute(ANSWER_MODEL_KEY)
 	public ArgeoUser createUser(Reader reader) {
-		ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
-		cleanUserBeforeCreate(user);
+		ArgeoUser user = userDeserializer.deserialize(reader,
+				SimpleArgeoUser.class);
+		// cleanUserBeforeCreate(user);
 		securityService.newUser(user);
 		return securityService.getSecurityDao().getUser(user.getUsername());
 	}
@@ -75,25 +62,21 @@ public class UsersRolesController implements MvcConstants {
 	@RequestMapping("/updateUser.security")
 	@ModelAttribute(ANSWER_MODEL_KEY)
 	public ArgeoUser updateUser(Reader reader) {
-		ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
-		securityService.getSecurityDao().update(user);
+		ArgeoUser user = userDeserializer.deserialize(reader,
+				SimpleArgeoUser.class);
+		securityService.updateUser(user);
 		return securityService.getSecurityDao().getUser(user.getUsername());
 	}
 
-	@RequestMapping("/createUser2.security")
+	@RequestMapping("/updateUserSelf.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);
+	/** 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());
 	}
 
@@ -143,18 +126,13 @@ public class UsersRolesController implements MvcConstants {
 	@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();
-		user.getRoles().clear();
-	}
-
-	public void setUserDeserializer(ServerDeserializer userDeserializer) {
+	public void setUserDeserializer(Deserializer userDeserializer) {
 		this.userDeserializer = userDeserializer;
 	}