X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fmvc%2FUsersRolesController.java;h=31d2d0581797c1377edd3361a34e34dbec7f1f1d;hb=51cdd7c0883f0ccd756f0f5d0dc2ac97b327d25d;hp=8e4b574c7c58581bc6319ed5d93b1575a0ab9685;hpb=a373533a833e21ff90439ef82254091f7dac6f52;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 8e4b574c7..31d2d0581 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
@@ -5,10 +5,12 @@ import java.util.List;
 
 import org.argeo.security.ArgeoSecurityService;
 import org.argeo.security.ArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
 import org.argeo.server.BooleanAnswer;
 import org.argeo.server.ServerAnswer;
 import org.argeo.server.ServerDeserializer;
 import org.argeo.server.mvc.MvcConstants;
+import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,24 +27,29 @@ public class UsersRolesController implements MvcConstants {
 
 	/* USER */
 
-	@RequestMapping("/getCredentials.security")
+	@RequestMapping("/getCredentials.ria")
 	@ModelAttribute(ANSWER_MODEL_KEY)
 	public ArgeoUser getCredentials() {
-		return securityService.getSecurityDao().getCurrentUser();
-	}
-
-	@RequestMapping("/login.security")
-	@ModelAttribute(ANSWER_MODEL_KEY)
-	public ArgeoUser login(@RequestParam("username") String username,
-			@RequestParam("password") String password) {
-		return securityService.getSecurityDao().getCurrentUser();
-	}
-
-	@RequestMapping("/logout.security")
-	@ModelAttribute(ANSWER_MODEL_KEY)
-	public ServerAnswer logout() {
-		return ServerAnswer.ok("Logged out");
-	}
+		ArgeoUser argeoUser = securityService.getSecurityDao().getCurrentUser();
+		if (argeoUser == null)
+			return new SimpleArgeoUser();
+		else
+			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)