Merge pull request #19159 from nextcloud/stable17-backport/18786

[stable17] AppFetcher: Distinguish between fileName and endpointName

lib/private/App/AppStore/Fetcher/AppFetcher.php

@@ -66,6 +66,7 @@ class AppFetcher extends Fetcher {
 		);
 
 		$this->fileName = 'apps.json';
+		$this->endpointName = 'apps.json';
 		$this->compareVersion = $compareVersion;
 		$this->ignoreMaxVersion = true;
 	}

lib/private/App/AppStore/Fetcher/CategoryFetcher.php

@@ -53,5 +53,6 @@ class CategoryFetcher extends Fetcher {
 			$logger
 		);
 		$this->fileName = 'categories.json';
+		$this->endpointName = 'categories.json';
 	}
 }

lib/private/App/AppStore/Fetcher/Fetcher.php

@@ -54,6 +54,8 @@ abstract class Fetcher {
 	/** @var string */
 	protected $fileName;
 	/** @var string */
+	protected $endpointName;
+	/** @var string */
 	protected $version;
 	/** @var string */
 	protected $channel;
@@ -218,6 +220,6 @@ abstract class Fetcher {
 	}
 
 	protected function getEndpoint(): string {
-		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->fileName;
+		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->endpointName;
 	}
 }