fixup! Restore old behavior allowing to set custom appstore

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Dec 19, 2019 · 389bb41 · 389bb41
1 parent c20b01b
commit 389bb41
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -68,7 +68,6 @@ public function __construct(Factory $appDataFactory,
 		);
 
 		$this->fileName = 'apps.json';
-		$this->endpointUrl = $this->getEndpoint($this->fileName);
 		$this->compareVersion = $compareVersion;
 		$this->ignoreMaxVersion = true;
 	}

diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
@@ -53,6 +53,5 @@ public function __construct(Factory $appDataFactory,
 			$logger
 		);
 		$this->fileName = 'categories.json';
-		$this->endpointUrl = $this->getEndpoint($this->fileName);
 	}
 }
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -55,8 +55,6 @@ abstract class Fetcher {
 	/** @var string */
 	protected $fileName;
 	/** @var string */
-	protected $endpointUrl;
-	/** @var string */
 	protected $version;
 	/** @var string */
 	protected $channel;
@@ -106,7 +104,7 @@ protected function fetch($ETag, $content) {
 		}
 
 		$client = $this->clientService->newClient();
-		$response = $client->get($this->endpointUrl, $options);
+		$response = $client->get($this->getEndpoint(), $options);
 
 		$responseJson = [];
 		if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
@@ -220,7 +218,7 @@ public function setChannel(string $channel) {
 		$this->channel = $channel;
 	}
 
-	protected function getEndpoint(string $fileName): string {
-		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $fileName;
+	protected function getEndpoint(): string {
+		return $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1') . '/' . $this->fileName;
 	}
 }
diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
@@ -137,6 +137,11 @@ public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion() {
 		$this->config
 			->expects($this->at(3))
 			->method('getSystemValue')
+			->with('appstoreurl', 'https://apps.nextcloud.com/api/v1')
+			->willReturn('https://apps.nextcloud.com/api/v1');
+		$this->config
+			->expects($this->at(4))
+			->method('getSystemValue')
 			->with(
 				$this->equalTo('version'),
 				$this->anything()
@@ -298,6 +303,11 @@ public function testGetWithAlreadyExistingFileAndNoVersion() {
 		$this->config
 			->expects($this->at(3))
 			->method('getSystemValue')
+			->with('appstoreurl', 'https://apps.nextcloud.com/api/v1')
+			->willReturn('https://apps.nextcloud.com/api/v1');
+		$this->config
+			->expects($this->at(4))
+			->method('getSystemValue')
 			->with(
 				$this->equalTo('version'),
 				$this->anything()
@@ -382,6 +392,11 @@ public function testGetWithAlreadyExistingFileAndOutdatedVersion() {
 		$this->config
 			->expects($this->at(3))
 			->method('getSystemValue')
+			->with('appstoreurl', 'https://apps.nextcloud.com/api/v1')
+			->willReturn('https://apps.nextcloud.com/api/v1');
+		$this->config
+			->expects($this->at(4))
+			->method('getSystemValue')
 			->with(
 				$this->equalTo('version'),
 				$this->anything()