Respect "prefers-color-scheme" media selector for guests

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Jun 10, 2020 · 2916402 · 2916402
1 parent 9806dec
commit 2916402
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php
@@ -63,6 +63,12 @@ public function injectCss() {
 				$linkToCSS = $this->urlGenerator->linkToRoute(self::APP_NAME . '.accessibility.getCss', ['md5' => $hash]);
 				\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS]);
 			}
+		} else {
+			$userValues = ['dark'];
+
+			$hash = md5(implode('-', $userValues));
+			$linkToCSS = $this->urlGenerator->linkToRoute(self::APP_NAME . '.accessibility.getCss', ['md5' => $hash]);
+			\OCP\Util::addHeader('link', ['rel' => 'stylesheet', 'media' => '(prefers-color-scheme: dark)', 'href' => $linkToCSS]);
 		}
 	}
 

diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php
@@ -131,7 +131,7 @@ public function __construct(string $appName,
 	}
 
 	/**
-	 * @NoAdminRequired
+	 * @PublicPage
 	 * @NoCSRFRequired
 	 * @NoSameSiteCookieRequired
 	 *
@@ -140,7 +140,11 @@ public function __construct(string $appName,
 	public function getCss(): DataDisplayResponse {
 		$css        = '';
 		$imports    = '';
-		$userValues = $this->getUserValues();
+		if ($this->userSession->isLoggedIn()) {
+			$userValues = $this->getUserValues();
+		} else {
+			$userValues = ['dark'];
+		}
 
 		foreach ($userValues as $key => $scssFile) {
 			if ($scssFile !== false) {
@@ -199,7 +203,9 @@ public function getCss(): DataDisplayResponse {
 		$response->addHeader('Pragma', 'cache');
 
 		// store current cache hash
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
+		if ($this->userSession->isLoggedIn()) {
+			$this->config->setUserValue($this->userSession->getUser()->getUID(), $this->appName, 'icons-css', md5($css));
+		}
 
 		return $response;
 	}