Merge branch 'master' into meta-testing

Author: eceltov

app/V1Module/presenters/AssignmentSolutionsPresenter.php

@@ -390,12 +390,12 @@ public function actionSetBonusPoints(string $id)
             $changedSolutions[] = $this->assignmentSolutionViewFactory->getSolutionData($solution);
             if ($assignment) {
                 $best = $this->assignmentSolutions->findBestSolution($assignment, $author);
-                if ($best->getId() !== $oldBest->getId()) {
+                if (!$best || !$oldBest || $best->getId() !== $oldBest->getId()) {
                     // best solution has changed, we need to report this
-                    if ($best->getId() !== $id) {
+                    if ($best && $best->getId() !== $id) {
                         $changedSolutions[] = $this->assignmentSolutionViewFactory->getSolutionData($best);
                     }
-                    if ($oldBest->getId() !== $id) {
+                    if ($oldBest && $oldBest->getId() !== $id) {
                         $changedSolutions[] = $this->assignmentSolutionViewFactory->getSolutionData($oldBest);
                     }
                 }
@@ -498,7 +498,9 @@ public function actionSetFlag(string $id, string $flag)
 
         // finally flush all changed to the database
         $this->assignmentSolutions->flush();
-        $this->assignmentSolutions->refresh($oldBestSolution);
+        if ($oldBestSolution) {
+            $this->assignmentSolutions->refresh($oldBestSolution);
+        }
 
         // send notification email
         $notificationMethod = $flag . 'FlagChanged';
@@ -512,7 +514,6 @@ public function actionSetFlag(string $id, string $flag)
         }
 
         // assemble response (all entities and stats that may have changed)
-        $assignmentId = $solution->getAssignment()->getId();
         $groupOfSolution = $solution->getAssignment()->getGroup();
         if ($groupOfSolution === null) {
             throw new NotFoundException("Group for assignment '$id' was not found");
@@ -528,12 +529,16 @@ public function actionSetFlag(string $id, string $flag)
             $solution->getAssignment(),
             $solution->getSolution()->getAuthor()
         );
-        if ($oldBestSolution->getId() !== $bestSolution->getId()) {
+        if (!$oldBestSolution || !$bestSolution || $oldBestSolution->getId() !== $bestSolution->getId()) {
             // add old and current best solutions as well (since they have changed)
-            $resSolutions[$oldBestSolution->getId()] =
-                $this->assignmentSolutionViewFactory->getSolutionData($oldBestSolution);
-            $resSolutions[$bestSolution->getId()] =
-                $this->assignmentSolutionViewFactory->getSolutionData($bestSolution);
+            if ($oldBestSolution) {
+                $resSolutions[$oldBestSolution->getId()] =
+                    $this->assignmentSolutionViewFactory->getSolutionData($oldBestSolution);
+            }
+            if ($bestSolution) {
+                $resSolutions[$bestSolution->getId()] =
+                    $this->assignmentSolutionViewFactory->getSolutionData($bestSolution);
+            }
         }
 
         $this->sendSuccessResponse([

app/V1Module/presenters/UploadedFilesPresenter.php

@@ -264,6 +264,7 @@ public function actionContent(string $id, ?string $entry = null)
         // Remove UTF BOM prefix...
         $utf8bom = "\xef\xbb\xbf";
         $contents = Strings::replace($contents, "~^$utf8bom~");
+        $contents = str_replace("\r\n", "\n", $contents); // normalize line endings
 
         $fixedContents = @mb_convert_encoding($contents, 'UTF-8', 'UTF-8');
 

app/config/permissions.neon

@@ -309,7 +309,7 @@ permissions:
 
     - allow: true
       resource: group
-      role: empowered-supervisor
+      role: supervisor
       actions:
           - viewExamLocksIPs
       conditions:

app/model/view/UserViewFactory.php

@@ -86,7 +86,7 @@ private function getUserData(User $user, bool $canViewPrivate, bool $reallyShowE
                 "isExternal" => $user->hasExternalAccounts(),
                 "isAllowed" => $user->isAllowed(),
                 "externalIds" => $this->getExternalIds($user, $reallyShowEverything),
-                "ipLock" => $user->isIpLocked(),
+                "ipLock" => $user->isIpLocked() ? $user->getIpLockRaw() : null,
                 "groupLock" => $user->getGroupLock()?->getId(),
                 "isGroupLockStrict" => $user->isGroupLockStrict(),
             ];
@@ -96,8 +96,6 @@ private function getUserData(User $user, bool $canViewPrivate, bool $reallyShowE
                 $uiData = $user->getUiData();
                 $privateData["uiData"] = $uiData ? $uiData->getData() : null;
                 $privateData["settings"] = $user->getSettings();
-                // ipLock is replaced with actual IP address
-                $privateData["ipLock"] = $user->isIpLocked() ? $user->getIpLockRaw() : null;
                 $privateData["ipLockExpiration"] = $user->isIpLocked()
                     ? $user->getIpLockExpiration()?->getTimestamp() : null;
                 $privateData["groupLockExpiration"] = $user->isGroupLocked()

recodex-api.spec

@@ -1,8 +1,8 @@
 %define name recodex-core
 %define short_name api
 %define install_dir /opt/%{name}
-%define version 2.16.1
-%define unmangled_version 9f2e984f03086c228016bc7e420bfa23d8c7e8b9
+%define version 2.17.0
+%define unmangled_version 8886b04634ad87c2657f7efed1211c2e4d2bbb65
 %define release 1
 
 Summary: ReCodEx core API component

tests/Presenters/GroupsPresenter.phpt

@@ -1788,40 +1788,9 @@ class TestGroupsPresenter extends Tester\TestCase
         );
     }
 
-    public function testGetExamLocks()
-    {
-        $group = $this->prepExamGroup(); // logged in as supervisor
-        $student = $this->presenter->users->getByEmail("demoGroupMember1@example.com");
-
-        $now = (new DateTime())->getTimestamp();
-        $begin = $now - 7200;
-        $end = $now - 3600;
-        $group->setExamPeriod(DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end));
-        $this->presenter->groups->persist($group);
-
-        $exam = new GroupExam($group, DateTime::createFromFormat('U', $begin), DateTime::createFromFormat('U', $end), false);
-        $this->presenter->groupExams->persist($exam);
-
-        $lock = new GroupExamLock($exam, $student, '1.2.3.4');
-        $this->presenter->groupExamLocks->persist($lock);
-
-        $payload = PresenterTestHelper::performPresenterRequest(
-            $this->presenter,
-            'V1:Groups',
-            'GET',
-            ['action' => 'getExamLocks', 'id' => $group->getId(), 'examId' => $exam->getId()],
-        );
-
-        Assert::count(1, $payload);
-        Assert::equal($exam->getId(), $payload[0]['groupExamId']);
-        Assert::equal($student->getId(), $payload[0]['studentId']);
-        Assert::false(array_key_exists('remoteAddr', $payload[0])); // supervisor cannot se IPs
-    }
-
     public function testGetExamLocksWithIPs()
     {
         $group = $this->prepExamGroup();
-        PresenterTestHelper::loginDefaultAdmin($this->container); // admin can see IPs
         $student = $this->presenter->users->getByEmail("demoGroupMember1@example.com");
 
         $now = (new DateTime())->getTimestamp();