Restore old behavior allowing to set custom appstore

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
nextcloud · Dec 17, 2019 · 9d4cee8 · 9d4cee8
1 parent 76895b6
commit 9d4cee8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -144,7 +144,8 @@ protected function fetch($ETag, $content) {
 	}
 
 	private function setEndpoint() {
-		$this->endpointUrl = 'https://apps.nextcloud.com/api/v1/apps.json';
+		$endpoint = $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1');
+		$this->endpointUrl = $endpoint . '/apps.json';
 	}
 
 	/**

diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
@@ -53,6 +53,8 @@ public function __construct(Factory $appDataFactory,
 			$logger
 		);
 		$this->fileName = 'categories.json';
-		$this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
+
+		$endpoint = $this->config->getSystemValue('appstoreurl', 'https://apps.nextcloud.com/api/v1');
+		$this->endpointUrl = $endpoint . '/categories.json';
 	}
 }
diff --git a/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php b/tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
@@ -92,6 +92,8 @@ public function testGetWithFilter() {
 					return true;
 				} else if ($key === 'version') {
 					return '11.0.0.2';
+				} else if ($key === 'appstoreurl' && $default === 'https://apps.nextcloud.com/api/v1') {
+					return 'https://custom.appsstore.endpoint/api/v1';
 				} else {
 					return $default;
 				}
@@ -122,7 +124,7 @@ public function testGetWithFilter() {
 		$response = $this->createMock(IResponse::class);
 		$client
 			->method('get')
-			->with('https://apps.nextcloud.com/api/v1/apps.json')
+			->with('https://custom.appsstore.endpoint/api/v1/apps.json')
 			->willReturn($response);
 		$response
 			->expects($this->once())