Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

added default type to user manager

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-03-16 09:44:32 +01:00
parent d122b0bae6
commit e1162ed025
5 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-webapp/src/main/java/sonia/scm/api/rest/resources/ChangePasswordResource.java
View File

@@ -49,7 +49,6 @@ import sonia.scm.security.EncryptionHandler;
import sonia.scm.user.User;
import sonia.scm.user.UserException;
import sonia.scm.user.UserManager;
import sonia.scm.user.xml.XmlUserManager;
import sonia.scm.util.AssertUtil;
import sonia.scm.web.security.WebSecurityContext;
@@ -64,7 +63,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import sonia.scm.user.xml.XmlUserDAO;
/**
*
@@ -145,8 +143,8 @@ public class ChangePasswordResource
logger.info("password change for user {}", currentUser.getName());
}
// TODO remove dependency to xml implementation
if (currentUser.getType().equals(XmlUserDAO.TYPE))
// Only account of the default type can change their password
if (currentUser.getType().equals(userManager.getDefaultType()))
{
User dbUser = userManager.get(currentUser.getName());
@@ -163,7 +161,12 @@ public class ChangePasswordResource
}
else
{
logger.error("only xml user can change their passwor");
//J-
logger.error(
"Only account of the default type ({}) can change their password",
userManager.getDefaultType()
);
//J+
response = Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
}