Catch more occurences where ExpiredTokenException can be thrown

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/private/Authentication/Token/Manager.php b/lib/private/Authentication/Token/Manager.php
index 3cf48e868b6d045579b610e2f60bb65985aa111a..5fbf78eefd298a1e93026318d273c07a6b9a9758 100644 (file)
--- a/lib/private/Authentication/Token/Manager.php
+++ b/lib/private/Authentication/Token/Manager.php
@@ -112,7 +112,9 @@ class Manager implements IProvider {
        public function getToken(string $tokenId): IToken {
                try {
                        return $this->publicKeyTokenProvider->getToken($tokenId);
-               } catch (InvalidTokenException $e) {
+               } catch (ExpiredTokenException $e) {
+                       throw $e;
+               } catch(InvalidTokenException $e) {
                        // No worries we try to convert it to a PublicKey Token
                }
 
@@ -153,6 +155,8 @@ class Manager implements IProvider {
        public function renewSessionToken(string $oldSessionId, string $sessionId) {
                try {
                        $this->publicKeyTokenProvider->renewSessionToken($oldSessionId, $sessionId);
+               } catch (ExpiredTokenException $e) {
+                       throw $e;
                } catch (InvalidTokenException $e) {
                        $this->defaultTokenProvider->renewSessionToken($oldSessionId, $sessionId);
                }