Merge pull request #18786 from nextcloud/bugfix/noid/fix_fileName_apiEndPointName_issue

AppFetcher: Distinguish between fileName and endpointName

3 files changed, 5 insertions, 1 deletions

diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
index 456b07190fb..d6affe4f09b 100644
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -68,6 +68,7 @@ class AppFetcher extends Fetcher {
 		);
 
 		$this->fileName = 'apps.json';
+		$this->endpointName = 'apps.json';
 		$this->compareVersion = $compareVersion;
 		$this->ignoreMaxVersion = true;
 	}
diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
index 904c401c153..7fd3969cd04 100644
--- a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
@@ -53,5 +53,6 @@ class CategoryFetcher extends Fetcher {
 			$logger
 		);
 		$this->fileName = 'categories.json';
+		$this->endpointName = 'categories.json';
 	}
 }
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
index 76a37bfa7de..224ed7d1f0d 100644
--- a/lib/private/App/AppStore/Fetcher/Fetcher.php
+++ b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -55,6 +55,8 @@ abstract class Fetcher {
 	/** @var string */
 	protected $fileName;
 	/** @var string */
+	protected $endpointName;
+	/** @var string */
 	protected $version;
 	/** @var string */
 	protected $channel;
@@ -219,6 +221,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;
 	}
 }