fixup! Add check-group command

Signed-off-by: Côme Chilliet <[email protected]>

apps/user_ldap/appinfo/info.xml

@@ -48,6 +48,7 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc
 
 	<commands>
 		<command>OCA\User_LDAP\Command\CheckUser</command>
+		<command>OCA\User_LDAP\Command\CheckGroup</command>
 		<command>OCA\User_LDAP\Command\CreateEmptyConfig</command>
 		<command>OCA\User_LDAP\Command\DeleteConfig</command>
 		<command>OCA\User_LDAP\Command\ResetGroup</command>

apps/user_ldap/lib/Command/CheckGroup.php

@@ -33,6 +33,7 @@
 use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\Mapping\GroupMapping;
 use OCA\User_LDAP\Group_Proxy;
+use OCA\User_LDAP\Service\UpdateGroupsService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -41,6 +42,7 @@
 
 class CheckGroup extends Command {
 	public function __construct(
+		private UpdateGroupsService $service,
 		protected Group_Proxy $backend,
 		protected Helper $helper,
 		protected GroupMapping $mapping,
@@ -87,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			if ($exists === true) {
 				$output->writeln('The group is still available on LDAP.');
 				if ($input->getOption('update')) {
-					$this->updateGroup($gid, $output);
+					$this->updateGroup($gid, $output, $wasMapped);
 				}
 				return 0;
 			} elseif ($wasMapped) {
@@ -126,23 +128,13 @@ protected function assertAllowed(bool $force): void {
 		// background job.
 	}
 
-	private function updateGroup(string $gid, OutputInterface $output): void {
+	private function updateGroup(string $gid, OutputInterface $output, bool $wasMapped): void {
 		try {
-			$access = $this->backend->getLDAPAccess($gid);
-			$attrs = $access->userManager->getAttributes();
-			$user = $access->userManager->get($gid);
-			$avatarAttributes = $access->getConnection()->resolveRule('avatar');
-			$result = $access->search('objectclass=*', $user->getDN(), $attrs, 1, 0);
-			foreach ($result[0] as $attribute => $valueSet) {
-				$output->writeln('  ' . $attribute . ': ');
-				foreach ($valueSet as $value) {
-					if (in_array($attribute, $avatarAttributes)) {
-						$value = '{ImageData}';
-					}
-					$output->writeln('    ' . $value);
-				}
+			if ($wasMapped) {
+				$this->service->handleKnownGroups([$gid]);
+			} else {
+				$this->service->handleCreatedGroups([$gid]);
 			}
-			$access->batchApplyUserAttributes($result);
 		} catch (\Exception $e) {
 			$output->writeln('<error>Error while trying to lookup and update attributes from LDAP</error>');
 		}

apps/user_ldap/lib/Service/UpdateGroupsService.php

@@ -147,13 +147,19 @@ public function handleCreatedGroups(array $createdGroups): void {
 			$this->logger->info('service "updateGroups" – new group "' . $createdGroup . '" found.');
 
 			$users = $this->groupBackend->usersInGroup($createdGroup);
-			foreach ($users as $user) {
-				$this->groupMembershipMapper->insert(GroupMembership::fromParams(['groupid' => $createdGroup,'userid' => $user]));
-			}
 			$groupObject = $this->groupManager->get($group);
 			if ($groupObject instanceof IGroup) {
 				$this->dispatcher->dispatchTyped(new GroupCreatedEvent($groupObject));
 			}
+			foreach ($users as $user) {
+				$this->groupMembershipMapper->insert(GroupMembership::fromParams(['groupid' => $createdGroup,'userid' => $user]));
+				if ($groupObject instanceof IGroup) {
+					$userObject = $this->userManager->get($user);
+					if ($userObject instanceof IUser) {
+						$this->dispatcher->dispatchTyped(new UserAddedEvent($groupObject, $userObject));
+					}
+				}
+			}
 		}
 		$this->logger->debug('service "updateGroups" – FINISHED dealing with created Groups.');
 	}