upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-29 05:43:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 32

Merge pull request #55502 from nextcloud/backport/55176/stable32

Browse source 
[stable32] feat: add header with user id in response
This commit is contained in:
Andy Scherzinger 2025-10-02 14:01:17 +02:00 committed by GitHub
commit db4102b747
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/public/AppFramework/Http/Response.php
View file

@ -11,6 +11,8 @@ use OCP\AppFramework\Http;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IConfig;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\Server;
use Psr\Log\LoggerInterface;
/**
@ -228,7 +230,7 @@ class Response {
/**
* @psalm-suppress UndefinedClass
*/
$request = \OCP\Server::get(IRequest::class);
$request = Server::get(IRequest::class);
$mergeWith = [
'X-Request-Id' => $request->getId(),
'Cache-Control' => 'no-cache, no-store, must-revalidate',
@ -245,6 +247,11 @@ class Response {
$mergeWith['ETag'] = '"' . $this->ETag . '"';
}
$userSession = Server::get(IUserSession::class);
if ($user = $userSession->getUser()) {
$mergeWith['X-User-Id'] = $user->getUID();
}
return array_merge($mergeWith, $this->headers);
}