Merge pull request #2 from LibreCodeCoop/feat/make-possible-use-multi…

…ple-image-types feat: make possible use multiple types
LibreCodeCoop · Oct 3, 2024 · b793584 · b793584
2 parents 2c97721 + 78f8666
commit b793584
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/lib/Middleware/InjectionMiddleware.php b/lib/Middleware/InjectionMiddleware.php
@@ -16,6 +16,8 @@
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Middleware;
+use OCP\Files\NotFoundException;
+use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IRequest;
@@ -61,25 +63,14 @@ private function getImageFromDomain(Response $response, string $type): Response
 			return $response;
 		}
 
-		if ($type === 'logo') {
-			$file = $this->companyService->getThemeFile('core/img/logo.png');
-			$mime = 'image/png';
-		} elseif ($type === 'favicon') {
-			$file = $this->companyService->getThemeFile('core/img/favicon.png');
-			$mime = 'image/png';
-		} elseif ($type === 'background') {
-			$file = $this->companyService->getThemeFile('core/img/background.png');
-			$mime = 'image/png';
-		} else {
-			return new NotFoundResponse();
-		}
+		$file = $this->companyService->getThemeFile('core/img/' . $type);
 
 		if ($response instanceof NotFoundResponse) {
 			$response = new FileDisplayResponse($file);
 			$csp = new ContentSecurityPolicy();
 			$csp->allowInlineStyle();
 			$response->cacheFor(3600);
-			$response->addHeader('Content-Type', $mime);
+			$response->addHeader('Content-Type', $file->getMimeType());
 			$response->addHeader('Content-Disposition', 'attachment; filename="' . $type . '"');
 			$response->setContentSecurityPolicy($csp);
 		} else {

diff --git a/lib/Service/CompanyService.php b/lib/Service/CompanyService.php
@@ -142,13 +142,15 @@ public function getCompanyCode(): string {
 
 	public function getThemeFile($name): ISimpleFile {
 		$folder = $this->getThemeFolder($this->getCompanyCode());
-		try {
-			$file = $folder->getFile($name);
-		} catch (NotFoundException $e) {
-			$folder = $this->getThemeFolder('default');
-			$file = $folder->getFile($name);
+		foreach (['png', 'jpg', 'svg'] as $extension) {
+			try {
+				return $folder->getFile($name . '.' . $extension);
+			} catch (NotFoundException $e) {
+				continue;
+			}
 		}
-		return $file;
+		$folder = $this->getThemeFolder('default');
+		return $folder->getFile($name);
 	}
 
 	private function getThemeFolder(string $folderName): ISimpleFolder {