Replace logout href to avoid new etag on every request

Signed-off-by: Julius Härtl <jus@bitgrid.net>

1 files changed, 19 insertions, 4 deletions

diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php
index b178cb97cd5..2397fb3c7b4 100644
--- a/core/Controller/NavigationController.php
+++ b/core/Controller/NavigationController.php
@@ -56,12 +56,12 @@ class NavigationController extends OCSController {
 			$navigation = $this->rewriteToAbsoluteUrls($navigation);
 		}
 
-		$etag = md5(json_encode($navigation));
+		$etag = $this->generateETag($navigation);
 		if ($this->request->getHeader('If-None-Match') === $etag) {
 			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
 		}
 		$response = new DataResponse($navigation);
-		$response->setEtag($etag);
+		$response->setETag($etag);
 		return $response;
 	}
 
@@ -77,16 +77,31 @@ class NavigationController extends OCSController {
 		if ($absolute) {
 			$navigation = $this->rewriteToAbsoluteUrls($navigation);
 		}
-		$etag = md5(json_encode($navigation));
+		$etag = $this->generateETag($navigation);
 		if ($this->request->getHeader('If-None-Match') === $etag) {
 			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
 		}
 		$response = new DataResponse($navigation);
-		$response->setEtag($etag);
+		$response->setETag($etag);
 		return $response;
 	}
 
 	/**
+	 * Generate an ETag for a list of navigation entries
+	 *
+	 * @param array $navigation
+	 * @return string
+	 */
+	private function generateETag(array $navigation): string {
+		foreach ($navigation as &$nav) {
+			if ($nav['id'] === 'logout') {
+				$nav['href'] = 'logout';
+			}
+		}
+		return md5(json_encode($navigation));
+	}
+
+	/**
 	 * Rewrite href attribute of navigation entries to an absolute URL
 	 *
 	 * @param array $navigation