fix(provisioning_api): Fix getting disabled users for group admins

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index e1c60f3eb677cbfa741102b175250861f46f3b6b..ee8dcf9fb293451d5baf54a5b844fced63bc334e 100644 (file)
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -277,21 +277,21 @@ class UsersController extends AUserData {
                        /* We have to handle offset ourselve for correctness */
                        $tempLimit = ($limit === null ? null : $limit + $offset);
                        foreach ($subAdminOfGroups as $group) {
-                               $users = array_merge(
+                               $users = array_unique(array_merge(
                                        $users,
                                        array_map(
                                                fn (IUser $user): string => $user->getUID(),
                                                array_filter(
-                                                       $group->searchUsers($search, ($tempLimit === null ? null : $tempLimit - count($users))),
+                                                       $group->searchUsers($search),
                                                        fn (IUser $user): bool => !$user->isEnabled()
                                                )
                                        )
-                               );
+                               ));
                                if (($tempLimit !== null) && (count($users) >= $tempLimit)) {
                                        break;
                                }
                        }
-                       $users = array_slice($users, $offset);
+                       $users = array_slice($users, $offset, $limit);
                }
 
                $usersDetails = [];

diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index 56de45ba2d612a14d52f19d6c11e21c31a18dbab..cfb7f2d9543a3e0ebcf62540a4e8557da28c6abe 100644 (file)
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -244,7 +244,7 @@ class UsersControllerTest extends TestCase {
                $this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData());
        }
 
-       private function createUserMock(string $uid, bool $enabled): MockObject&IUser {
+       private function createUserMock(string $uid, bool $enabled): MockObject|IUser {
                $mockUser = $this->getMockBuilder(IUser::class)
                        ->disableOriginalConstructor()
                        ->getMock();