Enable multiple apps at once

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

core/Command/App/Enable.php

@@ -26,8 +26,10 @@
 
 namespace OC\Core\Command\App;
 
+use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
 use OCP\IGroup;
+use OCP\IGroupManager;
 use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 use Symfony\Component\Console\Command\Command;
@@ -39,23 +41,31 @@ use Symfony\Component\Console\Output\OutputInterface;
 class Enable extends Command implements CompletionAwareInterface {
 
 	/** @var IAppManager */
-	protected $manager;
+	protected $appManager;
+
+	/** @var IGroupManager */
+	protected $groupManager;
+
+	/** @var int */
+	protected $exitCode = 0;
 
 	/**
-	 * @param IAppManager $manager
+	 * @param IAppManager $appManager
+	 * @param IGroupManager $groupManager
 	 */
-	public function __construct(IAppManager $manager) {
+	public function __construct(IAppManager $appManager, IGroupManager $groupManager) {
 		parent::__construct();
-		$this->manager = $manager;
+		$this->appManager = $appManager;
+		$this->groupManager = $groupManager;
 	}
 
-	protected function configure() {
+	protected function configure(): void {
 		$this
 			->setName('app:enable')
 			->setDescription('enable an app')
 			->addArgument(
 				'app-id',
-				InputArgument::REQUIRED,
+				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
 				'enable the specified app'
 			)
 			->addOption(
@@ -63,28 +73,60 @@ class Enable extends Command implements CompletionAwareInterface {
 				'g',
 				InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
 				'enable the app only for a list of groups'
-			)
+			);
-		;
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
+		$appIds = $input->getArgument('app-id');
+		$groups = $this->resolveGroupIds($input->getOption('groups'));
 
-		if (!\OC_App::getAppPath($appId)) {
+		foreach ($appIds as $appId) {
-			$output->writeln($appId . ' not found');
+			$this->enableApp($appId, $groups, $output);
-			return 1;
 		}
 
-		$groups = $input->getOption('groups');
+		return $this->exitCode;
-		$appClass = new \OC_App();
+	}
-		if (empty($groups)) {
+
-			$appClass->enable($appId);
+	/**
+	 * @param string $appId
+	 * @param array $groupIds
+	 * @param OutputInterface $output
+	 */
+	private function enableApp(string $appId, array $groupIds, OutputInterface $output): void {
+		$groupNames = array_map(function (IGroup $group) {
+			return $group->getDisplayName();
+		}, $groupIds);
+
+		try {
+			if ($groupIds === []) {
+				$this->appManager->enableApp($appId);
 				$output->writeln($appId . ' enabled');
 			} else {
-			$appClass->enable($appId, $groups);
+				$this->appManager->enableAppForGroups($appId, $groupIds);
-			$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
+				$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groupNames));
 			}
-		return 0;
+		} catch (AppPathNotFoundException $e) {
+			$output->writeln($appId . ' not found');
+			$this->exitCode = 1;
+		} catch (\Exception $e) {
+			$output->writeln($e->getMessage());
+			$this->exitCode = 1;
+		}
+	}
+
+	/**
+	 * @param array $groupIds
+	 * @return array
+	 */
+	private function resolveGroupIds(array $groupIds): array {
+		$groups = [];
+		foreach ($groupIds as $groupId) {
+			$group = $this->groupManager->get($groupId);
+			if ($group instanceof IGroup) {
+				$groups[] = $group;
+			}
+		}
+		return $groups;
 	}
 
 	/**
@@ -94,7 +136,7 @@ class Enable extends Command implements CompletionAwareInterface {
 	 */
 	public function completeOptionValues($optionName, CompletionContext $context) {
 		if ($optionName === 'groups') {
-			return array_map(function(IGroup $group) {
+			return array_map(function (IGroup $group) {
 				return $group->getGID();
 			}, \OC::$server->getGroupManager()->search($context->getCurrentWord()));
 		}

core/register_command.php

@@ -61,7 +61,7 @@ $application->add(new \OC\Core\Command\Integrity\CheckCore(
 
 if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\App\Disable(\OC::$server->getAppManager()));
-	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager()));
+	$application->add(new OC\Core\Command\App\Enable(\OC::$server->getAppManager(), \OC::$server->getGroupManager()));
 	$application->add(new OC\Core\Command\App\Install());
 	$application->add(new OC\Core\Command\App\GetPath());
 	$application->add(new OC\Core\Command\App\ListApps(\OC::$server->getAppManager()));

tests/Core/Command/Apps/AppsEnableTest.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * @copyright Copyright (c) 2019, Daniel Kesselberg (mail@danielkesselberg.de)
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Tests\Core\Command\Config;
+
+use OC\Core\Command\App\Enable;
+use Symfony\Component\Console\Tester\CommandTester;
+use Test\TestCase;
+
+/**
+ * Class AppsEnableTest
+ *
+ * @group DB
+ */
+class AppsEnableTest extends TestCase {
+
+	/** @var CommandTester */
+	private $commandTester;
+
+	public function setUp() {
+		parent::setUp();
+
+		$command = new Enable(
+			\OC::$server->getAppManager(),
+			\OC::$server->getGroupManager()
+		);
+
+		$this->commandTester = new CommandTester($command);
+	}
+
+	/**
+	 * @dataProvider dataCommandInput
+	 * @param $appId
+	 * @param $groups
+	 * @param $statusCode
+	 * @param $output
+	 */
+	public function testCommandInput($appId, $groups, $statusCode, $output) {
+		$input = ['app-id' => $appId];
+
+		if (is_array($groups)) {
+			$input['--groups'] = $groups;
+		}
+
+		$this->commandTester->execute($input);
+
+		$this->assertContains($output, $this->commandTester->getDisplay());
+		$this->assertSame($statusCode, $this->commandTester->getStatusCode());
+	}
+
+	public function dataCommandInput() {
+		return [
+			[['admin_audit'], null, 0, 'admin_audit enabled'],
+			[['comments'], null, 0, 'comments enabled'],
+			[['invalid_app'], null, 1, 'invalid_app not found'],
+
+			[['admin_audit', 'comments'], null, 0, "admin_audit enabled\ncomments enabled"],
+			[['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit enabled\ncomments enabled\ninvalid_app not found"],
+
+			[['admin_audit'], ['admin'], 1, "admin_audit can't be enabled for groups"],
+			[['comments'], ['admin'], 1, "comments can't be enabled for groups"],
+
+			[['updatenotification'], ['admin'], 0, 'updatenotification enabled for groups: admin'],
+			[['updatenotification', 'logreader'], ['admin'], 0, "updatenotification enabled for groups: admin\nlogreader enabled for groups: admin"],
+
+			[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification enabled for groups: admin'],
+			[['updatenotification', 'logreader'], ['admin', 'invalid_group'], 0, "updatenotification enabled for groups: admin\nlogreader enabled for groups: admin"],
+			[['updatenotification', 'logreader', 'invalid_app'], ['admin', 'invalid_group'], 0, "updatenotification enabled for groups: admin\nlogreader enabled for groups: admin"],
+		];
+	}
+}