X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fdialogs%2FChangePasswordDialog.java;h=943a00e30d0e54d61d56a92a12e465fc683e5343;hb=136ef465ce4ddd217e550bbe598258b5a967e846;hp=21b37cb821fba4ae2a9f001e52a0a037d7f7bb43;hpb=183b34a3f8c0bce78bed916d413934f20522818c;p=lgpl%2Fargeo-commons.git

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 21b37cb82..943a00e30 100644
--- 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,7 @@
 package org.argeo.security.ui.dialogs;
 
 import org.argeo.ArgeoException;
-import org.argeo.security.CurrentUserService;
+import org.argeo.eclipse.ui.ErrorFeedback;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.swt.SWT;
@@ -13,16 +13,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,9 +49,13 @@ public class ChangePasswordDialog extends TitleAreaDialog {
 	protected void okPressed() {
 		if (!newPassword1.getText().equals(newPassword2.getText()))
 			throw new ArgeoException("Passwords are different");
-		securityService.updateCurrentUserPassword(currentPassword.getText(),
-				newPassword1.getText());
-		close();
+		try {
+			userDetailsManager.changePassword(currentPassword.getText(),
+					newPassword1.getText());
+			close();
+		} catch (Exception e) {
+			ErrorFeedback.show("Cannot change password", e);
+		}
 	}
 
 	/** Creates label and password. */