Fixing bugs in conditions of ACL policies.

Author: Martin Krulis

app/V1Module/presenters/ExercisesPresenter.php

@@ -399,9 +399,8 @@ public function actionAssignments(string $id, bool $archived = false) {
     $exercise = $this->exercises->findOrThrow($id);
 
     $assignments = $exercise->getAssignments()->filter(function (Assignment $assignment) use ($archived) {
-      return $archived ?
-        $this->assignmentAcl->canViewDetail($assignment) :
-        $this->assignmentAcl->canViewDetail($assignment) && $assignment->getGroup() && !$assignment->getGroup()->isArchived();
+      return $this->assignmentAcl->canViewDetail($assignment) && $assignment->getGroup()
+        && ($archived || !$assignment->getGroup()->isArchived());
     })->getValues();
     $this->sendSuccessResponse($this->assignmentViewFactory->getAssignments($assignments));
   }

app/V1Module/security/Policies/AssignmentPermissionPolicy.php

@@ -38,7 +38,6 @@ public function isSupervisor(Identity $identity, Assignment $assignment) {
       return false;
     }
 
-    return $group && $group->isSupervisorOf($user) || $group->isAdminOf($user);
+    return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
   }
-
 }

app/V1Module/security/Policies/AssignmentSolutionPermissionPolicy.php

@@ -25,7 +25,7 @@ public function isSupervisor(Identity $identity, AssignmentSolution $solution) {
       return false;
     }
 
-    return $group && $group->isSupervisorOf($user) || $group->isAdminOf($user);
+    return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
   }
 
   public function isAuthor(Identity $identity, AssignmentSolution $solution) {

app/V1Module/security/Policies/CommentPermissionPolicy.php

@@ -50,6 +50,6 @@ public function isSupervisorInGroupOfCommentedSolution(Identity $identity, Comme
     }
 
     $group = $solution->getAssignment()->getGroup();
-    return $group && $group->isSupervisorOf($user) || $group->isAdminOf($user);
+    return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
   }
 }

app/V1Module/security/Policies/ShadowAssignmentPermissionPolicy.php

@@ -31,7 +31,7 @@ public function isSupervisor(Identity $identity, ShadowAssignment $assignment) {
       return false;
     }
 
-    return $group && $group->isSupervisorOf($user) || $group->isAdminOf($user);
+    return $group && ($group->isSupervisorOf($user) || $group->isAdminOf($user));
   }
 
 }