Improve Security

[lgpl/argeo-commons.git] / security / eclipse / plugins / org.argeo.security.ui / src / main / java / org / argeo / security / ui / editors / ArgeoUserEditor.java

diff --git a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
index 1cc41783ca730547b4801bcfc5a39a4aa799529d..99a4652a93910eeb591715808d4929c94669c44c 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/editors/ArgeoUserEditor.java
@@ -28,7 +28,7 @@ public class ArgeoUserEditor extends FormEditor {
                        user.getUserNatures().put(SimpleUserNature.TYPE,
                                        new SimpleUserNature());
                } else
-                       user = securityService.getSecurityDao().getUser(username);
+                       user = securityService.getUser(username);
                this.setPartProperty("name", username != null ? username : "<new user>");
                setPartName(username != null ? username : "<new user>");
        }
@@ -48,18 +48,11 @@ public class ArgeoUserEditor extends FormEditor {
                // TODO: make it more generic
                findPage(DefaultUserMainPage.ID).doSave(monitor);
 
-               if (securityService.getSecurityDao().userExists(user.getUsername()))
+               if (securityService.userExists(user.getUsername()))
                        securityService.updateUser(user);
                else {
-                       try {
-                               // FIXME: make it cleaner
-                               ((SimpleArgeoUser)user).setPassword(user.getUsername());
-                               securityService.newUser(user);
-                               setPartName(user.getUsername());
-                       } catch (Exception e) {
-                               // TODO Auto-generated catch block
-                               e.printStackTrace();
-                       }
+                       securityService.newUser(user);
+                       setPartName(user.getUsername());
                }
                firePropertyChange(PROP_DIRTY);
        }