fix: Add token getType

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

Author: CarlSchwan

lib/private/Authentication/Token/PublicKeyToken.php

@@ -217,4 +217,9 @@ public function setPasswordInvalid(bool $invalid) {
 	public function wipe(): void {
 		parent::setType(IToken::WIPE_TOKEN);
 	}
+
+	#[\Override]
+	public function getType(): int {
+		return $this->getter('type');
+	}
 }

lib/public/Authentication/Token/IToken.php

@@ -130,4 +130,10 @@ public function setPassword(string $password): void;
 	 * @since 28.0.0
 	 */
 	public function setExpires(?int $expires): void;
+
+	/**
+	 * Get the type of the token
+	 * @since 32.0.0
+	 */
+	public function getType(): int;
 }

tests/lib/Authentication/Token/PublicKeyTokenProviderTest.php

@@ -30,35 +30,25 @@
 use Test\TestCase;
 
 class PublicKeyTokenProviderTest extends TestCase {
-	/** @var PublicKeyTokenProvider|\PHPUnit\Framework\MockObject\MockObject */
-	private $tokenProvider;
-	/** @var PublicKeyTokenMapper|\PHPUnit\Framework\MockObject\MockObject */
-	private $mapper;
-	/** @var IHasher|\PHPUnit\Framework\MockObject\MockObject */
-	private $hasher;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	private $config;
-	/** @var IDBConnection|MockObject */
-	private IDBConnection $db;
-	/** @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */
-	private $logger;
-	/** @var ITimeFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $timeFactory;
-	/** @var ICacheFactory|\PHPUnit\Framework\MockObject\MockObject */
-	private $cacheFactory;
-	/** @var int */
-	private $time;
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
+	private PublicKeyTokenProvider $tokenProvider;
 
+	private PublicKeyTokenMapper&MockObject $mapper;
+	private IConfig&MockObject $config;
+	private IDBConnection&MockObject $db;
+	private LoggerInterface&MockObject $logger;
+	private ITimeFactory&MockObject $timeFactory;
+	private ICacheFactory&MockObject $cacheFactory;
+
+	private int $time;
+	private IHasher $hasher;
+	private ICrypto $crypto;
+	private IEventDispatcher $eventDispatcher;
+
+	#[\Override]
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->mapper = $this->createMock(PublicKeyTokenMapper::class);
-		$this->hasher = Server::get(IHasher::class);
-		$this->crypto = Server::get(ICrypto::class);
 		$this->config = $this->createMock(IConfig::class);
 		$this->config->method('getSystemValue')
 			->willReturnMap([
@@ -75,6 +65,9 @@ protected function setUp(): void {
 		$this->timeFactory->method('getTime')
 			->willReturn($this->time);
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
+
+		$this->hasher = Server::get(IHasher::class);
+		$this->crypto = Server::get(ICrypto::class);
 		$this->eventDispatcher = Server::get(IEventDispatcher::class);
 
 		$this->tokenProvider = new PublicKeyTokenProvider(
@@ -236,7 +229,6 @@ public function testGetPassword(): void {
 		$this->assertSame($password, $this->tokenProvider->getPassword($actual, $token));
 	}
 
-
 	public function testGetPasswordPasswordLessToken(): void {
 		$this->expectException(PasswordlessTokenException::class);
 
@@ -247,7 +239,6 @@ public function testGetPasswordPasswordLessToken(): void {
 		$this->tokenProvider->getPassword($tk, $token);
 	}
 
-
 	public function testGetPasswordInvalidToken(): void {
 		$this->expectException(InvalidTokenException::class);
 
@@ -292,13 +283,11 @@ public function testSetPassword(): void {
 				return $newpass === $this->tokenProvider->getPassword($token, 'tokentokentokentokentoken');
 			}));
 
-
 		$this->tokenProvider->setPassword($actual, $token, $newpass);
 
 		$this->assertSame($newpass, $this->tokenProvider->getPassword($actual, 'tokentokentokentokentoken'));
 	}
 
-
 	public function testSetPasswordInvalidToken(): void {
 		$this->expectException(InvalidTokenException::class);
 
@@ -451,6 +440,7 @@ public function testRenewSessionTokenWithPassword(): void {
 
 	public function testGetToken(): void {
 		$token = new PublicKeyToken();
+		$token->setType(IToken::TEMPORARY_TOKEN);
 
 		$this->config->method('getSystemValue')
 			->with('secret')