Merge branch 'dev'

thm-mni-ii · Oct 30, 2024 · 976884f · 976884f
2 parents 1ecacbc + 20423dd
commit 976884f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/modules/fbs-core/api/src/main/scala/de/thm/ii/fbs/controller/GroupController.scala b/modules/fbs-core/api/src/main/scala/de/thm/ii/fbs/controller/GroupController.scala
@@ -43,10 +43,8 @@ class GroupController{
     val user = authService.authorize(req, res)
     val someCourseRole = courseRegistrationService.getParticipants(cid).find(_.user.id == user.id).map(_.role)
     (user.globalRole, someCourseRole) match {
-      case (GlobalRole.ADMIN | GlobalRole.MODERATOR, _) | (_, Some(CourseRole.DOCENT)) =>
-        val groupList = groupService.getAll(cid, ignoreHidden = false)
-        groupList
-      case _ => throw new ForbiddenException()
+      case (GlobalRole.ADMIN | GlobalRole.MODERATOR, _) | (_, Some(CourseRole.DOCENT)) => groupService.getAll(cid, ignoreHidden = false)
+      case _ => groupService.getAll(cid)
     }
   }
 

diff --git a/...es/fbs-core/api/src/main/scala/de/thm/ii/fbs/controller/GroupRegistrationController.scala b/...es/fbs-core/api/src/main/scala/de/thm/ii/fbs/controller/GroupRegistrationController.scala
@@ -133,14 +133,8 @@ class GroupRegistrationController {
   @GetMapping(value = Array("/courses/{cid}/groups/{gid}/participants"))
   @ResponseBody
   def getMembers(@PathVariable("cid") cid: Integer, @PathVariable("gid") gid: Int, req: HttpServletRequest, res: HttpServletResponse): List[Participant] = {
-    val user = authService.authorize(req, res)
-    val hasGlobalPrivileges = user.hasRole(GlobalRole.ADMIN, GlobalRole.MODERATOR)
-    val hasCoursePrivileges = courseRegistrationService.getCoursePrivileges(user.id).getOrElse(cid, CourseRole.STUDENT)  == CourseRole.DOCENT
-    if (hasGlobalPrivileges || hasCoursePrivileges) {
-      groupRegistrationService.getMembers(cid, gid)
-    } else {
-      throw new ForbiddenException()
-    }
+    authService.authorize(req, res)
+    groupRegistrationService.getMembers(cid, gid)
   }
 
   /**