Merge pull request #2504 from nextcloud/backport/2502/stable33

[stable33] Feat: Add role-based filtering for circle member queries

Author: mejo-

lib/Controller/LocalController.php

@@ -473,15 +473,16 @@ public function probeCircles(int $limit = -1, int $offset = 0): DataResponse {
 	 * @param bool $fullDetails
 	 * @param int $limit
 	 * @param string $search
+	 * @param int|null $role
 	 *
 	 * @return DataResponse
 	 * @throws OCSException
 	 */
-	public function members(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = ''): DataResponse {
+	public function members(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = '', ?int $role = null): DataResponse {
 		try {
 			$this->setCurrentFederatedUser();
 
-			return new DataResponse($this->serializeArray($this->memberService->getMembers($circleId, $fullDetails, $limit, $search)));
+			return new DataResponse($this->serializeArray($this->memberService->getMembers($circleId, $fullDetails, $limit, $search, $role)));
 		} catch (Exception $e) {
 			$this->e($e, ['circleId' => $circleId]);
 			throw new OCSException($e->getMessage(), (int)$e->getCode());

lib/Db/MemberRequest.php

@@ -204,6 +204,7 @@ public function getMembers(
 		int $limit = 0,
 		bool $fullDetails = false,
 		string $search = '',
+		?int $role = null,
 	): array {
 		if (is_null($probe)) {
 			$probe = new MemberProbe();
@@ -257,6 +258,10 @@ public function getMembers(
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $probe->getFilterMember());
 		}
 
+		if ($role !== null) {
+			$qb->andWhere($qb->expr()->eq($qb->getDefaultSelectAlias() . '.level', $qb->createNamedParameter($role)));
+		}
+
 		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
 		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
 

lib/Service/MemberService.php

@@ -155,12 +155,13 @@ public function getMemberById(
 	 * @param bool $fullDetails
 	 * @param int $limit
 	 * @param string $search
+	 * @param ?int $role
 	 *
 	 * @return Member[]
 	 * @throws InitiatorNotFoundException
 	 * @throws RequestBuilderException
 	 */
-	public function getMembers(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = ''): array {
+	public function getMembers(string $circleId, bool $fullDetails = false, int $limit = 0, string $search = '', ?int $role = null): array {
 		$this->federatedUserService->mustHaveCurrentUser();
 
 		$probe = new MemberProbe();
@@ -176,7 +177,8 @@ public function getMembers(string $circleId, bool $fullDetails = false, int $lim
 			$probe,
 			$limit,
 			$fullDetails,
-			$search
+			$search,
+			$role,
 		);
 	}