Skip to content

Set etag for capabilities endpoint #20722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
May 4, 2020
Merged

Set etag for capabilities endpoint #20722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Set etag for capabilities endpoint 
Signed-off-by: Daniel Kesselberg <[email protected]>
  • Loading branch information
@kesselb
kesselb committed Apr 29, 2020
commit df669a29360a3ec69e87829f15571f261b39280b
4 changes: 3 additions & 1 deletion core/Controller/OCSController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ public function getCapabilities() {
$result['capabilities'] = $this->capabilitiesManager->getCapabilities(true);
}

return new DataResponse($result);
$response = new DataResponse($result);
$response->setETag(md5(json_encode($result)));
return $response;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions tests/Core/Controller/OCSControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ public function testGetCapabilities() {
$result['capabilities'] = $capabilities;

$expected = new DataResponse($result);
$expected->setETag(md5(json_encode($result)));
$this->assertEquals($expected, $this->controller->getCapabilities());
}

Expand Down Expand Up @@ -146,6 +147,7 @@ public function testGetCapabilitiesPublic() {
$result['capabilities'] = $capabilities;

$expected = new DataResponse($result);
$expected->setETag(md5(json_encode($result)));
$this->assertEquals($expected, $this->controller->getCapabilities());
}

Expand Down