Merge pull request #58141 from nextcloud/backport/58059/stable31

Author: Altahrim

core/Controller/LoginController.php

@@ -77,8 +77,9 @@ public function __construct(
 	#[FrontpageRoute(verb: 'GET', url: '/logout')]
 	public function logout() {
 		$loginToken = $this->request->getCookie('nc_token');
-		if (!is_null($loginToken)) {
-			$this->config->deleteUserValue($this->userSession->getUser()->getUID(), 'login_token', $loginToken);
+		$uid = $this->userSession->getUser()?->getUID();
+		if ($loginToken !== null && $uid !== null) {
+			$this->config->deleteUserValue($uid, 'login_token', $loginToken);
 		}
 		$this->userSession->logout();
 
@@ -97,6 +98,10 @@ public function logout() {
 			$response->addHeader('Clear-Site-Data', '"cache", "storage"');
 		}
 
+		if ($uid !== null) {
+			$response->addHeader('X-User-Id', $uid);
+		}
+
 		return $response;
 	}
 

tests/Core/Controller/LoginControllerTest.php

@@ -217,6 +217,7 @@ public function testLogoutWithToken(): void {
 
 		$expected = new RedirectResponse('/login');
 		$expected->addHeader('Clear-Site-Data', '"cache", "storage"');
+		$expected->addHeader('X-User-Id', 'JohnDoe');
 		$this->assertEquals($expected, $this->loginController->logout());
 	}