Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

added version to ScmState

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-02-10 16:10:51 +01:00
parent 9f69ff3c6f
commit cd92d776c1
4 changed files with 138 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java
View File

@@ -36,12 +36,14 @@ package sonia.scm.api.rest.resources;
//~--- non-JDK imports --------------------------------------------------------
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext;
import sonia.scm.SCMContextProvider;
import sonia.scm.ScmState;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.user.User;
@@ -66,8 +68,8 @@ import javax.ws.rs.core.Response;
*
* @author Sebastian Sdorra
*/
@Path("authentication")
@Singleton
@Path("authentication")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public class AuthenticationResource
{
@@ -76,6 +78,27 @@ public class AuthenticationResource
private static final Logger logger =
LoggerFactory.getLogger(AuthenticationResource.class);
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
*
* @param contextProvider
* @param repositoryManger
* @param securityContextProvider
*/
@Inject
public AuthenticationResource(
SCMContextProvider contextProvider,
RepositoryManager repositoryManger,
Provider<WebSecurityContext> securityContextProvider)
{
this.contextProvider = contextProvider;
this.repositoryManger = repositoryManger;
this.securityContextProvider = securityContextProvider;
}
//~--- methods --------------------------------------------------------------
/**
@@ -97,12 +120,14 @@ public class AuthenticationResource
@FormParam("password") String password)
{
ScmState state = null;
WebSecurityContext securityContext = securityContextProvider.get();
User user = securityContext.authenticate(request, response, username,
password);
if ((user != null) &&!SCMContext.USER_ANONYMOUS.equals(user.getName()))
{
state = new ScmState(securityContext, repositoryManger.getTypes());
state = new ScmState(contextProvider, securityContext,
repositoryManger.getTypes());
}
else
{
@@ -126,6 +151,8 @@ public class AuthenticationResource
public Response logout(@Context HttpServletRequest request,
@Context HttpServletResponse response)
{
WebSecurityContext securityContext = securityContextProvider.get();
securityContext.logout(request, response);
Response resp = null;
@@ -133,8 +160,10 @@ public class AuthenticationResource
if (user != null)
{
resp = Response.ok(new ScmState(securityContext,
repositoryManger.getTypes())).build();
ScmState state = new ScmState(contextProvider, securityContext,
repositoryManger.getTypes());
resp = Response.ok(state).build();
}
else
{
@@ -159,6 +188,7 @@ public class AuthenticationResource
{
Response response = null;
ScmState state = null;
WebSecurityContext securityContext = securityContextProvider.get();
User user = securityContext.getUser();
if (user != null)
@@ -168,7 +198,8 @@ public class AuthenticationResource
logger.debug("return state for user {}", user.getName());
}
state = new ScmState(securityContext, repositoryManger.getTypes());
state = new ScmState(contextProvider, securityContext,
repositoryManger.getTypes());
response = Response.ok(state).build();
}
else
@@ -182,10 +213,11 @@ public class AuthenticationResource
//~--- fields ---------------------------------------------------------------
/** Field description */
@Inject
private SCMContextProvider contextProvider;
/** Field description */
private RepositoryManager repositoryManger;
/** Field description */
@Inject
private WebSecurityContext securityContext;
private Provider<WebSecurityContext> securityContextProvider;
}