From 37237dc1831d437e10ed47a2799443ba2831f684 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 28 Nov 2023 22:07:29 +0100 Subject: [PATCH] feat(LDAP): warn about demoting a group while promoting another Signed-off-by: Arthur Schiwon --- apps/user_ldap/lib/Command/PromoteGroup.php | 31 +++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/apps/user_ldap/lib/Command/PromoteGroup.php b/apps/user_ldap/lib/Command/PromoteGroup.php index 5fc3905414f..7ec18064332 100644 --- a/apps/user_ldap/lib/Command/PromoteGroup.php +++ b/apps/user_ldap/lib/Command/PromoteGroup.php @@ -61,21 +61,36 @@ class PromoteGroup extends Command { ); } + protected function formatGroupName(IGroup $group): string { + $idLabel = ''; + if ($group->getGID() !== $group->getDisplayName()) { + $idLabel = sprintf(' (Group ID: %s)', $group->getGID()); + } + return sprintf('%s%s', $group->getDisplayName(), $idLabel); + } + protected function promoteGroup(IGroup $group, InputInterface $input, OutputInterface $output): void { - if ($input->getOption('yes') === false) { - /** @var QuestionHelper $helper */ - $helper = $this->getHelper('question'); + $access = $this->backend->getLDAPAccess($group->getGID()); + $currentlyPromotedGroupId = $access->connection->ldapAdminGroup; + if ($currentlyPromotedGroupId === $group->getGID()) { + $output->writeln('The specified group is already promoted'); + return; + } - $idLabel = ''; - if ($group->getGID() !== $group->getDisplayName()) { - $idLabel = sprintf(' (Group ID: %s)', $group->getGID()); + if ($input->getOption('yes') === false) { + $currentlyPromotedGroup = $this->groupManager->get($currentlyPromotedGroupId); + $demoteLabel = ''; + if ($currentlyPromotedGroup instanceof IGroup && $this->backend->groupExists($currentlyPromotedGroup->getGID())) { + $groupNameLabel = $this->formatGroupName($currentlyPromotedGroup); + $demoteLabel = sprintf('and demote %s ', $groupNameLabel); } - $q = new Question(sprintf('Promote %s%s to the admin group (y|N)? ', $group->getDisplayName(), $idLabel)); + /** @var QuestionHelper $helper */ + $helper = $this->getHelper('question'); + $q = new Question(sprintf('Promote %s to the admin group %s(y|N)? ', $this->formatGroupName($group), $demoteLabel)); $input->setOption('yes', $helper->ask($input, $output, $q) === 'y'); } if ($input->getOption('yes') === true) { - $access = $this->backend->getLDAPAccess($group->getGID()); $access->connection->setConfiguration(['ldapAdminGroup' => $group->getGID()]); $access->connection->saveConfiguration(); $output->writeln(sprintf('Group %s was promoted', $group->getDisplayName())); -- 2.39.5