Making sure that ReCodEx API call failures caused by invalid token are propagated to frontend and invalid token failure (so the logout is triggered).

Author: krulis-martin

app/helpers/Recodex/RecodexApiHelper.php

@@ -4,6 +4,7 @@
 
 use App\Exceptions\ConfigException;
 use App\Exceptions\RecodexApiException;
+use App\Exceptions\InvalidAccessTokenException;
 use App\Model\Entity\SisScheduleEvent;
 use App\Model\Entity\User;
 use Nette;
@@ -129,10 +130,15 @@ private function prepareOptions(array $query = [], $body = null, array $headers
      * Decode and verify JSON body.
      * @return array|string|int|bool|null decoded JSON response
      * @throws RecodexApiException
+     * @throws InvalidAccessTokenException
      */
     private function processJsonBody($response)
     {
         $code = $response->getStatusCode();
+        if ($code === 401) { // unauthorized, token is probably invalid
+            throw new InvalidAccessTokenException("Unauthorized request to ReCodEx API. Token is probably invalid.");
+        }
+
         if ($code !== 200) {
             Debugger::log("HTTP request to ReCodEx API failed (response $code).", Debugger::DEBUG);
             throw new RecodexApiException("HTTP request failed (response $code).");

app/presenters/LoginPresenter.php

@@ -14,7 +14,6 @@
 use App\Security\Roles;
 use App\Security\TokenScope;
 use Nette\Security\AuthenticationException;
-use Exception;
 
 /**
  * Endpoints used to log a user in