fix: avoid changing the IUserSession interface

Signed-off-by: Enrique Pérez Arnaud <enrique@cazalla.net>

Author: enriquepablo

apps/dav/lib/Connector/Sabre/BearerAuth.php

@@ -51,10 +51,6 @@ public function validateBearerToken($bearerToken) {
 			$this->userSession->tryTokenLogin($this->request);
 			$loggedIn = $this->userSession->isLoggedIn();
 		}
-		if (!$loggedIn) {
-			$this->userSession->doTryTokenLogin($bearerToken);
-			$loggedIn = $this->userSession->isLoggedIn();
-		}
 		if ($loggedIn) {
 			return $this->setupUserFs($this->userSession->getUser()->getUID());
 		}

apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php

@@ -69,36 +69,6 @@ public function testValidateBearerToken(): void {
 		$this->assertSame('principals/users/admin', $this->bearerAuth->validateBearerToken('Token'));
 	}
 
-	public function testValidateBearerTokenFallbackToDoTryTokenLogin(): void {
-		// First two isLoggedIn() calls return false (tryTokenLogin did not log in),
-		// then doTryTokenLogin succeeds and the third call returns true.
-		$this->userSession
-			->expects($this->exactly(3))
-			->method('isLoggedIn')
-			->willReturnOnConsecutiveCalls(false, false, true);
-
-		$this->userSession
-			->expects($this->once())
-			->method('tryTokenLogin')
-			->with($this->request);
-
-		$this->userSession
-			->expects($this->once())
-			->method('doTryTokenLogin')
-			->with('BearerToken');
-
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())
-			->method('getUID')
-			->willReturn('admin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-
-		$this->assertSame('principals/users/admin', $this->bearerAuth->validateBearerToken('BearerToken'));
-	}
-
 	public function testChallenge(): void {
 		/** @var RequestInterface&MockObject $request */
 		$request = $this->createMock(RequestInterface::class);

apps/files_external/lib/Migration/DummyUserSession.php

@@ -54,8 +54,4 @@ public function getImpersonatingUserID() : ?string {
 	public function setImpersonatingUserID(bool $useCurrentUser = true): void {
 		//no OP
 	}
-
-	public function doTryTokenLogin(string $token): bool {
-		return false;
-	}
 }

lib/private/User/Session.php

@@ -854,7 +854,7 @@ public function tryTokenLogin(IRequest $request) {
 		return $this->doTryTokenLogin($token);
 	}
 
-	public function doTryTokenLogin(string $token): bool {
+	private function doTryTokenLogin(string $token): bool {
 		if (!$this->loginWithToken($token)) {
 			return false;
 		}

lib/public/IUserSession.php

@@ -92,13 +92,4 @@ public function getImpersonatingUserID(): ?string;
 	 * @since 18.0.0
 	 */
 	public function setImpersonatingUserID(bool $useCurrentUser = true): void;
-
-	/**
-	 * Try to login with the given token
-	 *
-	 * @param string $token
-	 * @return bool true if successful
-	 * @since 32.0.0
-	 */
-	public function doTryTokenLogin(string $token): bool;
 }

tests/lib/User/SessionTest.php

@@ -1337,135 +1337,4 @@ public function testLogClientInThrottlerEmail(): void {
 		$this->assertFalse($userSession->logClientIn('john@foo.bar', 'I-AM-A-PASSWORD', $request, $this->throttler));
 	}
 
-	public function testDoTryTokenLoginSuccess(): void {
-		$manager = $this->createMock(Manager::class);
-		$session = $this->createMock(ISession::class);
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('testuser');
-		$user->method('isEnabled')->willReturn(true);
-
-		$manager->method('get')
-			->with('testuser')
-			->willReturn($user);
-
-		$token = $this->createMock(PublicKeyToken::class);
-		$token->method('getUID')->willReturn('testuser');
-		$token->method('getLoginName')->willReturn('testuser');
-		$token->method('getType')->willReturn(\OCP\Authentication\Token\IToken::PERMANENT_TOKEN);
-		$token->method('getLastCheck')->willReturn($this->timeFactory->getTime());
-
-		$this->tokenProvider->method('getToken')
-			->with('valid-token')
-			->willReturn($token);
-
-		$appPasswordSet = false;
-		$session->expects($this->atLeastOnce())
-			->method('set')
-			->willReturnCallback(function ($key, $value) use (&$appPasswordSet) {
-				// We expect app_password to be set for permanent tokens
-				if ($key === 'app_password') {
-					$appPasswordSet = true;
-					$this->assertEquals('valid-token', $value);
-				}
-				return true;
-			});
-
-		/** @var Session $userSession */
-		$userSession = $this->getMockBuilder(Session::class)
-			->setConstructorArgs([$manager, $session, $this->timeFactory, $this->tokenProvider, $this->config, $this->random, $this->lockdownManager, $this->logger, $this->dispatcher])
-			->onlyMethods(['setMagicInCookie'])
-			->getMock();
-
-		$this->assertTrue($userSession->doTryTokenLogin('valid-token'));
-		$this->assertTrue($appPasswordSet, 'app_password should be set for permanent tokens');
-	}
-
-	public function testDoTryTokenLoginInvalidToken(): void {
-		$manager = $this->createMock(Manager::class);
-		$session = $this->createMock(ISession::class);
-
-		$this->tokenProvider->method('getToken')
-			->with('invalid-token')
-			->willThrowException(new InvalidTokenException());
-
-		/** @var Session $userSession */
-		$userSession = $this->getMockBuilder(Session::class)
-			->setConstructorArgs([$manager, $session, $this->timeFactory, $this->tokenProvider, $this->config, $this->random, $this->lockdownManager, $this->logger, $this->dispatcher])
-			->onlyMethods(['setMagicInCookie'])
-			->getMock();
-
-		$this->assertFalse($userSession->doTryTokenLogin('invalid-token'));
-	}
-
-	public function testDoTryTokenLoginTemporaryToken(): void {
-		$manager = $this->createMock(Manager::class);
-		$session = $this->createMock(ISession::class);
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('testuser');
-		$user->method('isEnabled')->willReturn(true);
-
-		$manager->method('get')
-			->with('testuser')
-			->willReturn($user);
-
-		$token = $this->createMock(PublicKeyToken::class);
-		$token->method('getUID')->willReturn('testuser');
-		$token->method('getLoginName')->willReturn('testuser');
-		$token->method('getType')->willReturn(\OCP\Authentication\Token\IToken::TEMPORARY_TOKEN);
-		$token->method('getLastCheck')->willReturn($this->timeFactory->getTime());
-
-		$this->tokenProvider->method('getToken')
-			->with('temp-token')
-			->willReturn($token);
-
-		// app_password should NOT be set for temporary tokens
-		$session->expects($this->atLeastOnce())
-			->method('set')
-			->willReturnCallback(function ($key, $value) {
-				$this->assertNotEquals('app_password', $key, 'app_password should not be set for temporary tokens');
-				return true;
-			});
-
-		/** @var Session $userSession */
-		$userSession = $this->getMockBuilder(Session::class)
-			->setConstructorArgs([$manager, $session, $this->timeFactory, $this->tokenProvider, $this->config, $this->random, $this->lockdownManager, $this->logger, $this->dispatcher])
-			->onlyMethods(['setMagicInCookie'])
-			->getMock();
-
-		$this->assertTrue($userSession->doTryTokenLogin('temp-token'));
-	}
-
-	public function testDoTryTokenLoginDisabledUser(): void {
-		$manager = $this->createMock(Manager::class);
-		$session = $this->createMock(ISession::class);
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('testuser');
-		$user->method('isEnabled')->willReturn(false);
-
-		$manager->method('get')
-			->with('testuser')
-			->willReturn($user);
-
-		$token = $this->createMock(PublicKeyToken::class);
-		$token->method('getUID')->willReturn('testuser');
-		$token->method('getLoginName')->willReturn('testuser');
-		$token->method('getType')->willReturn(\OCP\Authentication\Token\IToken::PERMANENT_TOKEN);
-		$token->method('getLastCheck')->willReturn($this->timeFactory->getTime());
-
-		$this->tokenProvider->method('getToken')
-			->with('valid-token')
-			->willReturn($token);
-
-		/** @var Session $userSession */
-		$userSession = $this->getMockBuilder(Session::class)
-			->setConstructorArgs([$manager, $session, $this->timeFactory, $this->tokenProvider, $this->config, $this->random, $this->lockdownManager, $this->logger, $this->dispatcher])
-			->onlyMethods(['setMagicInCookie'])
-			->getMock();
-
-		$this->expectException(LoginException::class);
-		$userSession->doTryTokenLogin('valid-token');
-	}
 }