Change password dialog

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / core / DefaultSecurityService.java

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 23e2372c8a5b1adb171c7e5a462d3ddad0e62be3..b9220b2692af7305657593944012b950cc96754c 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
@@ -62,9 +62,9 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 
        public void updateCurrentUserPassword(String oldPassword, String newPassword) {
                SimpleArgeoUser user = new SimpleArgeoUser(getCurrentUser());
-               if (!user.getPassword().equals(oldPassword))
+               if (!securityDao.isPasswordValid(user.getPassword(), oldPassword))
                        throw new ArgeoException("Old password is not correct.");
-               user.setPassword(newPassword);
+               user.setPassword(securityDao.encodePassword(newPassword));
                securityDao.update(user);
        }