fix: Add translation for temporary app password names

Signed-off-by: Joas Schilling <coding@schilljs.com>

Author: nickvergessen

apps/settings/lib/Controller/AuthSettingsController.php

@@ -27,6 +27,7 @@
 use OCP\Authentication\Exceptions\WipeTokenException;
 use OCP\Authentication\Token\IToken;
 use OCP\IConfig;
+use OCP\IL10N;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUserSession;
@@ -49,6 +50,7 @@ public function __construct(
 		private RemoteWipe $remoteWipe,
 		private LoggerInterface $logger,
 		private IConfig $serverConfig,
+		private IL10N $l,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -92,11 +94,13 @@ public function create(string $name = '', bool $qrcodeLogin = false): JSONRespon
 
 		if ($qrcodeLogin) {
 			if ($this->appConfig->getAppValueBool(ConfigLexicon::LOGIN_QRCODE_ONETIME)) {
-				$name = 'One time login';
+				// TRANSLATORS Fallback name for the temporary app password when using the QR code login
+				$name = $this->l->t('One time login');
 				$type = IToken::ONETIME_TOKEN;
 				$scope = [];
 			} else {
-				$name = 'QR Code login';
+				// TRANSLATORS Fallback name for the app password when using the QR code login
+				$name = $this->l->t('QR Code login');
 				$type = IToken::PERMANENT_TOKEN;
 				$scope = null;
 			}

apps/settings/tests/Controller/AuthSettingsControllerTest.php

@@ -21,6 +21,7 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\IConfig;
+use OCP\IL10N;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUserSession;
@@ -40,6 +41,7 @@ class AuthSettingsControllerTest extends TestCase {
 	private IAppConfig&MockObject $appConfig;
 	private RemoteWipe&MockObject $remoteWipe;
 	private IConfig&MockObject $serverConfig;
+	private IL10N&MockObject $l;
 	private string $uid = 'jane';
 	private AuthSettingsController $controller;
 
@@ -57,6 +59,7 @@ protected function setUp(): void {
 		$this->serverConfig = $this->createMock(IConfig::class);
 		/** @var LoggerInterface&MockObject $logger */
 		$logger = $this->createMock(LoggerInterface::class);
+		$this->l = $this->createMock(IL10N::class);
 
 		$this->controller = new AuthSettingsController(
 			'core',
@@ -71,6 +74,7 @@ protected function setUp(): void {
 			$this->remoteWipe,
 			$logger,
 			$this->serverConfig,
+			$this->l,
 		);
 	}
 

build/psalm-baseline.xml

@@ -4237,12 +4237,6 @@
     <ImplementedReturnTypeMismatch>
       <code><![CDATA[boolean|null]]></code>
     </ImplementedReturnTypeMismatch>
-    <LessSpecificReturnStatement>
-      <code><![CDATA[$this->tokenProvider->getToken($password)]]></code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code><![CDATA[?IToken]]></code>
-    </MoreSpecificReturnType>
     <NoInterfaceProperties>
       <code><![CDATA[$request->server]]></code>
       <code><![CDATA[$request->server]]></code>

lib/private/User/Session.php

@@ -493,11 +493,9 @@ protected function isTwoFactorEnforced($username) {
 	/**
 	 * Check if the given 'password' is actually a device token
 	 *
-	 * @param string $password
-	 * @return ?IToken
 	 * @throws ExpiredTokenException
 	 */
-	private function getTokenFromPassword(string $password): ?IToken {
+	private function getTokenFromPassword(string $password): ?\OCP\Authentication\Token\IToken {
 		try {
 			return $this->tokenProvider->getToken($password);
 		} catch (ExpiredTokenException $e) {