Make sure token getId returns an int for tests

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · May 11, 2023 · 4fce81e · 4fce81e
1 parent a00e367
commit 4fce81e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/private/Authentication/Token/IToken.php b/lib/private/Authentication/Token/IToken.php
@@ -38,7 +38,7 @@ interface IToken extends JsonSerializable {
 	/**
 	 * Get the token ID
 	 */
-	public function getId(): ?int;
+	public function getId(): int;
 
 	/**
 	 * Get the user UID

diff --git a/lib/private/Authentication/Token/PublicKeyToken.php b/lib/private/Authentication/Token/PublicKeyToken.php
@@ -118,8 +118,12 @@ public function __construct() {
 		$this->addType('passwordInvalid', 'bool');
 	}
 
-	public function getId(): ?int {
-		return $this->id;
+	public function getId(): int {
+		if ($this->id !== null) {
+			return $this->id;
+		} else {
+			throw new \InvalidArgumentException('Cannot call getId on an token which was not inserted yet');
+		}
 	}
 
 	public function getUID(): string {