Merge pull request #11143 from nextcloud/feature/2fa-occ-revamp

[Mandatory 2FA] occ commands revamp

1 files changed, 13 insertions, 6 deletions

diff --git a/core/Command/TwoFactorAuth/Enable.php b/core/Command/TwoFactorAuth/Enable.php
index 98e8b178cdb..4a9c12e686d 100644
--- a/core/Command/TwoFactorAuth/Enable.php
+++ b/core/Command/TwoFactorAuth/Enable.php
@@ -23,7 +23,7 @@
 
 namespace OC\Core\Command\TwoFactorAuth;
 
-use OC\Authentication\TwoFactorAuth\Manager;
+use OC\Authentication\TwoFactorAuth\ProviderManager;
 use OCP\IUserManager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -31,13 +31,13 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class Enable extends Base {
 
-	/** @var Manager */
+	/** @var ProviderManager */
 	private $manager;
 
 	/** @var IUserManager */
 	protected $userManager;
 
-	public function __construct(Manager $manager, IUserManager $userManager) {
+	public function __construct(ProviderManager $manager, IUserManager $userManager) {
 		parent::__construct('twofactorauth:enable');
 		$this->manager = $manager;
 		$this->userManager = $userManager;
@@ -49,17 +49,24 @@ class Enable extends Base {
 		$this->setName('twofactorauth:enable');
 		$this->setDescription('Enable two-factor authentication for a user');
 		$this->addArgument('uid', InputArgument::REQUIRED);
+		$this->addArgument('provider_id', InputArgument::REQUIRED);
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$uid = $input->getArgument('uid');
+		$providerId = $input->getArgument('provider_id');
 		$user = $this->userManager->get($uid);
 		if (is_null($user)) {
 			$output->writeln("<error>Invalid UID</error>");
-			return;
+			return 1;
+		}
+		if ($this->manager->tryEnableProviderFor($providerId, $user)) {
+			$output->writeln("Two-factor provider <options=bold>$providerId</> enabled for user <options=bold>$uid</>.");
+			return 0;
+		} else {
+			$output->writeln("<error>The provider does not support this operation.</error>");
+			return 2;
 		}
-		$this->manager->enableTwoFactorAuthentication($user);
-		$output->writeln("Two-factor authentication enabled for user $uid");
 	}
 
 }