Skip to content

feat(core): show group restrictions in occ app:list #64290

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
GnarlyLion wants to merge 1 commit into
base: master
Choose a base branch
from
+76 −1
Open

feat(core): show group restrictions in occ app:list #64290

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion core/Command/App/ListApps.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int

sort($enabledApps);
foreach ($enabledApps as $app) {
$apps['enabled'][$app] = $versions[$app] ?? true;
$groups = $this->appManager->getAppRestriction($app);
if (!empty($groups)) {
$apps['enabled'][$app] = [
'version' => $versions[$app] ?? true,
'groups' => $groups,
];
} else {
$apps['enabled'][$app] = $versions[$app] ?? true;
}
}
}

Expand Down
67 changes: 67 additions & 0 deletions tests/Core/Command/Apps/ListAppsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?php

declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace Tests\Core\Command\Config;

use OC\Core\Command\App\ListApps;
use OCP\App\IAppManager;
use OCP\Server;
use Symfony\Component\Console\Tester\CommandTester;
use Test\TestCase;

/**
* Class ListAppsTest
*/
#[\PHPUnit\Framework\Attributes\Group('DB')]
class ListAppsTest extends TestCase {
/** @var CommandTester */
private $commandTester;

/** @var IAppManager */
private $appManager;

#[\Override]
protected function setUp(): void {
parent::setUp();

$this->appManager = Server::get(IAppManager::class);
$command = new ListApps($this->appManager);
$this->commandTester = new CommandTester($command);

$this->appManager->disableApp('updatenotification');
}

#[\Override]
protected function tearDown(): void {
$this->appManager->disableApp('updatenotification');
parent::tearDown();
}

public function testEnabledAppWithoutGroupRestrictionHasNoGroupsKey(): void {
$this->appManager->enableApp('updatenotification');

$this->commandTester->execute(['--output' => 'json']);

$apps = json_decode($this->commandTester->getDisplay(), true);

$this->assertArrayHasKey('updatenotification', $apps['enabled']);
$this->assertIsNotArray($apps['enabled']['updatenotification']);
}

public function testEnabledAppWithGroupRestrictionShowsGroups(): void {
$this->appManager->enableAppForGroups('updatenotification', ['admin']);

$this->commandTester->execute(['--output' => 'json']);

$apps = json_decode($this->commandTester->getDisplay(), true);

$this->assertArrayHasKey('updatenotification', $apps['enabled']);
$this->assertIsArray($apps['enabled']['updatenotification']);
$this->assertSame(['admin'], $apps['enabled']['updatenotification']['groups']);
}
}