From f2617e6aad900e9cbe397a58c0f03da54211f263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Wed, 7 Oct 2026 15:35:25 +0200 Subject: [PATCH 1/2] fix: BearerAuth should not check for already loggedin user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/dav/lib/Connector/Sabre/BearerAuth.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/BearerAuth.php b/apps/dav/lib/Connector/Sabre/BearerAuth.php index b05241c6c4423..f25b8b5512a4f 100644 --- a/apps/dav/lib/Connector/Sabre/BearerAuth.php +++ b/apps/dav/lib/Connector/Sabre/BearerAuth.php @@ -21,6 +21,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Connector\Sabre; use OCP\IConfig; @@ -66,10 +67,7 @@ private function setupUserFs($userId) { public function validateBearerToken($bearerToken) { \OC_Util::setupFS(); - if (!$this->userSession->isLoggedIn()) { - $this->userSession->tryTokenLogin($this->request); - } - if ($this->userSession->isLoggedIn()) { + if ($this->userSession->tryTokenLogin($this->request)) { return $this->setupUserFs($this->userSession->getUser()->getUID()); } From 30fbd31856299d3597f806c4c7527ed7ade44dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 3 Nov 2026 15:37:10 +0100 Subject: [PATCH 2/2] fix(tests): Fix BearerAuthTest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php index cf8b9a79574bb..c2f69126cfaf4 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BearerAuthTest.php @@ -22,6 +22,7 @@ * along with this program. If not, see . * */ + namespace OCA\DAV\Tests\unit\Connector\Sabre; use OCA\DAV\Connector\Sabre\BearerAuth; @@ -71,12 +72,9 @@ public function testValidateBearerTokenNotLoggedIn(): void { public function testValidateBearerToken(): void { $this->userSession - ->expects($this->exactly(2)) - ->method('isLoggedIn') - ->willReturnOnConsecutiveCalls( - false, - true, - ); + ->expects($this->once()) + ->method('tryTokenLogin') + ->willReturn(true); $user = $this->createMock(IUser::class); $user ->expects($this->once())