Fix for ALFCOM-3086 - admin enforced to enter an old password when changing their own password.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-06-29 19:28:36 +00:00
parent ab81f0f310
commit b2cd89e945

View File

@@ -43,6 +43,7 @@ import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
@@ -336,9 +337,10 @@ public final class People extends BaseScopableProcessorExtension
ParameterCheck.mandatoryString("userName", userName); ParameterCheck.mandatoryString("userName", userName);
ParameterCheck.mandatoryString("password", password); ParameterCheck.mandatoryString("password", password);
if (this.authorityService.hasAdminAuthority()) AuthenticationService authService = this.services.getAuthenticationService();
if (this.authorityService.hasAdminAuthority() && (userName.equalsIgnoreCase(authService.getCurrentUserName()) == false))
{ {
this.services.getAuthenticationService().setAuthentication(userName, password.toCharArray()); authService.setAuthentication(userName, password.toCharArray());
} }
} }