Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 15:35:49 +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

8
scm-webapp/src/main/java/sonia/scm/security/ScmRealm.java
View File

@@ -60,6 +60,7 @@ import sonia.scm.cache.CacheManager;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.group.Group;
import sonia.scm.group.GroupManager;
import sonia.scm.group.GroupNames;
import sonia.scm.repository.Permission;
import sonia.scm.repository.PermissionType;
import sonia.scm.repository.Repository;
@@ -273,7 +274,7 @@ public class ScmRealm extends AuthorizingRealm
logger.trace("coullect AuthorizationInfo for user {}", user.getName());
}
Groups groups = principals.oneByType(Groups.class);
GroupNames groups = principals.oneByType(GroupNames.class);
info = createAuthorizationInfo(user, groups);
}
@@ -545,7 +546,7 @@ public class ScmRealm extends AuthorizingRealm
*/
collection.add(user.getId(), NAME);
collection.add(user, NAME);
collection.add(new Groups(groups), NAME);
collection.add(new GroupNames(groups), NAME);
return new SimpleAuthenticationInfo(collection, token.getPassword());
}
@@ -559,7 +560,8 @@ public class ScmRealm extends AuthorizingRealm
*
* @return
*/
private AuthorizationInfo createAuthorizationInfo(User user, Groups groups)
private AuthorizationInfo createAuthorizationInfo(User user,
GroupNames groups)
{
Set<String> roles = Sets.newHashSet();
List<org.apache.shiro.authz.Permission> permissions = null;