mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

AppFetcher: Distinguish between fileName and endpointName
This commit is contained in:
Roeland Jago Douma 2020-01-12 21:08:46 +01:00 committed by GitHub
parent e39d96af3d 2f89f5fd13
commit 11cae98394
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1867 additions and 1781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/private/App/AppStore/Fetcher/AppFetcher.php
View File

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

1
lib/private/App/AppStore/Fetcher/CategoryFetcher.php
View File

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

4
lib/private/App/AppStore/Fetcher/Fetcher.php
View File

@ -55,6 +55,8 @@ abstract class Fetcher {
/** @var string */ /** @var string */
protected $fileName; protected $fileName;
/** @var string */ /** @var string */
protected $endpointName;
/** @var string */
protected $version; protected $version;
/** @var string */ /** @var string */
protected $channel; protected $channel;
@ -219,6 +221,6 @@ abstract class Fetcher {
} }
protected function getEndpoint(): string { 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;
} }
} }

3642
tests/lib/App/AppStore/Fetcher/AppFetcherTest.php
View File

File diff suppressed because one or more lines are too long