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

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 77b699d012640007cdf118255ddfd674f3da94d0..9470e1d59e4535ef253215b0088a2aade8573786 100644 (file)
--- 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 74aa57cd50b8759f047890b51f324be21c13e93f..0467de8cb967474593679373cc8bd3b74bd50c6e 100644 (file)
--- 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 3413b33ed33d00bb9a4cd83e662093067baf8926..923a1864d14e9343f6dd7fa8bc385d0dfbed8f2e 100644 (file)
--- 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());
        }
 /*