From 2f5648fe0951f67461a319864b980777ddf24149 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 20 Sep 2009 14:32:38 +0000 Subject: [PATCH] Fix various issues: - roles not saved - password transmitted - natures added git-svn-id: https://svn.argeo.org/commons/trunk@2990 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../src/main/java/org/argeo/security/ArgeoSecurityService.java | 2 ++ .../java/org/argeo/security/core/DefaultSecurityService.java | 2 +- .../main/java/org/argeo/security/mvc/UsersRolesController.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java index 77b699d01..9470e1d59 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ArgeoSecurityService.java @@ -2,6 +2,8 @@ package org.argeo.security; public interface ArgeoSecurityService { public void newUser(ArgeoUser argeoUser); + + public void updateUser(ArgeoUser user); public void updateUserPassword(String username, String password); diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java index 74aa57cd5..0467de8cb 100644 --- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java +++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java @@ -36,7 +36,7 @@ public class DefaultSecurityService implements ArgeoSecurityService { .getPassword(); SimpleArgeoUser simpleArgeoUser = new SimpleArgeoUser(user); simpleArgeoUser.setPassword(password); - securityDao.update(user); + securityDao.update(simpleArgeoUser); } public void setArgeoSecurity(ArgeoSecurity argeoSecurity) { 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 3413b33ed..923a1864d 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 @@ -57,7 +57,7 @@ public class UsersRolesController implements MvcConstants { @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()); } /* -- 2.30.2