Merge pull request #13850 from nextcloud/feature/11274/enable-disable-multiple-apps

Enable & disable multiple apps at once

.drone.yml

@@ -529,7 +529,6 @@ pipeline:
       image: nextcloudci/integration-php7.1:1
       commands:
         - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int
-        - ./occ app:enable user_ldap
         - cd build/integration
         - ./run.sh ldap_features/ldap-ocs.feature
       when:
@@ -544,7 +543,6 @@ pipeline:
         - ./occ config:system:set redis timeout --value=0 --type=integer
         - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
         - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
-        - ./occ app:enable user_ldap
         - cd build/integration
         - ./run.sh ldap_features/ldap-openldap.feature
       when:
@@ -559,7 +557,6 @@ pipeline:
           - ./occ config:system:set redis timeout --value=0 --type=integer
           - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
           - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
-          - ./occ app:enable user_ldap
           - cd build/integration
           - ./run.sh ldap_features/openldap-uid-username.feature
         when:
@@ -574,7 +571,6 @@ pipeline:
     - ./occ config:system:set redis timeout --value=0 --type=integer
     - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
     - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
-    - ./occ app:enable user_ldap
     - cd build/integration
     - ./run.sh ldap_features/openldap-numerical-id.feature
     when:

build/integration/run.sh

@@ -48,8 +48,7 @@ export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
 if [ "$INSTALLED" == "true" ]; then
 
     #Enable external storage app
-    $OCC app:enable files_external
+    $OCC app:enable files_external user_ldap
-    $OCC app:enable user_ldap
 
     mkdir -p work/local_storage
     OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=$PWD/work/local_storage`
@@ -71,8 +70,7 @@ if [ "$INSTALLED" == "true" ]; then
     $OCC files_external:delete -y $ID_STORAGE
 
     #Disable external storage app
-    $OCC app:disable files_external
+    $OCC app:disable files_external user_ldap
-    $OCC app:disable user_ldap
 fi
 
 if [ -z $HIDE_OC_LOGS ]; then

core/Command/App/Disable.php

@@ -36,39 +36,52 @@ use Symfony\Component\Console\Output\OutputInterface;
 class Disable extends Command implements CompletionAwareInterface {
 
 	/** @var IAppManager */
-	protected $manager;
+	protected $appManager;
+
+	/** @var int */
+	protected $exitCode = 0;
 
 	/**
-	 * @param IAppManager $manager
+	 * @param IAppManager $appManager
 	 */
-	public function __construct(IAppManager $manager) {
+	public function __construct(IAppManager $appManager) {
 		parent::__construct();
-		$this->manager = $manager;
+		$this->appManager = $appManager;
 	}
 
-	protected function configure() {
+	protected function configure(): void {
 		$this
 			->setName('app:disable')
 			->setDescription('disable an app')
 			->addArgument(
 				'app-id',
-				InputArgument::REQUIRED,
+				InputArgument::REQUIRED | InputArgument::IS_ARRAY,
 				'disable the specified app'
 			);
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$appId = $input->getArgument('app-id');
+		$appIds = $input->getArgument('app-id');
-		if ($this->manager->isInstalled($appId)) {
+
-			try {
+		foreach ($appIds as $appId) {
-				$this->manager->disableApp($appId);
+			$this->disableApp($appId, $output);
-				$output->writeln($appId . ' disabled');
+		}
-			} catch(\Exception $e) {
+
-				$output->writeln($e->getMessage());
+		return $this->exitCode;
-				return 2;
+	}
-			}
+
-		} else {
+	private function disableApp(string $appId, OutputInterface $output): void {
+		if ($this->appManager->isInstalled($appId) === false) {
 			$output->writeln('No such app enabled: ' . $appId);
+			return;
+		}
+
+		try {
+			$this->appManager->disableApp($appId);
+			$output->writeln($appId . ' disabled');
+		} catch (\Exception $e) {
+			$output->writeln($e->getMessage());
+			$this->exitCode = 2;
 		}
 	}
 
@@ -88,7 +101,7 @@ class Disable extends Command implements CompletionAwareInterface {
 	 */
 	public function completeArgumentValues($argumentName, CompletionContext $context) {
 		if ($argumentName === 'app-id') {
-			return array_diff(\OC_App::getEnabledApps(true, true), $this->manager->getAlwaysEnabledApps());
+			return array_diff(\OC_App::getEnabledApps(true, true), $this->appManager->getAlwaysEnabledApps());
 		}
 		return [];
 	}

core/Command/App/Enable.php

@@ -26,8 +26,11 @@
 
 namespace OC\Core\Command\App;
 
+use OC\Installer;
+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 +42,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 +74,70 @@ 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) {
+			$this->enableApp($appId, $groups, $output);
+		}
+
+		return $this->exitCode;
+	}
+
+	/**
+	 * @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 {
+			/** @var Installer $installer */
+			$installer = \OC::$server->query(Installer::class);
+
+			if (false === $installer->isDownloaded($appId)) {
+				$installer->downloadApp($appId);
+			}
+
+			$installer->installApp($appId);
+
+			if ($groupIds === []) {
+				$this->appManager->enableApp($appId);
+				$output->writeln($appId . ' enabled');
+			} else {
+				$this->appManager->enableAppForGroups($appId, $groupIds);
+				$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groupNames));
+			}
+		} catch (AppPathNotFoundException $e) {
 			$output->writeln($appId . ' not found');
-			return 1;
+			$this->exitCode = 1;
+		} catch (\Exception $e) {
+			$output->writeln($e->getMessage());
+			$this->exitCode = 1;
 		}
+	}
 
-		$groups = $input->getOption('groups');
+	/**
-		$appClass = new \OC_App();
+	 * @param array $groupIds
-		if (empty($groups)) {
+	 * @return array
-			$appClass->enable($appId);
+	 */
-			$output->writeln($appId . ' enabled');
+	private function resolveGroupIds(array $groupIds): array {
-		} else {
+		$groups = [];
-			$appClass->enable($appId, $groups);
+		foreach ($groupIds as $groupId) {
-			$output->writeln($appId . ' enabled for groups: ' . implode(', ', $groups));
+			$group = $this->groupManager->get($groupId);
+			if ($group instanceof IGroup) {
+				$groups[] = $group;
+			}
 		}
-		return 0;
+		return $groups;
 	}
 
 	/**
@@ -94,9 +147,9 @@ 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()));
+			}, $this->groupManager->search($context->getCurrentWord()));
 		}
 		return [];
 	}

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/AppsDisableTest.php

@@ -0,0 +1,85 @@
+<?php
+declare(strict_types=1);
+/**
+ * @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\Disable;
+use Symfony\Component\Console\Tester\CommandTester;
+use Test\TestCase;
+
+/**
+ * Class AppsDisableTest
+ *
+ * @group DB
+ */
+class AppsDisableTest extends TestCase {
+
+	/** @var CommandTester */
+	private $commandTester;
+
+	public function setUp() {
+		parent::setUp();
+
+		$command = new Disable(
+			\OC::$server->getAppManager()
+		);
+
+		$this->commandTester = new CommandTester($command);
+
+		\OC::$server->getAppManager()->enableApp('admin_audit');
+		\OC::$server->getAppManager()->enableApp('comments');
+	}
+
+	/**
+	 * @dataProvider dataCommandInput
+	 * @param $appId
+	 * @param $groups
+	 * @param $statusCode
+	 * @param $output
+	 */
+	public function testCommandInput($appId, $statusCode, $output): void {
+		$input = ['app-id' => $appId];
+
+		$this->commandTester->execute($input);
+
+		$this->assertContains($output, $this->commandTester->getDisplay());
+		$this->assertSame($statusCode, $this->commandTester->getStatusCode());
+	}
+
+	public function dataCommandInput(): array {
+		return [
+			[['admin_audit'], 0, 'admin_audit disabled'],
+			[['comments'], 0, 'comments disabled'],
+			[['invalid_app'], 0, 'No such app enabled: invalid_app'],
+
+			[['admin_audit', 'comments'], 0, "admin_audit disabled\ncomments disabled"],
+			[['admin_audit', 'comments', 'invalid_app'], 0, "admin_audit disabled\ncomments disabled\nNo such app enabled: invalid_app"],
+
+			[['files'], 2, "files can't be disabled"],
+			[['provisioning_api'], 2, "provisioning_api can't be disabled"],
+
+			[['files', 'admin_audit'], 2, "files can't be disabled.\nadmin_audit disabled"],
+			[['provisioning_api', 'comments'], 2, "provisioning_api can't be disabled.\ncomments disabled"],
+
+		];
+	}
+}

tests/Core/Command/Apps/AppsEnableTest.php

@@ -0,0 +1,93 @@
+<?php
+declare(strict_types=1);
+/**
+ * @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);
+
+		\OC::$server->getAppManager()->disableApp('admin_audit');
+		\OC::$server->getAppManager()->disableApp('comments');
+	}
+
+	/**
+	 * @dataProvider dataCommandInput
+	 * @param $appId
+	 * @param $groups
+	 * @param $statusCode
+	 * @param $output
+	 */
+	public function testCommandInput($appId, $groups, $statusCode, $output): void {
+		$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(): array {
+		return [
+			[['admin_audit'], null, 0, 'admin_audit enabled'],
+			[['comments'], null, 0, 'comments enabled'],
+			[['invalid_app'], null, 1, 'Could not download app invalid_app'],
+
+			[['admin_audit', 'comments'], null, 0, "admin_audit enabled\ncomments enabled"],
+			[['admin_audit', 'comments', 'invalid_app'], null, 1, "admin_audit enabled\ncomments enabled\nCould not download app invalid_app"],
+
+			[['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', 'contacts'], ['admin'], 0, "updatenotification enabled for groups: admin\ncontacts enabled for groups: admin"],
+
+			[['updatenotification'], ['admin', 'invalid_group'], 0, 'updatenotification enabled for groups: admin'],
+			[['updatenotification', 'contacts'], ['admin', 'invalid_group'], 0, "updatenotification enabled for groups: admin\ncontacts enabled for groups: admin"],
+			[['updatenotification', 'contacts', 'invalid_app'], ['admin', 'invalid_group'], 1, "updatenotification enabled for groups: admin\ncontacts enabled for groups: admin\nCould not download app invalid_app"],
+		];
+	}
+}