From 291640273dfc17aa240a48d7d4a1553d76d54e41 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 10 Jun 2020 23:47:01 +0200 Subject: [PATCH] Respect "prefers-color-scheme" media selector for guests Signed-off-by: Joas Schilling --- apps/accessibility/lib/AppInfo/Application.php | 6 ++++++ .../lib/Controller/AccessibilityController.php | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/apps/accessibility/lib/AppInfo/Application.php b/apps/accessibility/lib/AppInfo/Application.php index 0cac878d34e6f..02dfeb8c16bec 100644 --- 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 index 25e117c71555c..4f96922324a14 100644 --- 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; }