Fix various issues with security

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui / src / main / java / org / argeo / security / ui / dialogs / ChangePasswordDialog.java

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java
index 21b37cb821fba4ae2a9f001e52a0a037d7f7bb43..90d7320b004f7b9e54902f3e496f434b783e3488 100644 (file)
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java
@@ -1,7 +1,6 @@
 package org.argeo.security.ui.dialogs;
 
 import org.argeo.ArgeoException;
-import org.argeo.security.CurrentUserService;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.swt.SWT;
@@ -13,16 +12,17 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.springframework.security.userdetails.UserDetailsManager;
 
 /** Dialog to change the current user password */
 public class ChangePasswordDialog extends TitleAreaDialog {
        private Text currentPassword, newPassword1, newPassword2;
-       private CurrentUserService securityService;
+       private UserDetailsManager userDetailsManager;
 
        public ChangePasswordDialog(Shell parentShell,
-                       CurrentUserService securityService) {
+                       UserDetailsManager securityService) {
                super(parentShell);
-               this.securityService = securityService;
+               this.userDetailsManager = securityService;
        }
 
        protected Point getInitialSize() {
@@ -48,7 +48,7 @@ public class ChangePasswordDialog extends TitleAreaDialog {
        protected void okPressed() {
                if (!newPassword1.getText().equals(newPassword2.getText()))
                        throw new ArgeoException("Passwords are different");
-               securityService.updateCurrentUserPassword(currentPassword.getText(),
+               userDetailsManager.changePassword(currentPassword.getText(),
                                newPassword1.getText());
                close();
        }