Merge pull request #58438 from nextcloud/backport/58144/stable31

[stable31] Fix/more missing userid cases

Author: salmart-dev

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

@@ -19,7 +19,7 @@ public function __construct(
 	}
 
 	public function initialize(\Sabre\DAV\Server $server): void {
-		$server->on('afterMethod:*', [$this, 'afterMethod']);
+		$server->on('beforeMethod:*', [$this, 'beforeMethod']);
 	}
 
 	/**
@@ -28,7 +28,7 @@ public function initialize(\Sabre\DAV\Server $server): void {
 	 * @param RequestInterface $request request
 	 * @param ResponseInterface $response response
 	 */
-	public function afterMethod(RequestInterface $request, ResponseInterface $response): void {
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response): void {
 		if ($user = $this->userSession->getUser()) {
 			$response->setHeader('X-User-Id', $user->getUID());
 		}

lib/base.php

@@ -1098,7 +1098,9 @@ public static function handleRequest(): void {
 		// Redirect to the default app or login only as an entry point
 		if ($requestPath === '') {
 			// Someone is logged in
-			if (Server::get(IUserSession::class)->isLoggedIn()) {
+			$userSession = Server::get(IUserSession::class);
+			if ($userSession->isLoggedIn()) {
+				header('X-User-Id: ' . $userSession->getUser()?->getUID());
 				header('Location: ' . Server::get(IURLGenerator::class)->linkToDefaultPageUrl());
 			} else {
 				// Not handled and not logged in