Merge pull request #20722 from nextcloud/enh/20693/etag-capabilities

Set etag for capabilities endpoint
nextcloud · May 4, 2020 · a93d182 · a93d182
2 parents e102264 + df669a2
commit a93d182
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
@@ -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;
 	}
 
 	/**

diff --git a/tests/Core/Controller/OCSControllerTest.php b/tests/Core/Controller/OCSControllerTest.php
@@ -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());
 	}
 
@@ -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());
 	}