Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

improve authentication

Browse Source
This commit is contained in:
Sebastian Sdorra
2010-09-09 18:35:54 +02:00
parent b0f637e203
commit 6a92e0e78e
7 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-webapp/src/main/java/sonia/scm/api/rest/JsonJaxbContextResolver.java
View File

@@ -9,6 +9,7 @@ package sonia.scm.api.rest;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.ScmState;
import sonia.scm.group.Group;
import sonia.scm.repository.Repository;
@@ -43,7 +44,7 @@ public class JsonJaxbContextResolver implements ContextResolver<JAXBContext>
{
this.context = new JSONJAXBContext(
JSONConfiguration.mapped().rootUnwrapping(true).arrays(
"member", "groups", "permissions").nonStrings(
"member", "groups", "permissions", "repositoryTypes").nonStrings(
"readable", "writeable", "groupPermission").build(), types.toArray(
new Class[0]));
}
@@ -73,5 +74,5 @@ public class JsonJaxbContextResolver implements ContextResolver<JAXBContext>
/** Field description */
private List<Class> types = Arrays.asList(new Class[] { Group.class,
Repository.class });
Repository.class, ScmState.class });
}

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

@@ -9,9 +9,10 @@ package sonia.scm.api.rest.resources;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.repository.RepositoryType;
import sonia.scm.SCMContext;
import sonia.scm.ScmState;
import sonia.scm.User;
import sonia.scm.repository.RepositoryType;
import sonia.scm.security.Authenticator;
//~--- JDK imports ------------------------------------------------------------
@@ -41,15 +42,6 @@ import javax.ws.rs.core.Response;
public class AuthenticationResource
{
/** Field description */
private static final RepositoryType[] types = new RepositoryType[] {
new RepositoryType("hg",
"Mercurial"),
new RepositoryType("svn", "Subversion"),
new RepositoryType("git", "Git") };
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
@@ -120,7 +112,9 @@ public class AuthenticationResource
ScmState state = new ScmState();
state.setUser(user);
state.setRepositoryTypes(types);
state.setRepositoryTypes(
SCMContext.getContext().getRepositoryTypes().toArray(
new RepositoryType[0]));
return state;
}