Make sure that OC interfaces returns OC interfaces for backward compatibility

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

apps/settings/lib/Controller/AuthSettingsController.php

@@ -53,14 +53,13 @@
 use Psr\Log\LoggerInterface;
 
 class AuthSettingsController extends Controller {
-
 	/** @var IProvider */
 	private $tokenProvider;
 
 	/** @var ISession */
 	private $session;
 
-	/** IUserSession */
+	/** @var IUserSession */
 	private $userSession;
 
 	/** @var string */

lib/private/Authentication/Exceptions/ExpiredTokenException.php

@@ -25,8 +25,21 @@
  */
 namespace OC\Authentication\Exceptions;
 
+use OC\Authentication\Token\IToken;
+
 /**
  * @deprecated 28.0.0 use OCP version instead
  */
 class ExpiredTokenException extends \OCP\Authentication\Exceptions\ExpiredTokenException {
+	public function __construct(
+		IToken $token,
+	) {
+		parent::__construct($token);
+	}
+
+	public function getToken(): IToken {
+		$token = parent::getToken();
+		/** @var IToken $token We know that we passed OC interface from constructor */
+		return $token;
+	}
 }

lib/private/Authentication/Exceptions/WipeTokenException.php

@@ -25,8 +25,21 @@
  */
 namespace OC\Authentication\Exceptions;
 
+use OC\Authentication\Token\IToken;
+
 /**
  * @deprecated 28.0.0 use OCP version instead
  */
 class WipeTokenException extends \OCP\Authentication\Exceptions\WipeTokenException {
+	public function __construct(
+		IToken $token,
+	) {
+		parent::__construct($token);
+	}
+
+	public function getToken(): IToken {
+		$token = parent::getToken();
+		/** @var IToken $token We know that we passed OC interface from constructor */
+		return $token;
+	}
 }

lib/public/Authentication/Exceptions/ExpiredTokenException.php

@@ -27,13 +27,22 @@
 
 use OCP\Authentication\Token\IToken;
 
+/**
+ * @since 28.0
+ */
 class ExpiredTokenException extends InvalidTokenException {
+	/**
+	 * @since 28.0
+	 */
 	public function __construct(
 		private IToken $token,
 	) {
 		parent::__construct();
 	}
 
+	/**
+	 * @since 28.0
+	 */
 	public function getToken(): IToken {
 		return $this->token;
 	}

lib/public/Authentication/Exceptions/InvalidTokenException.php

@@ -26,5 +26,8 @@
 
 use Exception;
 
+/**
+ * @since 28.0
+ */
 class InvalidTokenException extends Exception {
 }

lib/public/Authentication/Exceptions/WipeTokenException.php

@@ -27,13 +27,22 @@
 
 use OCP\Authentication\Token\IToken;
 
+/**
+ * @since 28.0
+ */
 class WipeTokenException extends InvalidTokenException {
+	/**
+	 * @since 28.0
+	 */
 	public function __construct(
 		private IToken $token,
 	) {
 		parent::__construct();
 	}
 
+	/**
+	 * @since 28.0
+	 */
 	public function getToken(): IToken {
 		return $this->token;
 	}