nextcloud / server

apps/theming/lib/Themes/CommonThemeTrait.php

Indentation +130 added lines, -130 removed lines

@@ -30,134 +30,134 @@
 use OCA\Theming\Service\BackgroundService;
 
 trait CommonThemeTrait {
-	public Util $util;
-
-	/**
-	 * Generate primary-related variables
-	 * This is shared between multiple themes because colorMainBackground and colorMainText
-	 * will change in between.
-	 */
-	protected function generatePrimaryVariables(string $colorMainBackground, string $colorMainText): array {
-		$colorPrimaryLight = $this->util->mix($this->primaryColor, $colorMainBackground, -80);
-		$colorPrimaryElement = $this->util->elementColor($this->primaryColor);
-		$colorPrimaryElementDefault = $this->util->elementColor($this->defaultPrimaryColor);
-		$colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
-
-		// primary related colours
-		return [
-			// invert filter if primary is too bright
-			// to be used for legacy reasons only. Use inline
-			// svg with proper css variable instead or material
-			// design icons.
-			// ⚠️ Using 'no' as a value to make sure we specify an
-			// invalid one with no fallback. 'unset' could here fallback to some
-			// other theme with media queries
-			'--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no',
-
-			'--color-primary' => $this->primaryColor,
-			'--color-primary-default' => $this->defaultPrimaryColor,
-			'--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
-			'--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60),
-			'--color-primary-light' => $colorPrimaryLight,
-			'--color-primary-light-text' => $this->util->mix($this->primaryColor, $this->util->invertTextColor($colorPrimaryLight) ? '#000000' : '#ffffff', -20),
-			'--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90),
-			'--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
-
-			// used for buttons, inputs...
-			'--color-primary-element' => $colorPrimaryElement,
-			'--color-primary-element-default-hover' => $this->util->mix($colorPrimaryElementDefault, $colorMainBackground, 60),
-			'--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',
-			'--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
-			'--color-primary-element-light' => $colorPrimaryElementLight,
-			'--color-primary-element-light-text' => $this->util->mix($colorPrimaryElement, $this->util->invertTextColor($colorPrimaryElementLight) ? '#000000' : '#ffffff', -20),
-			'--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
-			'--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7),
-
-			// to use like this: background-image: var(--gradient-primary-background);
-			'--gradient-primary-background' => 'linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%)',
-		];
-	}
-
-	/**
-	 * Generate admin theming background-related variables
-	 */
-	protected function generateGlobalBackgroundVariables(): array {
-		$backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor';
-		$hasCustomLogoHeader = $this->util->isLogoThemed();
-		$isDefaultPrimaryBright = $this->util->invertTextColor($this->defaultPrimaryColor);
-
-		$variables = [];
-
-		// Default last fallback values
-		$variables['--image-background-default'] = "url('" . $this->themingDefaults->getBackground() . "')";
-		$variables['--color-background-plain'] = $this->defaultPrimaryColor;
-
-		// If primary as background has been request or if we have a custom primary colour
-		// let's not define the background image
-		if ($backgroundDeleted) {
-			$variables['--color-background-plain'] = $this->defaultPrimaryColor;
-			$variables['--image-background-plain'] = 'yes';
-			// If no background image is set, we need to check against the shown primary colour
-			$variables['--background-image-invert-if-bright'] = $isDefaultPrimaryBright ? 'invert(100%)' : 'no';
-		}
-
-		// Register image variables only if custom-defined
-		foreach (ImageManager::SUPPORTED_IMAGE_KEYS as $image) {
-			if ($this->imageManager->hasImage($image)) {
-				$imageUrl = $this->imageManager->getImageUrl($image);
-				// --image-background is overridden by user theming
-				$variables["--image-$image"] = "url('" . $imageUrl . "')";
-			}
-		}
-
-		if ($hasCustomLogoHeader) {
-			$variables["--image-logoheader-custom"] = 'true';
-		}
-
-		return $variables;
-	}
-
-	/**
-	 * Generate user theming background-related variables
-	 */
-	protected function generateUserBackgroundVariables(): array {
-		$user = $this->userSession->getUser();
-		if ($user !== null
-			&& !$this->themingDefaults->isUserThemingDisabled()
-			&& $this->appManager->isEnabledForUser(Application::APP_ID)) {
-			$backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT);
-			$currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
-			$isPrimaryBright = $this->util->invertTextColor($this->primaryColor);
-
-			// The user removed the background
-			if ($backgroundImage === BackgroundService::BACKGROUND_DISABLED) {
-				return [
-					'--image-background' => 'no',
-					'--color-background-plain' => $this->primaryColor,
-					// If no background image is set, we need to check against the shown primary colour
-					'--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no',
-				];
-			}
-
-			// The user uploaded a custom background
-			if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) {
-				$cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8);
-				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')",
-					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
-				];
-			}
-
-			// The user picked a shipped background
-			if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage])) {
-				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')",
-					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
-					'--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no',
-				];
-			}
-		}
-
-		return [];
-	}
+    public Util $util;
+
+    /**
+     * Generate primary-related variables
+     * This is shared between multiple themes because colorMainBackground and colorMainText
+     * will change in between.
+     */
+    protected function generatePrimaryVariables(string $colorMainBackground, string $colorMainText): array {
+        $colorPrimaryLight = $this->util->mix($this->primaryColor, $colorMainBackground, -80);
+        $colorPrimaryElement = $this->util->elementColor($this->primaryColor);
+        $colorPrimaryElementDefault = $this->util->elementColor($this->defaultPrimaryColor);
+        $colorPrimaryElementLight = $this->util->mix($colorPrimaryElement, $colorMainBackground, -80);
+
+        // primary related colours
+        return [
+            // invert filter if primary is too bright
+            // to be used for legacy reasons only. Use inline
+            // svg with proper css variable instead or material
+            // design icons.
+            // ⚠️ Using 'no' as a value to make sure we specify an
+            // invalid one with no fallback. 'unset' could here fallback to some
+            // other theme with media queries
+            '--primary-invert-if-bright' => $this->util->invertTextColor($this->primaryColor) ? 'invert(100%)' : 'no',
+
+            '--color-primary' => $this->primaryColor,
+            '--color-primary-default' => $this->defaultPrimaryColor,
+            '--color-primary-text' => $this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff',
+            '--color-primary-hover' => $this->util->mix($this->primaryColor, $colorMainBackground, 60),
+            '--color-primary-light' => $colorPrimaryLight,
+            '--color-primary-light-text' => $this->util->mix($this->primaryColor, $this->util->invertTextColor($colorPrimaryLight) ? '#000000' : '#ffffff', -20),
+            '--color-primary-light-hover' => $this->util->mix($colorPrimaryLight, $colorMainText, 90),
+            '--color-primary-text-dark' => $this->util->darken($this->util->invertTextColor($this->primaryColor) ? '#000000' : '#ffffff', 7),
+
+            // used for buttons, inputs...
+            '--color-primary-element' => $colorPrimaryElement,
+            '--color-primary-element-default-hover' => $this->util->mix($colorPrimaryElementDefault, $colorMainBackground, 60),
+            '--color-primary-element-text' => $this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff',
+            '--color-primary-element-hover' => $this->util->mix($colorPrimaryElement, $colorMainBackground, 60),
+            '--color-primary-element-light' => $colorPrimaryElementLight,
+            '--color-primary-element-light-text' => $this->util->mix($colorPrimaryElement, $this->util->invertTextColor($colorPrimaryElementLight) ? '#000000' : '#ffffff', -20),
+            '--color-primary-element-light-hover' => $this->util->mix($colorPrimaryElementLight, $colorMainText, 90),
+            '--color-primary-element-text-dark' => $this->util->darken($this->util->invertTextColor($colorPrimaryElement) ? '#000000' : '#ffffff', 7),
+
+            // to use like this: background-image: var(--gradient-primary-background);
+            '--gradient-primary-background' => 'linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%)',
+        ];
+    }
+
+    /**
+     * Generate admin theming background-related variables
+     */
+    protected function generateGlobalBackgroundVariables(): array {
+        $backgroundDeleted = $this->config->getAppValue(Application::APP_ID, 'backgroundMime', '') === 'backgroundColor';
+        $hasCustomLogoHeader = $this->util->isLogoThemed();
+        $isDefaultPrimaryBright = $this->util->invertTextColor($this->defaultPrimaryColor);
+
+        $variables = [];
+
+        // Default last fallback values
+        $variables['--image-background-default'] = "url('" . $this->themingDefaults->getBackground() . "')";
+        $variables['--color-background-plain'] = $this->defaultPrimaryColor;
+
+        // If primary as background has been request or if we have a custom primary colour
+        // let's not define the background image
+        if ($backgroundDeleted) {
+            $variables['--color-background-plain'] = $this->defaultPrimaryColor;
+            $variables['--image-background-plain'] = 'yes';
+            // If no background image is set, we need to check against the shown primary colour
+            $variables['--background-image-invert-if-bright'] = $isDefaultPrimaryBright ? 'invert(100%)' : 'no';
+        }
+
+        // Register image variables only if custom-defined
+        foreach (ImageManager::SUPPORTED_IMAGE_KEYS as $image) {
+            if ($this->imageManager->hasImage($image)) {
+                $imageUrl = $this->imageManager->getImageUrl($image);
+                // --image-background is overridden by user theming
+                $variables["--image-$image"] = "url('" . $imageUrl . "')";
+            }
+        }
+
+        if ($hasCustomLogoHeader) {
+            $variables["--image-logoheader-custom"] = 'true';
+        }
+
+        return $variables;
+    }
+
+    /**
+     * Generate user theming background-related variables
+     */
+    protected function generateUserBackgroundVariables(): array {
+        $user = $this->userSession->getUser();
+        if ($user !== null
+            && !$this->themingDefaults->isUserThemingDisabled()
+            && $this->appManager->isEnabledForUser(Application::APP_ID)) {
+            $backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT);
+            $currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
+            $isPrimaryBright = $this->util->invertTextColor($this->primaryColor);
+
+            // The user removed the background
+            if ($backgroundImage === BackgroundService::BACKGROUND_DISABLED) {
+                return [
+                    '--image-background' => 'no',
+                    '--color-background-plain' => $this->primaryColor,
+                    // If no background image is set, we need to check against the shown primary colour
+                    '--background-image-invert-if-bright' => $isPrimaryBright ? 'invert(100%)' : 'no',
+                ];
+            }
+
+            // The user uploaded a custom background
+            if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) {
+                $cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8);
+                return [
+                    '--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')",
+                    '--color-background-plain' => $this->themingDefaults->getColorPrimary(),
+                ];
+            }
+
+            // The user picked a shipped background
+            if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage])) {
+                return [
+                    '--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')",
+                    '--color-background-plain' => $this->themingDefaults->getColorPrimary(),
+                    '--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no',
+                ];
+            }
+        }
+
+        return [];
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -89,7 +89,7 @@ 
 		$variables = [];
 
 		// Default last fallback values
-		$variables['--image-background-default'] = "url('" . $this->themingDefaults->getBackground() . "')";
+		$variables['--image-background-default'] = "url('".$this->themingDefaults->getBackground()."')";
 		$variables['--color-background-plain'] = $this->defaultPrimaryColor;
 
 		// If primary as background has been request or if we have a custom primary colour
@@ -106,7 +106,7 @@ 
 			if ($this->imageManager->hasImage($image)) {
 				$imageUrl = $this->imageManager->getImageUrl($image);
 				// --image-background is overridden by user theming
-				$variables["--image-$image"] = "url('" . $imageUrl . "')";
+				$variables["--image-$image"] = "url('".$imageUrl."')";
 			}
 		}
 
@@ -126,7 +126,7 @@ 
 			&& !$this->themingDefaults->isUserThemingDisabled()
 			&& $this->appManager->isEnabledForUser(Application::APP_ID)) {
 			$backgroundImage = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT);
-			$currentVersion = (int)$this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
+			$currentVersion = (int) $this->config->getUserValue($user->getUID(), Application::APP_ID, 'userCacheBuster', '0');
 			$isPrimaryBright = $this->util->invertTextColor($this->primaryColor);
 
 			// The user removed the background
@@ -141,9 +141,9 @@ 
 
 			// The user uploaded a custom background
 			if ($backgroundImage === BackgroundService::BACKGROUND_CUSTOM) {
-				$cacheBuster = substr(sha1($user->getUID() . '_' . $currentVersion), 0, 8);
+				$cacheBuster = substr(sha1($user->getUID().'_'.$currentVersion), 0, 8);
 				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground') . "?v=$cacheBuster')",
+					'--image-background' => "url('".$this->urlGenerator->linkToRouteAbsolute('theming.userTheme.getBackground')."?v=$cacheBuster')",
 					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
 				];
 			}
@@ -151,7 +151,7 @@ 
 			// The user picked a shipped background
 			if (isset(BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage])) {
 				return [
-					'--image-background' => "url('" . $this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage") . "')",
+					'--image-background' => "url('".$this->urlGenerator->linkTo(Application::APP_ID, "img/background/$backgroundImage")."')",
 					'--color-background-plain' => $this->themingDefaults->getColorPrimary(),
 					'--background-image-invert-if-bright' => BackgroundService::SHIPPED_BACKGROUNDS[$backgroundImage]['theming'] ?? null === BackgroundService::THEMING_MODE_DARK ? 'invert(100%)' : 'no',
 				];

apps/theming/lib/Controller/UserThemeController.php

Indentation +160 added lines, -160 removed lines

@@ -50,165 +50,165 @@
 
 class UserThemeController extends OCSController {
 
-	protected ?string $userId = null;
+    protected ?string $userId = null;
 	
-	private IConfig $config;
-	private IUserSession $userSession;
-	private ThemesService $themesService;
-	private ThemingDefaults $themingDefaults;
-	private BackgroundService $backgroundService;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								IConfig $config,
-								IUserSession $userSession,
-								ThemesService $themesService,
-								ThemingDefaults $themingDefaults,
-								BackgroundService $backgroundService) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->themesService = $themesService;
-		$this->themingDefaults = $themingDefaults;
-		$this->backgroundService = $backgroundService;
-
-		$user = $userSession->getUser();
-		if ($user !== null) {
-			$this->userId = $user->getUID();
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Enable theme
-	 *
-	 * @param string $themeId the theme ID
-	 * @return DataResponse
-	 * @throws OCSBadRequestException|PreConditionNotMetException
-	 */
-	public function enableTheme(string $themeId): DataResponse {
-		$theme = $this->validateTheme($themeId);
-
-		// Enable selected theme
-		$this->themesService->enableTheme($theme);
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * Disable theme
-	 *
-	 * @param string $themeId the theme ID
-	 * @return DataResponse
-	 * @throws OCSBadRequestException|PreConditionNotMetException
-	 */
-	public function disableTheme(string $themeId): DataResponse {
-		$theme = $this->validateTheme($themeId);
-
-		// Enable selected theme
-		$this->themesService->disableTheme($theme);
-		return new DataResponse();
-	}
-
-	/**
-	 * Validate and return the matching ITheme
-	 *
-	 * Disable theme
-	 *
-	 * @param string $themeId the theme ID
-	 * @return ITheme
-	 * @throws OCSBadRequestException|PreConditionNotMetException
-	 */
-	private function validateTheme(string $themeId): ITheme {
-		if ($themeId === '' || !$themeId) {
-			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
-		}
-
-		$themes = $this->themesService->getThemes();
-		if (!isset($themes[$themeId])) {
-			throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
-		}
-
-		// If trying to toggle another theme but this is enforced
-		if ($this->config->getSystemValueString('enforce_theme', '') !== ''
-			&& $themes[$themeId]->getType() === ITheme::TYPE_THEME) {
-			throw new OCSForbiddenException('Theme switching is disabled');
-		}
-
-		return $themes[$themeId];
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function getBackground(): Http\Response {
-		$file = $this->backgroundService->getBackground();
-		if ($file !== null) {
-			$response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => $file->getMimeType()]);
-			$response->cacheFor(24 * 60 * 60, false, true);
-			return $response;
-		}
-		return new NotFoundResponse();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function deleteBackground(): JSONResponse {
-		$currentVersion = (int)$this->config->getUserValue($this->userId, Application::APP_ID, 'userCacheBuster', '0');
-		$this->backgroundService->deleteBackgroundImage();
-		return new JSONResponse([
-			'backgroundImage' => null,
-			'backgroundColor' => $this->themingDefaults->getColorPrimary(),
-			'version' => $currentVersion,
-		]);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function setBackground(string $type = BackgroundService::BACKGROUND_DEFAULT, string $value = '', string $color = null): JSONResponse {
-		$currentVersion = (int)$this->config->getUserValue($this->userId, Application::APP_ID, 'userCacheBuster', '0');
-
-		// Set color if provided
-		if ($color) {
-			$this->backgroundService->setColorBackground($color);
-		}
-
-		// Set background image if provided
-		try {
-			switch ($type) {
-				case BackgroundService::BACKGROUND_SHIPPED:
-					$this->backgroundService->setShippedBackground($value);
-					break;
-				case BackgroundService::BACKGROUND_CUSTOM:
-					$this->backgroundService->setFileBackground($value);
-					break;
-				case BackgroundService::BACKGROUND_DEFAULT:
-					// Delete both background and color keys
-					$this->backgroundService->setDefaultBackground();
-					break;
-				default:
-					if (!$color) {
-						return new JSONResponse(['error' => 'Invalid type provided'], Http::STATUS_BAD_REQUEST);
-					}
-			}
-		} catch (\InvalidArgumentException $e) {
-			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
-		} catch (\Throwable $e) {
-			return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
-		}
-
-		$currentVersion++;
-		$this->config->setUserValue($this->userId, Application::APP_ID, 'userCacheBuster', (string)$currentVersion);
-
-		return new JSONResponse([
-			'backgroundImage' => $this->config->getUserValue($this->userId, Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT),
-			'backgroundColor' => $this->themingDefaults->getColorPrimary(),
-			'version' => $currentVersion,
-		]);
-	}
+    private IConfig $config;
+    private IUserSession $userSession;
+    private ThemesService $themesService;
+    private ThemingDefaults $themingDefaults;
+    private BackgroundService $backgroundService;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                IConfig $config,
+                                IUserSession $userSession,
+                                ThemesService $themesService,
+                                ThemingDefaults $themingDefaults,
+                                BackgroundService $backgroundService) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->userSession = $userSession;
+        $this->themesService = $themesService;
+        $this->themingDefaults = $themingDefaults;
+        $this->backgroundService = $backgroundService;
+
+        $user = $userSession->getUser();
+        if ($user !== null) {
+            $this->userId = $user->getUID();
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Enable theme
+     *
+     * @param string $themeId the theme ID
+     * @return DataResponse
+     * @throws OCSBadRequestException|PreConditionNotMetException
+     */
+    public function enableTheme(string $themeId): DataResponse {
+        $theme = $this->validateTheme($themeId);
+
+        // Enable selected theme
+        $this->themesService->enableTheme($theme);
+        return new DataResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * Disable theme
+     *
+     * @param string $themeId the theme ID
+     * @return DataResponse
+     * @throws OCSBadRequestException|PreConditionNotMetException
+     */
+    public function disableTheme(string $themeId): DataResponse {
+        $theme = $this->validateTheme($themeId);
+
+        // Enable selected theme
+        $this->themesService->disableTheme($theme);
+        return new DataResponse();
+    }
+
+    /**
+     * Validate and return the matching ITheme
+     *
+     * Disable theme
+     *
+     * @param string $themeId the theme ID
+     * @return ITheme
+     * @throws OCSBadRequestException|PreConditionNotMetException
+     */
+    private function validateTheme(string $themeId): ITheme {
+        if ($themeId === '' || !$themeId) {
+            throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+        }
+
+        $themes = $this->themesService->getThemes();
+        if (!isset($themes[$themeId])) {
+            throw new OCSBadRequestException('Invalid theme id: ' . $themeId);
+        }
+
+        // If trying to toggle another theme but this is enforced
+        if ($this->config->getSystemValueString('enforce_theme', '') !== ''
+            && $themes[$themeId]->getType() === ITheme::TYPE_THEME) {
+            throw new OCSForbiddenException('Theme switching is disabled');
+        }
+
+        return $themes[$themeId];
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function getBackground(): Http\Response {
+        $file = $this->backgroundService->getBackground();
+        if ($file !== null) {
+            $response = new FileDisplayResponse($file, Http::STATUS_OK, ['Content-Type' => $file->getMimeType()]);
+            $response->cacheFor(24 * 60 * 60, false, true);
+            return $response;
+        }
+        return new NotFoundResponse();
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function deleteBackground(): JSONResponse {
+        $currentVersion = (int)$this->config->getUserValue($this->userId, Application::APP_ID, 'userCacheBuster', '0');
+        $this->backgroundService->deleteBackgroundImage();
+        return new JSONResponse([
+            'backgroundImage' => null,
+            'backgroundColor' => $this->themingDefaults->getColorPrimary(),
+            'version' => $currentVersion,
+        ]);
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function setBackground(string $type = BackgroundService::BACKGROUND_DEFAULT, string $value = '', string $color = null): JSONResponse {
+        $currentVersion = (int)$this->config->getUserValue($this->userId, Application::APP_ID, 'userCacheBuster', '0');
+
+        // Set color if provided
+        if ($color) {
+            $this->backgroundService->setColorBackground($color);
+        }
+
+        // Set background image if provided
+        try {
+            switch ($type) {
+                case BackgroundService::BACKGROUND_SHIPPED:
+                    $this->backgroundService->setShippedBackground($value);
+                    break;
+                case BackgroundService::BACKGROUND_CUSTOM:
+                    $this->backgroundService->setFileBackground($value);
+                    break;
+                case BackgroundService::BACKGROUND_DEFAULT:
+                    // Delete both background and color keys
+                    $this->backgroundService->setDefaultBackground();
+                    break;
+                default:
+                    if (!$color) {
+                        return new JSONResponse(['error' => 'Invalid type provided'], Http::STATUS_BAD_REQUEST);
+                    }
+            }
+        } catch (\InvalidArgumentException $e) {
+            return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
+        } catch (\Throwable $e) {
+            return new JSONResponse(['error' => $e->getMessage()], Http::STATUS_INTERNAL_SERVER_ERROR);
+        }
+
+        $currentVersion++;
+        $this->config->setUserValue($this->userId, Application::APP_ID, 'userCacheBuster', (string)$currentVersion);
+
+        return new JSONResponse([
+            'backgroundImage' => $this->config->getUserValue($this->userId, Application::APP_ID, 'background_image', BackgroundService::BACKGROUND_DEFAULT),
+            'backgroundColor' => $this->themingDefaults->getColorPrimary(),
+            'version' => $currentVersion,
+        ]);
+    }
 }