[stable25] Fix sharing with group

lib/Album/AlbumMapper.php

@@ -332,6 +332,40 @@ public function getCollaborators(int $albumId): array {
 		return array_values(array_filter($collaborators, fn ($c) => $c !== null));
 	}
 
+
+	/**
+	 * @param int $albumId
+	 * @param string $userId
+	 * @return bool
+	 */
+	public function isCollaborator(int $albumId, string $userId): bool {
+		$query = $this->connection->getQueryBuilder();
+		$query->select("collaborator_id", "collaborator_type")
+			->from("photos_albums_collabs")
+			->where($query->expr()->eq('album_id', $query->createNamedParameter($albumId, IQueryBuilder::PARAM_INT)));
+
+		$rows = $query->executeQuery()->fetchAll();
+
+		foreach ($rows as $row) {
+			switch ($row['collaborator_type']) {
+				case self::TYPE_USER:
+					if ($row['collaborator_id'] === $userId) {
+						return true;
+					}
+					break;
+				case self::TYPE_GROUP:
+					if ($this->groupManager->isInGroup($userId, $row['collaborator_id'])) {
+						return true;
+					}
+					break;
+				default:
+					break;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * @param int $albumId
 	 * @param array{'id': string, 'type': int} $collaborators

lib/Sabre/Album/SharedAlbumRoot.php

@@ -25,7 +25,6 @@
 
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\Conflict;
-use OCA\Photos\Album\AlbumMapper;
 
 class SharedAlbumRoot extends AlbumRoot {
 	/**
@@ -47,11 +46,7 @@ protected function addFile(int $sourceId, string $ownerUID): bool {
 			throw new Conflict("File $sourceId is already in the folder");
 		}
 
-		$collaboratorIds = array_map(
-			fn ($collaborator) => $collaborator['type'].':'.$collaborator['id'],
-			$this->albumMapper->getCollaborators($this->album->getAlbum()->getId()),
-		);
-		if (!in_array(AlbumMapper::TYPE_USER.':'.$this->userId, $collaboratorIds)) {
+		if (!$this->albumMapper->isCollaborator($this->album->getAlbum()->getId(), $this->userId)) {
 			return false;
 		}