upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 18:50:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #49697 from nextcloud/appStoreDisabledOcc

Browse source 
feat(occ): Better handling of disabled or unreacheable App store
This commit is contained in:
Benjamin Gaussorgues 2026-06-11 11:36:28 +02:00 committed by GitHub
commit 7269f43fab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/Command/App/Update.php
View file

@ -12,6 +12,7 @@ namespace OC\Core\Command\App;
use OC\Installer;
use OCP\App\AppPathNotFoundException;
use OCP\App\IAppManager;
use OCP\IConfig;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
@ -20,8 +21,11 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class Update extends Command {
public const APP_STORE_URL = 'https://apps.nextcloud.com/api/v1';
public function __construct(
protected IAppManager $manager,
protected IConfig $config,
private Installer $installer,
private LoggerInterface $logger,
) {
@ -67,6 +71,19 @@ class Update extends Command {
#[\Override]
protected function execute(InputInterface $input, OutputInterface $output): int {
$appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true);
if ($appStoreEnabled === false) {
$output->writeln('App store access is disabled');
return 1;
}
$internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true);
$isDefaultAppStore = $this->config->getSystemValueString('appstoreurl', self::APP_STORE_URL) === self::APP_STORE_URL;
if ($internetAvailable === false && $isDefaultAppStore === true) {
$output->writeln('Internet connection is disabled, and therefore the default public App store is not reachable');
return 1;
}
$singleAppId = $input->getArgument('app-id');
$updateFound = false;
$showOnly = $input->getOption('showonly') || $input->getOption('showcurrent');