diff --git a/source/java/org/alfresco/rest/api/impl/PeopleImpl.java b/source/java/org/alfresco/rest/api/impl/PeopleImpl.java index 3b8d5bf43f..fdf0b54080 100644 --- a/source/java/org/alfresco/rest/api/impl/PeopleImpl.java +++ b/source/java/org/alfresco/rest/api/impl/PeopleImpl.java @@ -534,8 +534,6 @@ public class PeopleImpl implements People validateUpdatePersonData(person); - boolean isAdmin = isAdminAuthority(); - String currentUserId = AuthenticationUtil.getFullyAuthenticatedUser(); if (!isAdmin && !currentUserId.equalsIgnoreCase(personId)) { @@ -667,55 +665,6 @@ public class PeopleImpl implements People } } - private void updatePassword(boolean isAdmin, String personIdToUpdate, Person person) - { - MutableAuthenticationService mutableAuthenticationService = (MutableAuthenticationService) authenticationService; - - boolean isOldPassword = person.wasSet(Person.PROP_PERSON_OLDPASSWORD); - boolean isPassword = person.wasSet(Person.PROP_PERSON_PASSWORD); - - if (isPassword || isOldPassword) - { - if (isOldPassword && ((person.getOldPassword() == null) || (person.getOldPassword().isEmpty()))) - { - throw new IllegalArgumentException("'oldPassword' field cannot be empty."); - } - - if (!isPassword || (person.getPassword() == null) || (person.getPassword().isEmpty())) - { - throw new IllegalArgumentException("password' field cannot be empty."); - } - - char[] newPassword = person.getPassword().toCharArray(); - - if (!isAdmin) - { - // Non-admin users can update their own password, but must provide their current password. - if (!isOldPassword) - { - throw new IllegalArgumentException("To change password, both 'oldPassword' and 'password' fields are required."); - } - - char[] oldPassword = person.getOldPassword().toCharArray(); - try - { - mutableAuthenticationService.updateAuthentication(personIdToUpdate, oldPassword, newPassword); - } - catch (AuthenticationException e) - { - throw new PermissionDeniedException("Incorrect password."); - } - } - else - { - // An admin user can update without knowing the original pass - but must know their own! - // note: is it reasonable to silently ignore oldPassword if supplied ? - - mutableAuthenticationService.setAuthentication(personIdToUpdate, newPassword); - } - } - } - private boolean isAdminAuthority() { return authorityService.hasAdminAuthority();