Skip to content

feat(occ): Better handling of disabled or unreacheable App store #49697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
solracsf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(occ): Better handling of disabled or unreacheable App store #49697

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions core/Command/App/Update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

use OC\Installer;
use OCP\App\IAppManager;
use OCP\IConfig;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
Expand All @@ -18,8 +19,11 @@
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,
) {
Expand Down Expand Up @@ -57,6 +61,19 @@ protected function configure(): void {
}

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;

Expand Down
Loading