1 files changed, 17 insertions, 34 deletions

diff --git a/apps/theming/lib/Service/JSDataService.php b/apps/theming/lib/Service/JSDataService.php
index 90acd74b868..81198f8b3f5 100644
--- a/apps/theming/lib/Service/JSDataService.php
+++ b/apps/theming/lib/Service/JSDataService.php
@@ -3,64 +3,47 @@
 declare(strict_types=1);
 
 /**
- * @copyright Copyright (c) 2020, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @author Julien Veyssier <eneiluj@posteo.net>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OCA\Theming\Service;
 
-use OCA\Theming\AppInfo\Application;
 use OCA\Theming\ThemingDefaults;
 use OCA\Theming\Util;
-use OCP\IConfig;
 
 class JSDataService implements \JsonSerializable {
-	private ThemingDefaults $themingDefaults;
-	private Util $util;
-	private IConfig $appConfig;
-	private ThemesService $themesService;
 
 	public function __construct(
-		ThemingDefaults $themingDefaults,
-		Util $util,
-		IConfig $appConfig,
-		ThemesService $themesService
+		private ThemingDefaults $themingDefaults,
+		private Util $util,
+		private ThemesService $themesService,
 	) {
 		$this->themingDefaults = $themingDefaults;
 		$this->util = $util;
-		$this->appConfig = $appConfig;
 		$this->themesService = $themesService;
 	}
 
 	public function jsonSerialize(): array {
 		return [
 			'name' => $this->themingDefaults->getName(),
-			'url' => $this->themingDefaults->getBaseUrl(),
 			'slogan' => $this->themingDefaults->getSlogan(),
-			'color' => $this->themingDefaults->getColorPrimary(),
-			'defaultColor' => $this->themingDefaults->getDefaultColorPrimary(),
+
+			'url' => $this->themingDefaults->getBaseUrl(),
 			'imprintUrl' => $this->themingDefaults->getImprintUrl(),
 			'privacyUrl' => $this->themingDefaults->getPrivacyUrl(),
+
+			'primaryColor' => $this->themingDefaults->getColorPrimary(),
+			'backgroundColor' => $this->themingDefaults->getColorBackground(),
+			'defaultPrimaryColor' => $this->themingDefaults->getDefaultColorPrimary(),
+			'defaultBackgroundColor' => $this->themingDefaults->getDefaultColorBackground(),
 			'inverted' => $this->util->invertTextColor($this->themingDefaults->getColorPrimary()),
+
 			'cacheBuster' => $this->util->getCacheBuster(),
 			'enabledThemes' => $this->themesService->getEnabledThemes(),
+
+			// deprecated use primaryColor
+			'color' => $this->themingDefaults->getColorPrimary(),
+			'' => 'color is deprecated since Nextcloud 29, use primaryColor instead'
 		];
 	}
 }