From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 19 Nov 2009 16:26:30 +0000 (+0000)
Subject: Add login/logout services
X-Git-Tag: argeo-commons-2.1.30~1717
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=a373533a833e21ff90439ef82254091f7dac6f52

Add login/logout services

git-svn-id: https://svn.argeo.org/commons/trunk@3113 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

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 923a1864d..8e4b574c7 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
@@ -16,8 +16,8 @@ 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;
 
@@ -31,6 +31,19 @@ public class UsersRolesController implements MvcConstants {
 		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");
+	}
+
 	@RequestMapping("/getUsersList.security")
 	@ModelAttribute(ANSWER_MODEL_KEY)
 	public List<ArgeoUser> getUsersList() {
@@ -48,7 +61,7 @@ public class UsersRolesController implements MvcConstants {
 	@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());
 	}
@@ -60,23 +73,19 @@ public class UsersRolesController implements MvcConstants {
 		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("/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("/deleteUser.security")
 	@ModelAttribute(ANSWER_MODEL_KEY)
@@ -130,9 +139,9 @@ public class UsersRolesController implements MvcConstants {
 		return ServerAnswer.ok("Password updated");
 	}
 
-//	protected void cleanUserBeforeCreate(ArgeoUser user) {
-//		user.getUserNatures().clear();
-//	}
+	// protected void cleanUserBeforeCreate(ArgeoUser user) {
+	// user.getUserNatures().clear();
+	// }
 
 	public void setUserDeserializer(ServerDeserializer userDeserializer) {
 		this.userDeserializer = userDeserializer;