-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #945 from nextcloud/backport/926/stable22
[stable22] allow configuration of one single password per circle
- Loading branch information
Showing
16 changed files
with
533 additions
and
135 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
|
|
||
| /** | ||
| * Circles - Bring cloud-users closer together. | ||
| * | ||
| * This file is licensed under the Affero General Public License version 3 or | ||
| * later. See the COPYING file. | ||
| * | ||
| * @author Maxence Lange <maxence@artificial-owl.com> | ||
| * @copyright 2022 | ||
| * @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 OCA\Circles\Command; | ||
|
|
||
| use OC\Core\Command\Base; | ||
| use OCA\Circles\Exceptions\CircleNotFoundException; | ||
| use OCA\Circles\Exceptions\FederatedEventException; | ||
| use OCA\Circles\Exceptions\FederatedItemException; | ||
| use OCA\Circles\Exceptions\FederatedUserException; | ||
| use OCA\Circles\Exceptions\FederatedUserNotFoundException; | ||
| use OCA\Circles\Exceptions\InitiatorNotConfirmedException; | ||
| use OCA\Circles\Exceptions\InitiatorNotFoundException; | ||
| use OCA\Circles\Exceptions\InvalidIdException; | ||
| use OCA\Circles\Exceptions\MemberNotFoundException; | ||
| use OCA\Circles\Exceptions\OwnerNotFoundException; | ||
| use OCA\Circles\Exceptions\RemoteInstanceException; | ||
| use OCA\Circles\Exceptions\RemoteNotFoundException; | ||
| use OCA\Circles\Exceptions\RemoteResourceNotFoundException; | ||
| use OCA\Circles\Exceptions\RequestBuilderException; | ||
| use OCA\Circles\Exceptions\SingleCircleNotFoundException; | ||
| use OCA\Circles\Exceptions\UnknownRemoteException; | ||
| use OCA\Circles\Exceptions\UserTypeNotFoundException; | ||
| use OCA\Circles\Model\Helpers\MemberHelper; | ||
| use OCA\Circles\Model\Member; | ||
| use OCA\Circles\Service\CircleService; | ||
| use OCA\Circles\Service\FederatedUserService; | ||
| use Symfony\Component\Console\Exception\InvalidArgumentException; | ||
| use Symfony\Component\Console\Input\InputArgument; | ||
| use Symfony\Component\Console\Input\InputInterface; | ||
| use Symfony\Component\Console\Input\InputOption; | ||
| use Symfony\Component\Console\Output\OutputInterface; | ||
|
|
||
| class CirclesSetting extends Base { | ||
|
|
||
|
|
||
| /** @var FederatedUserService */ | ||
| private $federatedUserService; | ||
|
|
||
| /** @var CircleService */ | ||
| private $circleService; | ||
|
|
||
|
|
||
| /** | ||
| * @param FederatedUserService $federatedUserService | ||
| * @param CircleService $circlesService | ||
| */ | ||
| public function __construct(FederatedUserService $federatedUserService, CircleService $circlesService) { | ||
| parent::__construct(); | ||
|
|
||
| $this->federatedUserService = $federatedUserService; | ||
| $this->circleService = $circlesService; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * | ||
| */ | ||
| protected function configure() { | ||
| parent::configure(); | ||
| $this->setName('circles:manage:setting') | ||
| ->setDescription('edit setting for a Circle') | ||
| ->addArgument('circle_id', InputArgument::REQUIRED, 'ID of the circle') | ||
| ->addArgument('setting', InputArgument::OPTIONAL, 'setting to edit', '') | ||
| ->addArgument('value', InputArgument::OPTIONAL, 'value', '') | ||
| ->addOption('unset', '', InputOption::VALUE_NONE, 'unset the setting') | ||
| ->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '') | ||
| ->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0') | ||
| ->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception'); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @param InputInterface $input | ||
| * @param OutputInterface $output | ||
| * | ||
| * @return int | ||
| * @throws FederatedEventException | ||
| * @throws FederatedItemException | ||
| * @throws InitiatorNotFoundException | ||
| * @throws RequestBuilderException | ||
| * @throws CircleNotFoundException | ||
| * @throws FederatedUserException | ||
| * @throws FederatedUserNotFoundException | ||
| * @throws InitiatorNotConfirmedException | ||
| * @throws InvalidIdException | ||
| * @throws MemberNotFoundException | ||
| * @throws OwnerNotFoundException | ||
| * @throws RemoteInstanceException | ||
| * @throws RemoteNotFoundException | ||
| * @throws RemoteResourceNotFoundException | ||
| * @throws SingleCircleNotFoundException | ||
| * @throws UnknownRemoteException | ||
| * @throws UserTypeNotFoundException | ||
| */ | ||
| protected function execute(InputInterface $input, OutputInterface $output): int { | ||
| $circleId = (string)$input->getArgument('circle_id'); | ||
| $setting = (string)$input->getArgument('setting'); | ||
| $value = (string)$input->getArgument('value'); | ||
|
|
||
| try { | ||
| $this->federatedUserService->commandLineInitiator( | ||
| $input->getOption('initiator'), | ||
| Member::parseTypeString($input->getOption('initiator-type')), | ||
| $circleId, | ||
| false | ||
| ); | ||
|
|
||
| if ($setting === '') { | ||
| $circle = $this->circleService->getCircle($circleId); | ||
| $initiatorHelper = new MemberHelper($circle->getInitiator()); | ||
| $initiatorHelper->mustBeAdmin(); | ||
| $output->writeln(json_encode($circle->getSettings(), JSON_PRETTY_PRINT)); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| if (!$input->getOption('unset') && $value === '') { | ||
| throw new InvalidArgumentException('you need to specify a value'); | ||
| } | ||
|
|
||
| $outcome = $this->circleService->updateSetting( | ||
| $circleId, | ||
| $setting, | ||
| ($input->getOption('unset')) ? null : $value, | ||
| ); | ||
| } catch (FederatedItemException $e) { | ||
| if ($input->getOption('status-code')) { | ||
| throw new FederatedItemException( | ||
| ' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage() | ||
| ); | ||
| } | ||
|
|
||
| throw $e; | ||
| } | ||
|
|
||
| if (strtolower($input->getOption('output')) === 'json') { | ||
| $output->writeln(json_encode($outcome, JSON_PRETTY_PRINT)); | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.