Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 05:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2

Browse Source
This commit is contained in:
takezoe
2014-03-06 16:17:41 +09:00
parent c65d80bc72
commit b641bfb56a
8 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/util/Authenticator.scala
View File

@@ -40,8 +40,8 @@ trait OwnerAuthenticator { self: ControllerBase with RepositoryService with Acco
context.loginAccount match {
case Some(x) if(x.isAdmin) => action(repository)
case Some(x) if(repository.owner == x.userName) => action(repository)
case Some(x) if(getGroupMembers(repository.owner).exists {
case (userName, isManager) => userName == x.userName && isManager == true
case Some(x) if(getGroupMembers(repository.owner).exists { member =>
member.userName == x.userName && member.isManager == true
}) => action(repository)
case _ => Unauthorized()
}
@@ -170,7 +170,9 @@ trait GroupManagerAuthenticator { self: ControllerBase with AccountService =>
{
defining(request.paths){ paths =>
context.loginAccount match {
case Some(x) if(getGroupMembers(paths(0)).exists { case (userName, isManager) => userName == x.userName && isManager }) => action
case Some(x) if(getGroupMembers(paths(0)).exists { member =>
member.userName == x.userName && member.isManager
}) => action
case _ => Unauthorized()
}
}