Fixing group presented to have proper ReCodEx API injected.

Author: krulis-martin

app/presenters/GroupsPresenter.php

@@ -5,8 +5,6 @@
 use App\Exceptions\BadRequestException;
 use App\Exceptions\ForbiddenRequestException;
 use App\Exceptions\NotFoundException;
-use App\Exceptions\NotImplementedException;
-use App\Helpers\RecodexApiHelper;
 use App\Helpers\RecodexGroup;
 use App\Model\Entity\SisScheduleEvent;
 use App\Model\Repository\SisScheduleEvents;
@@ -16,20 +14,14 @@
 /**
  * Group management (both for teachers and students).
  */
-class GroupsPresenter extends BasePresenter
+class GroupsPresenter extends BasePresenterWithApi
 {
     /**
      * @var SisScheduleEvents
      * @inject
      */
     public $sisEvents;
 
-    /**
-     * @var RecodexApiHelper
-     * @inject
-     */
-    public $recodexApi;
-
     /**
      * @var IEventPermissions
      * @inject

app/presenters/base/BasePresenterWithApi.php

@@ -25,15 +25,17 @@ class BasePresenterWithApi extends BasePresenter
 
     public function startup()
     {
-        parent::startup();
-
         // Initialize ReCodEx auth token (main part is in User entity, suffix is in our auth token's payload).
         $user = $this->getCurrentUser();
         $token = $this->getAccessToken();
-        $suffix = $token->getPayload('suffix');
+        $suffix = $token->getPayloadOrDefault('suffix', null);
 
         if ($user->getRecodexToken() && $suffix) {
             $this->recodexApi->setAuthToken($user->getRecodexToken() . $suffix);
         }
+
+        // the parent startup performs authorization checks, so it must be called after we set the token
+        // (some presenters check permissions via ReCodEx API)
+        parent::startup();
     }
 }

tests/Presenters/GroupsPresenter.phpt

@@ -3,6 +3,7 @@
 $container = require_once __DIR__ . "/../bootstrap.php";
 
 use App\Helpers\RecodexApiHelper;
+use App\Helpers\SisHelper;
 use App\Presenters\GroupsPresenter;
 use App\Exceptions\BadRequestException;
 use App\Exceptions\ForbiddenRequestException;
@@ -60,6 +61,10 @@ class TestGroupsPresenter extends Tester\TestCase
             $this->namingHelper,
             $this->client
         ));
+
+        $sisHelperName = current($this->container->findByType(SisHelper::class));
+        $this->container->removeService($sisHelperName);
+        $this->container->addService($sisHelperName, Mockery::mock(SisHelper::class));
     }
 
     protected function setUp()