fix(mapper,service): Find all added groups instead of just one

This fix resolves an issue with displaying workspaces, which could trigger an error notification. A user can belong to multiple groups, and this change ensures that all groups are considered.
arawa · Jan 21, 2025 · 15b0a1e · 15b0a1e
1 parent 2a9e054
commit 15b0a1e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/Db/GroupFoldersGroupsMapper.php b/lib/Db/GroupFoldersGroupsMapper.php
@@ -93,7 +93,7 @@ public function findAllAddedGroups() : array {
 		return $this->findEntities($query);
 	}
 
-	public function findAddedGroup($groupfolderId) : ConnectedGroup|false {
+	public function findAddedGroups($groupfolderId) : array|false {
 		$qb = $this->db->getQueryBuilder();
 		$query = $qb
 			->select([ 'space_id', 'group_id as gid' ])
@@ -122,7 +122,7 @@ public function findAddedGroup($groupfolderId) : ConnectedGroup|false {
 			return false;
 		}
 
-		return $this->findEntity($query);
+		return $this->findEntities($query);
 	}
 
 	public function isUserConnectedGroup(string $uid, string $gid): mixed {

diff --git a/lib/Service/Group/ConnectedGroupsService.php b/lib/Service/Group/ConnectedGroupsService.php
@@ -160,15 +160,21 @@ public function add(IGroup $group, Space $space): bool {
 
 	public function isUserConnectedGroup(string $uid, int $groupfolderId): bool {
 
-		$connectedGroup = $this->mapper->findAddedGroup($groupfolderId);
+		$connectedGroups = $this->mapper->findAddedGroups($groupfolderId);
 
-		if ($connectedGroup === false) {
+		if ($connectedGroups === false) {
 			return false;
 		}
 
-		$group = $this->groupManager->get($connectedGroup->getGid());
 		$user = $this->userManager->get($uid);
+		$groups = array_map(fn ($group) => $this->groupManager->get($group->getGid()), $connectedGroups);
+
+		foreach($groups as $group) {
+			if ($group->inGroup($user)) {
+				return true;
+			}
+		}
 
-		return $group->inGroup($user);
+		return false;
 	}
 }