Merge pull request #20772 from nextcloud/fix/sharee-integration-test

Properly search for users when limittogroups is enabled

Author: MorrisJobke

lib/private/Collaboration/Collaborators/UserPlugin.php

@@ -95,7 +95,15 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
 				$usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset);
 				foreach ($usersInGroup as $userId => $displayName) {
 					$userId = (string) $userId;
-					$users[$userId] = $this->userManager->get($userId);
+					$user = $this->userManager->get($userId);
+					if (!$user->isEnabled()) {
+						// Ignore disabled users
+						continue;
+					}
+					$users[$userId] = $user;
+				}
+				if (count($usersInGroup) >= $limit) {
+					$hasMoreResults = true;
 				}
 			}
 		} else {

tests/lib/Collaboration/Collaborators/UserPluginTest.php

@@ -328,7 +328,7 @@ public function dataGetUsers() {
 					['label' => 'Test One', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test1'], 'status' => []],
 					['label' => 'Test Two', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test2'], 'status' => []],
 				],
-				false,
+				true,
 				false,
 				[
 					['test1', $this->getUserMock('test1', 'Test One')],