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

replace groups class with groupnames

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-08-30 10:38:56 +02:00
parent c7f11a8203
commit 81060af003
4 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,8 +53,8 @@ import sonia.scm.SCMContextProvider;
import sonia.scm.ScmClientConfig;
import sonia.scm.ScmState;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.group.GroupNames;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.security.Groups;
import sonia.scm.security.ScmAuthenticationToken;
import sonia.scm.user.User;
import sonia.scm.user.UserManager;
@@ -290,9 +290,9 @@ public class AuthenticationResource
{
PrincipalCollection collection = subject.getPrincipals();
User user = collection.oneByType(User.class);
Groups groups = collection.oneByType(Groups.class);
GroupNames groups = collection.oneByType(GroupNames.class);
return new ScmState(contextProvider, user, groups.getGroups(),
return new ScmState(contextProvider, user, groups.getCollection(),
repositoryManger.getConfiguredTypes(), userManager.getDefaultType(),
new ScmClientConfig(configuration));
}