feat: allow getting shares by group id

Signed-off-by: Robin Appelman <[email protected]>

Author: icewind1991

apps/files_sharing/lib/Listener/UserAddedToGroupListener.php

@@ -8,6 +8,7 @@
  */
 namespace OCA\Files_Sharing\Listener;
 
+use OC\Share20\DefaultShareProvider;
 use OCA\Files_Sharing\AppInfo\Application;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -16,7 +17,6 @@
 use OCP\IConfig;
 use OCP\Share\Events\UserAddedToShareEvent;
 use OCP\Share\IManager;
-use OCP\Share\IShare;
 
 /** @template-implements IEventListener<UserAddedEvent> */
 class UserAddedToGroupListener implements IEventListener {
@@ -25,6 +25,7 @@ public function __construct(
 		private readonly IManager $shareManager,
 		private readonly IConfig $config,
 		private readonly IEventDispatcher $eventDispatcher,
+		private readonly DefaultShareProvider $shareProvider,
 	) {
 	}
 
@@ -36,16 +37,9 @@ public function handle(Event $event): void {
 		$user = $event->getUser();
 		$group = $event->getGroup();
 
-		// todo: add a way to get shares by group id
-		// Get all group shares this user has access to now to filter later
-		$shares = $this->shareManager->getSharedWith($user->getUID(), IShare::TYPE_GROUP, null, -1);
+		$shares = $this->shareProvider->getSharedWithGroup($group->getGID());
 
 		foreach ($shares as $share) {
-			// If this is not the new group we can skip it
-			if ($share->getSharedWith() !== $group->getGID()) {
-				continue;
-			}
-
 			// Accept the share if needed
 			if ($this->hasAutoAccept($user->getUID())) {
 				$this->shareManager->acceptShare($share, $user->getUID());

apps/files_sharing/lib/Listener/UserRemovedFromGroupListener.php

@@ -8,20 +8,19 @@
  */
 namespace OCA\Files_Sharing\Listener;
 
+use OC\Share20\DefaultShareProvider;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Group\Events\UserRemovedEvent;
 use OCP\Share\Events\UserRemovedFromShareEvent;
-use OCP\Share\IManager;
-use OCP\Share\IShare;
 
 /** @template-implements IEventListener<UserRemovedEvent> */
 class UserRemovedFromGroupListener implements IEventListener {
 
 	public function __construct(
-		private readonly IManager $shareManager,
 		private readonly IEventDispatcher $eventDispatcher,
+		private readonly DefaultShareProvider $shareProvider,
 	) {
 	}
 
@@ -33,23 +32,9 @@ public function handle(Event $event): void {
 		$user = $event->getUser();
 		$group = $event->getGroup();
 
-		// todo: add a way to get shares by group id
-		$groupUsers = $group->getUsers();
-		$groupUser = current($groupUsers);
-		if ($groupUser) {
-			// get the shares from a user still in the group
-			$shares = $this->shareManager->getSharedWith($groupUser->getUID(), IShare::TYPE_GROUP, null, -1);
-		} else {
-			// if nobody is in the group anymore we current have to go through all shares
-			$shares = $this->shareManager->getAllShares();
-		}
+		$shares = $this->shareProvider->getSharedWithGroup($group->getGID());
 
 		foreach ($shares as $share) {
-			// If this is not the new group we can skip it
-			if ($share->getShareType() === IShare::TYPE_GROUP && $share->getSharedWith() !== $group->getGID()) {
-				continue;
-			}
-
 			$this->eventDispatcher->dispatchTyped(new UserRemovedFromShareEvent($share, $user));
 		}
 	}

lib/private/Share20/DefaultShareProvider.php

@@ -948,6 +948,39 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset) {
 		return $shares;
 	}
 
+	/**
+	 * Get all shares shared with a group
+	 *
+	 * @return Share[]
+	 */
+	public function getSharedWithGroup(string $groupId): array {
+		/** @var Share[] $shares */
+		$shares = [];
+		$qb = $this->dbConn->getQueryBuilder();
+		$qb->select('s.*',
+			'f.fileid', 'f.path', 'f.permissions AS f_permissions', 'f.storage', 'f.path_hash',
+			'f.parent AS f_parent', 'f.name', 'f.mimetype', 'f.mimepart', 'f.size', 'f.mtime', 'f.storage_mtime',
+			'f.encrypted', 'f.unencrypted_size', 'f.etag', 'f.checksum'
+		)
+			->selectAlias('st.id', 'storage_string_id')
+			->from('share', 's')
+			->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
+			->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
+			->orderBy('s.id');
+
+		$qb->andWhere($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_GROUP)))
+			->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($groupId)))
+			->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));
+
+		$cursor = $qb->executeQuery();
+		while ($data = $cursor->fetch()) {
+			$share = $this->createShare($data);
+			$shares[$share->getId()] = $share;
+		}
+
+		return $shares;
+	}
+
 	/**
 	 * Get a share by token
 	 *