feat(auth): include the token entity in TokenInvalidatedEvent

Signed-off-by: Julien Veyssier <[email protected]>

Author: julien-nc

lib/private/Authentication/Token/PublicKeyTokenProvider.php

@@ -279,7 +279,7 @@ public function invalidateToken(string $token) {
 		$this->mapper->invalidate($this->hashTokenWithEmptySecret($token));
 		$this->cacheInvalidHash($tokenHash);
 		if ($tokenEntry !== null) {
-			$this->eventDispatcher->dispatchTyped(new TokenInvalidatedEvent($tokenEntry->getUID(), $tokenEntry->getId()));
+			$this->eventDispatcher->dispatchTyped(new TokenInvalidatedEvent($tokenEntry));
 		}
 	}
 
@@ -290,7 +290,7 @@ public function invalidateTokenById(string $uid, int $id) {
 		}
 		$this->mapper->invalidate($token->getToken());
 		$this->cacheInvalidHash($token->getToken());
-		$this->eventDispatcher->dispatchTyped(new TokenInvalidatedEvent($uid, $id));
+		$this->eventDispatcher->dispatchTyped(new TokenInvalidatedEvent($token));
 	}
 
 	public function invalidateOldTokens() {

lib/public/Authentication/Events/TokenInvalidatedEvent.php

@@ -8,6 +8,7 @@
  */
 namespace OCP\Authentication\Events;
 
+use OCP\Authentication\Token\IToken;
 use OCP\EventDispatcher\Event;
 
 /**
@@ -21,27 +22,17 @@ class TokenInvalidatedEvent extends Event {
 	 * @since 32.0.0
 	 */
 	public function __construct(
-		private string $userId,
-		private int $tokenId,
+		private IToken $token,
 	) {
 		parent::__construct();
 	}
 
 	/**
-	 * returns the uid of the user associated with the invalidated token
+	 * returns the token that has been invalidated
 	 *
 	 * @since 32.0.0
 	 */
-	public function getUserId(): string {
-		return $this->userId;
-	}
-
-	/**
-	 * returns the ID of the token that is being invalidated
-	 *
-	 * @since 32.0.0
-	 */
-	public function getTokenId(): int {
-		return $this->tokenId;
+	public function getToken(): IToken {
+		return $this->token;
 	}
 }