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=aa401dce8ba1ba5fecd386d857937354682537fa;hp=d553c31c3d2451e42695b9d27fdf49330a7e1d91;hpb=f516f257ad75279a2d14ab3d39e041637f10219d;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 d553c31c3..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
@@ -36,20 +36,6 @@ public class UsersRolesController implements MvcConstants {
 			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)
 	public List<ArgeoUser> getUsersList() {
@@ -140,9 +126,9 @@ 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");
 	}