nextcloud / server

apps/provisioning_api/appinfo/routes.php

Indentation +60 added lines, -60 removed lines

@@ -6,68 +6,68 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 return [
-	'ocs' => [
-		// Apps
-		['root' => '/cloud', 'name' => 'Apps#getApps', 'url' => '/apps', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Apps#getAppInfo', 'url' => '/apps/{app}', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Apps#enable', 'url' => '/apps/{app}', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'Apps#disable', 'url' => '/apps/{app}', 'verb' => 'DELETE'],
+    'ocs' => [
+        // Apps
+        ['root' => '/cloud', 'name' => 'Apps#getApps', 'url' => '/apps', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Apps#getAppInfo', 'url' => '/apps/{app}', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Apps#enable', 'url' => '/apps/{app}', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'Apps#disable', 'url' => '/apps/{app}', 'verb' => 'DELETE'],
 
-		// Groups
-		['root' => '/cloud', 'name' => 'Groups#getGroups', 'url' => '/groups', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Groups#getGroupsDetails', 'url' => '/groups/details', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Groups#getGroupUsers', 'url' => '/groups/{groupId}/users', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
-		['root' => '/cloud', 'name' => 'Groups#getGroupUsersDetails', 'url' => '/groups/{groupId}/users/details', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
-		['root' => '/cloud', 'name' => 'Groups#getSubAdminsOfGroup', 'url' => '/groups/{groupId}/subadmins', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
-		['root' => '/cloud', 'name' => 'Groups#addGroup', 'url' => '/groups', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'Groups#getGroup', 'url' => '/groups/{groupId}', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
-		['root' => '/cloud', 'name' => 'Groups#updateGroup', 'url' => '/groups/{groupId}', 'verb' => 'PUT', 'requirements' => ['groupId' => '.+']],
-		['root' => '/cloud', 'name' => 'Groups#deleteGroup', 'url' => '/groups/{groupId}', 'verb' => 'DELETE', 'requirements' => ['groupId' => '.+']],
+        // Groups
+        ['root' => '/cloud', 'name' => 'Groups#getGroups', 'url' => '/groups', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Groups#getGroupsDetails', 'url' => '/groups/details', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Groups#getGroupUsers', 'url' => '/groups/{groupId}/users', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
+        ['root' => '/cloud', 'name' => 'Groups#getGroupUsersDetails', 'url' => '/groups/{groupId}/users/details', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
+        ['root' => '/cloud', 'name' => 'Groups#getSubAdminsOfGroup', 'url' => '/groups/{groupId}/subadmins', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
+        ['root' => '/cloud', 'name' => 'Groups#addGroup', 'url' => '/groups', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'Groups#getGroup', 'url' => '/groups/{groupId}', 'verb' => 'GET', 'requirements' => ['groupId' => '.+']],
+        ['root' => '/cloud', 'name' => 'Groups#updateGroup', 'url' => '/groups/{groupId}', 'verb' => 'PUT', 'requirements' => ['groupId' => '.+']],
+        ['root' => '/cloud', 'name' => 'Groups#deleteGroup', 'url' => '/groups/{groupId}', 'verb' => 'DELETE', 'requirements' => ['groupId' => '.+']],
 
-		// Users
-		['root' => '/cloud', 'name' => 'Users#getUsers', 'url' => '/users', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getUsersDetails', 'url' => '/users/details', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getDisabledUsersDetails', 'url' => '/users/disabled', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getLastLoggedInUsers', 'url' => '/users/recent', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#searchByPhoneNumbers', 'url' => '/users/search/by-phone', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'Users#addUser', 'url' => '/users', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'Users#getUser', 'url' => '/users/{userId}', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getEditableFields', 'url' => '/user/fields', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getEditableFieldsForUser', 'url' => '/user/fields/{userId}', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getEnabledApps', 'url' => '/user/apps', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#editUser', 'url' => '/users/{userId}', 'verb' => 'PUT'],
-		['root' => '/cloud', 'name' => 'Users#editUserMultiValue', 'url' => '/users/{userId}/{collectionName}', 'verb' => 'PUT', 'requirements' => ['collectionName' => '^(?!enable$|disable$)[a-zA-Z0-9_]*$']],
-		['root' => '/cloud', 'name' => 'Users#wipeUserDevices', 'url' => '/users/{userId}/wipe', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'Users#deleteUser', 'url' => '/users/{userId}', 'verb' => 'DELETE'],
-		['root' => '/cloud', 'name' => 'Users#enableUser', 'url' => '/users/{userId}/enable', 'verb' => 'PUT'],
-		['root' => '/cloud', 'name' => 'Users#disableUser', 'url' => '/users/{userId}/disable', 'verb' => 'PUT'],
-		['root' => '/cloud', 'name' => 'Users#getUsersGroups', 'url' => '/users/{userId}/groups', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getUsersGroupsDetails', 'url' => '/users/{userId}/groups/details', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#addToGroup', 'url' => '/users/{userId}/groups', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'Users#removeFromGroup', 'url' => '/users/{userId}/groups', 'verb' => 'DELETE'],
-		['root' => '/cloud', 'name' => 'Users#getUserSubAdminGroups', 'url' => '/users/{userId}/subadmins', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#getUserSubAdminGroupsDetails', 'url' => '/users/{userId}/subadmins/details', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'Users#addSubAdmin', 'url' => '/users/{userId}/subadmins', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'Users#removeSubAdmin', 'url' => '/users/{userId}/subadmins', 'verb' => 'DELETE'],
-		['root' => '/cloud', 'name' => 'Users#resendWelcomeMessage', 'url' => '/users/{userId}/welcome', 'verb' => 'POST'],
+        // Users
+        ['root' => '/cloud', 'name' => 'Users#getUsers', 'url' => '/users', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getUsersDetails', 'url' => '/users/details', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getDisabledUsersDetails', 'url' => '/users/disabled', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getLastLoggedInUsers', 'url' => '/users/recent', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#searchByPhoneNumbers', 'url' => '/users/search/by-phone', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'Users#addUser', 'url' => '/users', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'Users#getUser', 'url' => '/users/{userId}', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getEditableFields', 'url' => '/user/fields', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getEditableFieldsForUser', 'url' => '/user/fields/{userId}', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getEnabledApps', 'url' => '/user/apps', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#editUser', 'url' => '/users/{userId}', 'verb' => 'PUT'],
+        ['root' => '/cloud', 'name' => 'Users#editUserMultiValue', 'url' => '/users/{userId}/{collectionName}', 'verb' => 'PUT', 'requirements' => ['collectionName' => '^(?!enable$|disable$)[a-zA-Z0-9_]*$']],
+        ['root' => '/cloud', 'name' => 'Users#wipeUserDevices', 'url' => '/users/{userId}/wipe', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'Users#deleteUser', 'url' => '/users/{userId}', 'verb' => 'DELETE'],
+        ['root' => '/cloud', 'name' => 'Users#enableUser', 'url' => '/users/{userId}/enable', 'verb' => 'PUT'],
+        ['root' => '/cloud', 'name' => 'Users#disableUser', 'url' => '/users/{userId}/disable', 'verb' => 'PUT'],
+        ['root' => '/cloud', 'name' => 'Users#getUsersGroups', 'url' => '/users/{userId}/groups', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getUsersGroupsDetails', 'url' => '/users/{userId}/groups/details', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#addToGroup', 'url' => '/users/{userId}/groups', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'Users#removeFromGroup', 'url' => '/users/{userId}/groups', 'verb' => 'DELETE'],
+        ['root' => '/cloud', 'name' => 'Users#getUserSubAdminGroups', 'url' => '/users/{userId}/subadmins', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#getUserSubAdminGroupsDetails', 'url' => '/users/{userId}/subadmins/details', 'verb' => 'GET'],
+        ['root' => '/cloud', 'name' => 'Users#addSubAdmin', 'url' => '/users/{userId}/subadmins', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'Users#removeSubAdmin', 'url' => '/users/{userId}/subadmins', 'verb' => 'DELETE'],
+        ['root' => '/cloud', 'name' => 'Users#resendWelcomeMessage', 'url' => '/users/{userId}/welcome', 'verb' => 'POST'],
 
-		// Config
-		['name' => 'AppConfig#getApps', 'url' => '/api/v1/config/apps', 'verb' => 'GET'],
-		['name' => 'AppConfig#getKeys', 'url' => '/api/v1/config/apps/{app}', 'verb' => 'GET'],
-		['name' => 'AppConfig#getValue', 'url' => '/api/v1/config/apps/{app}/{key}', 'verb' => 'GET'],
-		['name' => 'AppConfig#setValue', 'url' => '/api/v1/config/apps/{app}/{key}', 'verb' => 'POST'],
-		['name' => 'AppConfig#deleteKey', 'url' => '/api/v1/config/apps/{app}/{key}', 'verb' => 'DELETE'],
+        // Config
+        ['name' => 'AppConfig#getApps', 'url' => '/api/v1/config/apps', 'verb' => 'GET'],
+        ['name' => 'AppConfig#getKeys', 'url' => '/api/v1/config/apps/{app}', 'verb' => 'GET'],
+        ['name' => 'AppConfig#getValue', 'url' => '/api/v1/config/apps/{app}/{key}', 'verb' => 'GET'],
+        ['name' => 'AppConfig#setValue', 'url' => '/api/v1/config/apps/{app}/{key}', 'verb' => 'POST'],
+        ['name' => 'AppConfig#deleteKey', 'url' => '/api/v1/config/apps/{app}/{key}', 'verb' => 'DELETE'],
 
-		// Preferences
-		['name' => 'Preferences#setPreference', 'url' => '/api/v1/config/users/{appId}/{configKey}', 'verb' => 'POST'],
-		['name' => 'Preferences#setMultiplePreferences', 'url' => '/api/v1/config/users/{appId}', 'verb' => 'POST'],
-		['name' => 'Preferences#deletePreference', 'url' => '/api/v1/config/users/{appId}/{configKey}', 'verb' => 'DELETE'],
-		['name' => 'Preferences#deleteMultiplePreference', 'url' => '/api/v1/config/users/{appId}', 'verb' => 'DELETE'],
-	],
-	'routes' => [
-		// Verification
-		['name' => 'Verification#showVerifyMail', 'url' => '/mailVerification/{key}/{token}/{userId}', 'verb' => 'GET'],
-		['name' => 'Verification#verifyMail', 'url' => '/mailVerification/{key}/{token}/{userId}', 'verb' => 'POST'],
-	]
+        // Preferences
+        ['name' => 'Preferences#setPreference', 'url' => '/api/v1/config/users/{appId}/{configKey}', 'verb' => 'POST'],
+        ['name' => 'Preferences#setMultiplePreferences', 'url' => '/api/v1/config/users/{appId}', 'verb' => 'POST'],
+        ['name' => 'Preferences#deletePreference', 'url' => '/api/v1/config/users/{appId}/{configKey}', 'verb' => 'DELETE'],
+        ['name' => 'Preferences#deleteMultiplePreference', 'url' => '/api/v1/config/users/{appId}', 'verb' => 'DELETE'],
+    ],
+    'routes' => [
+        // Verification
+        ['name' => 'Verification#showVerifyMail', 'url' => '/mailVerification/{key}/{token}/{userId}', 'verb' => 'GET'],
+        ['name' => 'Verification#verifyMail', 'url' => '/mailVerification/{key}/{token}/{userId}', 'verb' => 'POST'],
+    ]
 ];

apps/provisioning_api/tests/Controller/UsersControllerTest.php

Indentation +4358 added lines, -4358 removed lines

@@ -47,4363 +47,4363 @@
 use Test\TestCase;
 
 class UsersControllerTest extends TestCase {
-	protected IUserManager&MockObject $userManager;
-	protected IConfig&MockObject $config;
-	protected Manager&MockObject $groupManager;
-	protected IUserSession&MockObject $userSession;
-	protected LoggerInterface&MockObject $logger;
-	protected UsersController&MockObject $api;
-	protected IAccountManager&MockObject $accountManager;
-	protected ISubAdmin&MockObject $subAdminManager;
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected IRequest&MockObject $request;
-	private IFactory&MockObject $l10nFactory;
-	private NewUserMailHelper&MockObject $newUserMailHelper;
-	private ISecureRandom&MockObject $secureRandom;
-	private RemoteWipe&MockObject $remoteWipe;
-	private KnownUserService&MockObject $knownUserService;
-	private IEventDispatcher&MockObject $eventDispatcher;
-	private IRootFolder $rootFolder;
-	private IPhoneNumberUtil $phoneNumberUtil;
-	private IAppManager $appManager;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->groupManager = $this->createMock(Manager::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->request = $this->createMock(IRequest::class);
-		$this->accountManager = $this->createMock(IAccountManager::class);
-		$this->subAdminManager = $this->createMock(ISubAdmin::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->newUserMailHelper = $this->createMock(NewUserMailHelper::class);
-		$this->secureRandom = $this->createMock(ISecureRandom::class);
-		$this->remoteWipe = $this->createMock(RemoteWipe::class);
-		$this->knownUserService = $this->createMock(KnownUserService::class);
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->phoneNumberUtil = new PhoneNumberUtil();
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-
-		$l10n = $this->createMock(IL10N::class);
-		$l10n->method('t')->willReturnCallback(fn (string $txt, array $replacement = []) => sprintf($txt, ...$replacement));
-		$this->l10nFactory->method('get')->with('provisioning_api')->willReturn($l10n);
-
-		$this->api = $this->getMockBuilder(UsersController::class)
-			->setConstructorArgs([
-				'provisioning_api',
-				$this->request,
-				$this->userManager,
-				$this->config,
-				$this->groupManager,
-				$this->userSession,
-				$this->accountManager,
-				$this->subAdminManager,
-				$this->l10nFactory,
-				$this->rootFolder,
-				$this->urlGenerator,
-				$this->logger,
-				$this->newUserMailHelper,
-				$this->secureRandom,
-				$this->remoteWipe,
-				$this->knownUserService,
-				$this->eventDispatcher,
-				$this->phoneNumberUtil,
-				$this->appManager,
-			])
-			->onlyMethods(['fillStorageInfo'])
-			->getMock();
-	}
-
-	public function testGetUsersAsAdmin(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('admin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->willReturn(true);
-		$this->userManager
-			->expects($this->once())
-			->method('search')
-			->with('MyCustomSearch')
-			->willReturn(['Admin' => [], 'Foo' => [], 'Bar' => []]);
-
-		$expected = [
-			'users' => [
-				'Admin',
-				'Foo',
-				'Bar',
-			],
-		];
-		$this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData());
-	}
-
-	public function testGetUsersAsSubAdmin(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('subadmin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->willReturn(false);
-		$firstGroup = $this->getMockBuilder('OCP\IGroup')
-			->disableOriginalConstructor()
-			->getMock();
-		$firstGroup
-			->expects($this->once())
-			->method('getGID')
-			->willReturn('FirstGroup');
-		$secondGroup = $this->getMockBuilder('OCP\IGroup')
-			->disableOriginalConstructor()
-			->getMock();
-		$secondGroup
-			->expects($this->once())
-			->method('getGID')
-			->willReturn('SecondGroup');
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdmin')
-			->with($loggedInUser)
-			->willReturn(true);
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->with($loggedInUser)
-			->willReturn([$firstGroup, $secondGroup]);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->any())
-			->method('displayNamesInGroup')
-			->will($this->onConsecutiveCalls(['AnotherUserInTheFirstGroup' => []], ['UserInTheSecondGroup' => []]));
-
-		$expected = [
-			'users' => [
-				'AnotherUserInTheFirstGroup',
-				'UserInTheSecondGroup',
-			],
-		];
-		$this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData());
-	}
-
-	private function createUserMock(string $uid, bool $enabled): MockObject&IUser {
-		$mockUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$mockUser
-			->method('getUID')
-			->willReturn($uid);
-		$mockUser
-			->method('isEnabled')
-			->willReturn($enabled);
-		return $mockUser;
-	}
-
-	public function testGetDisabledUsersAsAdmin(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('admin');
-		$this->userSession
-			->expects($this->atLeastOnce())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->willReturn(true);
-		$this->userManager
-			->expects($this->once())
-			->method('getDisabledUsers')
-			->with(3, 0, 'MyCustomSearch')
-			->willReturn([
-				$this->createUserMock('admin', false),
-				$this->createUserMock('foo', false),
-				$this->createUserMock('bar', false),
-			]);
-
-		$expected = [
-			'users' => [
-				'admin' => ['id' => 'admin'],
-				'foo' => ['id' => 'foo'],
-				'bar' => ['id' => 'bar'],
-			],
-		];
-		$this->assertEquals($expected, $this->api->getDisabledUsersDetails('MyCustomSearch', 3)->getData());
-	}
-
-	public function testGetDisabledUsersAsSubAdmin(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('subadmin');
-		$this->userSession
-			->expects($this->atLeastOnce())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->willReturn(false);
-		$firstGroup = $this->getMockBuilder('OCP\IGroup')
-			->disableOriginalConstructor()
-			->getMock();
-		$secondGroup = $this->getMockBuilder('OCP\IGroup')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdmin')
-			->with($loggedInUser)
-			->willReturn(true);
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->with($loggedInUser)
-			->willReturn([$firstGroup, $secondGroup]);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->never())
-			->method('displayNamesInGroup');
-
-		$firstGroup
-			->expects($this->once())
-			->method('searchUsers')
-			->with('MyCustomSearch')
-			->willReturn([
-				$this->createUserMock('user1', false),
-				$this->createUserMock('bob', true),
-				$this->createUserMock('user2', false),
-				$this->createUserMock('alice', true),
-			]);
-
-		$secondGroup
-			->expects($this->once())
-			->method('searchUsers')
-			->with('MyCustomSearch')
-			->willReturn([
-				$this->createUserMock('user2', false),
-				$this->createUserMock('joe', true),
-				$this->createUserMock('user3', false),
-				$this->createUserMock('jim', true),
-				$this->createUserMock('john', true),
-			]);
-
-
-		$expected = [
-			'users' => [
-				'user1' => ['id' => 'user1'],
-				'user2' => ['id' => 'user2'],
-				'user3' => ['id' => 'user3'],
-			],
-		];
-		$this->assertEquals($expected, $this->api->getDisabledUsersDetails('MyCustomSearch', 3)->getData());
-	}
-
-
-	public function testAddUserAlreadyExisting(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(102);
-
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('AlreadyExistingUser')
-			->willReturn(true);
-		$this->logger
-			->expects($this->once())
-			->method('error')
-			->with('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-
-		$this->api->addUser('AlreadyExistingUser', 'password', '', '', []);
-	}
-
-
-	public function testAddUserNonExistingGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Group NonExistingGroup does not exist');
-		$this->expectExceptionCode(104);
-
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('groupExists')
-			->with('NonExistingGroup')
-			->willReturn(false);
-
-		$this->api->addUser('NewUser', 'pass', '', '', ['NonExistingGroup']);
-	}
-
-
-	public function testAddUserExistingGroupNonExistingGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Group NonExistingGroup does not exist');
-		$this->expectExceptionCode(104);
-
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->exactly(2))
-			->method('groupExists')
-			->willReturnMap([
-				['ExistingGroup', true],
-				['NonExistingGroup', false]
-			]);
-
-		$this->api->addUser('NewUser', 'pass', '', '', ['ExistingGroup', 'NonExistingGroup']);
-	}
-
-	public function testAddUserSuccessful(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$this->userManager
-			->expects($this->once())
-			->method('createUser')
-			->with('NewUser', 'PasswordOfTheNewUser');
-		$this->logger
-			->expects($this->once())
-			->method('info')
-			->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-
-		$this->assertTrue(key_exists(
-			'id',
-			$this->api->addUser('NewUser', 'PasswordOfTheNewUser')->getData()
-		));
-	}
-
-	public function testAddUserSuccessfulWithDisplayName(): void {
-		/**
-		 * @var UserController
-		 */
-		$api = $this->getMockBuilder(UsersController::class)
-			->setConstructorArgs([
-				'provisioning_api',
-				$this->request,
-				$this->userManager,
-				$this->config,
-				$this->groupManager,
-				$this->userSession,
-				$this->accountManager,
-				$this->subAdminManager,
-				$this->l10nFactory,
-				$this->rootFolder,
-				$this->urlGenerator,
-				$this->logger,
-				$this->newUserMailHelper,
-				$this->secureRandom,
-				$this->remoteWipe,
-				$this->knownUserService,
-				$this->eventDispatcher,
-				$this->phoneNumberUtil,
-				$this->appManager,
-			])
-			->onlyMethods(['editUser'])
-			->getMock();
-
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$this->userManager
-			->expects($this->once())
-			->method('createUser')
-			->with('NewUser', 'PasswordOfTheNewUser');
-		$this->logger
-			->expects($this->once())
-			->method('info')
-			->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->any())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-		$api
-			->expects($this->once())
-			->method('editUser')
-			->with('NewUser', 'display', 'DisplayNameOfTheNewUser');
-
-		$this->assertTrue(key_exists(
-			'id',
-			$api->addUser('NewUser', 'PasswordOfTheNewUser', 'DisplayNameOfTheNewUser')->getData()
-		));
-	}
-
-	public function testAddUserSuccessfulGenerateUserID(): void {
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(function ($appid, $key, $default) {
-				if ($key === 'newUser.generateUserID') {
-					return 'yes';
-				}
-				return null;
-			});
-		$this->userManager
-			->expects($this->any())
-			->method('userExists')
-			->with($this->anything())
-			->willReturn(false);
-		$this->userManager
-			->expects($this->once())
-			->method('createUser')
-			->with($this->anything(), 'PasswordOfTheNewUser');
-		$this->logger
-			->expects($this->once())
-			->method('info')
-			->with($this->stringStartsWith('Successful addUser call with userid: '), ['app' => 'ocs_api']);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-		$this->secureRandom->expects($this->any())
-			->method('generate')
-			->with(10)
-			->willReturnCallback(function () {
-				return (string)rand(100000000, 999999999);
-			});
-
-		$this->assertTrue(key_exists(
-			'id',
-			$this->api->addUser('', 'PasswordOfTheNewUser')->getData()
-		));
-	}
-
-	public function testAddUserSuccessfulGeneratePassword(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$newUser = $this->createMock(IUser::class);
-		$newUser->expects($this->once())
-			->method('setEMailAddress');
-		$this->userManager
-			->expects($this->once())
-			->method('createUser')
-			->willReturn($newUser);
-		$this->logger
-			->expects($this->once())
-			->method('info')
-			->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-		$this->eventDispatcher
-			->expects($this->once())
-			->method('dispatchTyped')
-			->with(new GenerateSecurePasswordEvent());
-
-		$this->assertTrue(key_exists(
-			'id',
-			$this->api->addUser('NewUser', '', '', 'foo@bar')->getData()
-		));
-	}
-
-
-	public function testAddUserFailedToGenerateUserID(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Could not create non-existing user ID');
-		$this->expectExceptionCode(111);
-
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(function ($appid, $key, $default) {
-				if ($key === 'newUser.generateUserID') {
-					return 'yes';
-				}
-				return null;
-			});
-		$this->userManager
-			->expects($this->any())
-			->method('userExists')
-			->with($this->anything())
-			->willReturn(true);
-		$this->userManager
-			->expects($this->never())
-			->method('createUser');
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-
-		$this->api->addUser('', 'PasswordOfTheNewUser')->getData();
-	}
-
-
-	public function testAddUserEmailRequired(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Required email address was not provided');
-		$this->expectExceptionCode(110);
-
-		$this->config
-			->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(function ($appid, $key, $default) {
-				if ($key === 'newUser.requireEmail') {
-					return 'yes';
-				}
-				return null;
-			});
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$this->userManager
-			->expects($this->never())
-			->method('createUser');
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-
-		$this->assertTrue(key_exists(
-			'id',
-			$this->api->addUser('NewUser', 'PasswordOfTheNewUser')->getData()
-		));
-	}
-
-	public function testAddUserExistingGroup(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('groupExists')
-			->with('ExistingGroup')
-			->willReturn(true);
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('createUser')
-			->with('NewUser', 'PasswordOfTheNewUser')
-			->willReturn($user);
-		$group = $this->getMockBuilder('OCP\IGroup')
-			->disableOriginalConstructor()
-			->getMock();
-		$group
-			->expects($this->once())
-			->method('addUser')
-			->with($user);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingGroup')
-			->willReturn($group);
-
-		$calls = [
-			['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']],
-			['Added userid NewUser to group ExistingGroup', ['app' => 'ocs_api']],
-		];
-		$this->logger
-			->expects($this->exactly(2))
-			->method('info')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-
-		$this->assertArrayHasKey('id', $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup'])->getData());
-	}
-
-
-	public function testAddUserUnsuccessful(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Bad request');
-		$this->expectExceptionCode(101);
-
-		$exception = new Exception('User backend not found.');
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$this->userManager
-			->expects($this->once())
-			->method('createUser')
-			->with('NewUser', 'PasswordOfTheNewUser')
-			->will($this->throwException($exception));
-		$this->logger
-			->expects($this->once())
-			->method('error')
-			->with(
-				'Failed addUser attempt with exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $exception
-				]
-			);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('adminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('adminUser')
-			->willReturn(true);
-
-		$this->api->addUser('NewUser', 'PasswordOfTheNewUser');
-	}
-
-
-	public function testAddUserAsSubAdminNoGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('No group specified (required for sub-admins)');
-		$this->expectExceptionCode(106);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('regularUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('regularUser')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->with()
-			->willReturn($subAdminManager);
-
-		$this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', []);
-	}
-
-
-	public function testAddUserAsSubAdminValidGroupNotSubAdmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Insufficient privileges for group ExistingGroup');
-		$this->expectExceptionCode(105);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('regularUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('regularUser')
-			->willReturn(false);
-		$existingGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingGroup')
-			->willReturn($existingGroup);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($loggedInUser, $existingGroup)
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->with()
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->once())
-			->method('groupExists')
-			->with('ExistingGroup')
-			->willReturn(true);
-
-		$this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup'])->getData();
-	}
-
-	public function testAddUserAsSubAdminExistingGroups(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('subAdminUser');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subAdminUser')
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->exactly(2))
-			->method('groupExists')
-			->willReturnMap([
-				['ExistingGroup1', true],
-				['ExistingGroup2', true]
-			]);
-		$user = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('createUser')
-			->with('NewUser', 'PasswordOfTheNewUser')
-			->willReturn($user);
-		$existingGroup1 = $this->getMockBuilder('OCP\IGroup')
-			->disableOriginalConstructor()
-			->getMock();
-		$existingGroup2 = $this->getMockBuilder('OCP\IGroup')
-			->disableOriginalConstructor()
-			->getMock();
-		$existingGroup1
-			->expects($this->once())
-			->method('addUser')
-			->with($user);
-		$existingGroup2
-			->expects($this->once())
-			->method('addUser')
-			->with($user);
-		$this->groupManager
-			->expects($this->exactly(4))
-			->method('get')
-			->willReturnMap([
-				['ExistingGroup1', $existingGroup1],
-				['ExistingGroup2', $existingGroup2]
-			]);
-
-		$calls = [
-			['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']],
-			['Added userid NewUser to group ExistingGroup1', ['app' => 'ocs_api']],
-			['Added userid NewUser to group ExistingGroup2', ['app' => 'ocs_api']],
-		];
-		$this->logger
-			->expects($this->exactly(3))
-			->method('info')
-			->willReturnCallback(function () use (&$calls) {
-				$expected = array_shift($calls);
-				$this->assertEquals($expected, func_get_args());
-			});
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$subAdminManager
-			->expects($this->exactly(2))
-			->method('isSubAdminOfGroup')
-			->willReturnMap([
-				[$loggedInUser, $existingGroup1, true],
-				[$loggedInUser, $existingGroup2, true],
-			]);
-
-		$this->assertArrayHasKey('id', $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup1', 'ExistingGroup2'])->getData());
-	}
-
-
-	public function testGetUserTargetDoesNotExist(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('User does not exist');
-		$this->expectExceptionCode(404);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn(null);
-
-		$this->api->getUser('UserToGet');
-	}
-
-	public function testGetUserDataAsAdmin(): void {
-		$group0 = $this->createMock(IGroup::class);
-		$group1 = $this->createMock(IGroup::class);
-		$group2 = $this->createMock(IGroup::class);
-		$group3 = $this->createMock(IGroup::class);
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$targetUser->expects($this->once())
-			->method('getSystemEMailAddress')
-			->willReturn('demo@nextcloud.com');
-		$this->userSession
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->method('get')
-			->with('UID')
-			->willReturn($targetUser);
-		$this->groupManager
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->any())
-			->method('getUserGroups')
-			->willReturn([$group0, $group1, $group2]);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->willReturn([$group3]);
-		$group0->expects($this->once())
-			->method('getGID')
-			->willReturn('group0');
-		$group1->expects($this->once())
-			->method('getGID')
-			->willReturn('group1');
-		$group2->expects($this->once())
-			->method('getGID')
-			->willReturn('group2');
-		$group3->expects($this->once())
-			->method('getGID')
-			->willReturn('group3');
-
-		$this->mockAccount($targetUser, [
-			IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
-			IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
-			IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
-			IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'],
-			IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
-			IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
-			IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
-			IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
-			IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
-			IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'],
-			IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'],
-		]);
-		$this->config
-			->method('getUserValue')
-			->willReturnMap([
-				['UID', 'core', 'enabled', 'true', 'true'],
-			]);
-		$this->api
-			->expects($this->once())
-			->method('fillStorageInfo')
-			->with($targetUser)
-			->willReturn(['DummyValue']);
-
-		$backend = $this->createMock(UserInterface::class);
-		$backend->expects($this->any())
-			->method('implementsActions')
-			->willReturn(true);
-
-		$targetUser
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Demo User');
-		$targetUser
-			->expects($this->once())
-			->method('getHome')
-			->willReturn('/var/www/newtcloud/data/UID');
-		$targetUser
-			->expects($this->exactly(2))
-			->method('getLastLogin')
-			->willReturn(1521191471);
-		$targetUser
-			->expects($this->once())
-			->method('getFirstLogin')
-			->willReturn(1511191471);
-		$targetUser
-			->expects($this->once())
-			->method('getBackendClassName')
-			->willReturn('Database');
-		$targetUser
-			->expects($this->once())
-			->method('getBackend')
-			->willReturn($backend);
-		$targetUser
-			->method('getUID')
-			->willReturn('UID');
-
-		$this->l10nFactory
-			->expects($this->once())
-			->method('getUserLanguage')
-			->with($targetUser)
-			->willReturn('de');
-
-		$expected = [
-			'id' => 'UID',
-			'enabled' => true,
-			'storageLocation' => '/var/www/newtcloud/data/UID',
-			'firstLoginTimestamp' => 1511191471,
-			'lastLoginTimestamp' => 1521191471,
-			'lastLogin' => 1521191471000,
-			'backend' => 'Database',
-			'subadmin' => ['group3'],
-			'quota' => ['DummyValue'],
-			'email' => 'demo@nextcloud.com',
-			'displayname' => 'Demo User',
-			'display-name' => 'Demo User',
-			'phone' => 'phone',
-			'address' => 'address',
-			'website' => 'website',
-			'twitter' => 'twitter',
-			'fediverse' => 'fediverse',
-			'groups' => ['group0', 'group1', 'group2'],
-			'language' => 'de',
-			'locale' => null,
-			'backendCapabilities' => [
-				'setDisplayName' => true,
-				'setPassword' => true,
-			],
-			'additional_mail' => [],
-			'organisation' => 'organisation',
-			'role' => 'role',
-			'headline' => 'headline',
-			'biography' => 'biography',
-			'profile_enabled' => '1',
-			'notify_email' => null,
-			'manager' => '',
-			'pronouns' => 'they/them',
-		];
-		$this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID']));
-	}
-
-	public function testGetUserDataAsSubAdminAndUserIsAccessible(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getSystemEMailAddress')
-			->willReturn('demo@nextcloud.com');
-		$this->userSession
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->method('get')
-			->with('UID')
-			->willReturn($targetUser);
-		$this->groupManager
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->any())
-			->method('getUserGroups')
-			->willReturn([]);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->willReturn([]);
-		$this->groupManager
-			->expects($this->exactly(2))
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->config
-			->method('getUserValue')
-			->willReturnMap([
-				['UID', 'core', 'enabled', 'true', 'true'],
-			]);
-		$this->api
-			->expects($this->once())
-			->method('fillStorageInfo')
-			->with($targetUser)
-			->willReturn(['DummyValue']);
-
-		$backend = $this->createMock(UserInterface::class);
-		$backend->expects($this->any())
-			->method('implementsActions')
-			->willReturn(true);
-
-		$targetUser
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Demo User');
-		$targetUser
-			->expects($this->never())
-			->method('getHome');
-		$targetUser
-			->expects($this->exactly(2))
-			->method('getLastLogin')
-			->willReturn(1521191471);
-		$targetUser
-			->expects($this->once())
-			->method('getFirstLogin')
-			->willReturn(1511191471);
-		$targetUser
-			->expects($this->once())
-			->method('getBackendClassName')
-			->willReturn('Database');
-		$targetUser
-			->expects($this->once())
-			->method('getBackend')
-			->willReturn($backend);
-		$targetUser
-			->method('getUID')
-			->willReturn('UID');
-
-		$this->mockAccount($targetUser, [
-			IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
-			IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
-			IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
-			IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'],
-			IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
-			IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
-			IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
-			IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
-			IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
-			IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'],
-			IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'],
-		]);
-
-		$this->l10nFactory
-			->expects($this->once())
-			->method('getUserLanguage')
-			->with($targetUser)
-			->willReturn('da');
-
-		$expected = [
-			'id' => 'UID',
-			'enabled' => true,
-			'firstLoginTimestamp' => 1511191471,
-			'lastLoginTimestamp' => 1521191471,
-			'lastLogin' => 1521191471000,
-			'backend' => 'Database',
-			'subadmin' => [],
-			'quota' => ['DummyValue'],
-			'email' => 'demo@nextcloud.com',
-			'displayname' => 'Demo User',
-			'display-name' => 'Demo User',
-			'phone' => 'phone',
-			'address' => 'address',
-			'website' => 'website',
-			'twitter' => 'twitter',
-			'fediverse' => 'fediverse',
-			'groups' => [],
-			'language' => 'da',
-			'locale' => null,
-			'backendCapabilities' => [
-				'setDisplayName' => true,
-				'setPassword' => true,
-			],
-			'additional_mail' => [],
-			'organisation' => 'organisation',
-			'role' => 'role',
-			'headline' => 'headline',
-			'biography' => 'biography',
-			'profile_enabled' => '1',
-			'notify_email' => null,
-			'manager' => '',
-			'pronouns' => 'they/them',
-		];
-		$this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID']));
-	}
-
-
-
-	public function testGetUserDataAsSubAdminAndUserIsNotAccessible(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(4))
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->invokePrivate($this->api, 'getUser', ['UserToGet']);
-	}
-
-	public function testGetUserDataAsSubAdminSelfLookup(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->method('get')
-			->with('UID')
-			->willReturn($targetUser);
-		$this->groupManager
-			->method('isAdmin')
-			->with('UID')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(false);
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->willReturn([]);
-		$this->groupManager
-			->expects($this->exactly(2))
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->any())
-			->method('getUserGroups')
-			->willReturn([]);
-		$this->api
-			->expects($this->once())
-			->method('fillStorageInfo')
-			->with($targetUser)
-			->willReturn(['DummyValue']);
-
-		$backend = $this->createMock(UserInterface::class);
-		$backend->expects($this->atLeastOnce())
-			->method('implementsActions')
-			->willReturn(false);
-
-		$targetUser
-			->expects($this->once())
-			->method('getDisplayName')
-			->willReturn('Subadmin User');
-		$targetUser
-			->expects($this->once())
-			->method('getSystemEMailAddress')
-			->willReturn('subadmin@nextcloud.com');
-		$targetUser
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser
-			->expects($this->never())
-			->method('getHome');
-		$targetUser
-			->expects($this->exactly(2))
-			->method('getLastLogin')
-			->willReturn(1521191471);
-		$targetUser
-			->expects($this->once())
-			->method('getFirstLogin')
-			->willReturn(1511191471);
-		$targetUser
-			->expects($this->once())
-			->method('getBackendClassName')
-			->willReturn('Database');
-		$targetUser
-			->expects($this->once())
-			->method('getBackend')
-			->willReturn($backend);
-		$this->mockAccount($targetUser, [
-			IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
-			IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
-			IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
-			IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'],
-			IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
-			IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
-			IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
-			IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
-			IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
-			IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'],
-			IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'],
-		]);
-
-		$this->l10nFactory
-			->expects($this->once())
-			->method('getUserLanguage')
-			->with($targetUser)
-			->willReturn('ru');
-
-		$expected = [
-			'id' => 'UID',
-			'firstLoginTimestamp' => 1511191471,
-			'lastLoginTimestamp' => 1521191471,
-			'lastLogin' => 1521191471000,
-			'backend' => 'Database',
-			'subadmin' => [],
-			'quota' => ['DummyValue'],
-			'email' => 'subadmin@nextcloud.com',
-			'displayname' => 'Subadmin User',
-			'display-name' => 'Subadmin User',
-			'phone' => 'phone',
-			'address' => 'address',
-			'website' => 'website',
-			'twitter' => 'twitter',
-			'fediverse' => 'fediverse',
-			'groups' => [],
-			'language' => 'ru',
-			'locale' => null,
-			'backendCapabilities' => [
-				'setDisplayName' => false,
-				'setPassword' => false,
-			],
-			'additional_mail' => [],
-			'organisation' => 'organisation',
-			'role' => 'role',
-			'headline' => 'headline',
-			'biography' => 'biography',
-			'profile_enabled' => '1',
-			'notify_email' => null,
-			'manager' => '',
-			'pronouns' => 'they/them',
-		];
-		$this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID']));
-	}
-
-	public static function dataSearchByPhoneNumbers(): array {
-		return [
-			'Invalid country' => ['Not a country code', ['12345' => ['NaN']], 400, null, null, []],
-			'No number to search' => ['DE', ['12345' => ['NaN']], 200, null, null, []],
-			'Valid number but no match' => ['DE', ['12345' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], [], []],
-			'Invalid number' => ['FR', ['12345' => ['0711 / 25 24 28-90']], 200, null, null, []],
-			'Invalid and valid number' => ['DE', ['12345' => ['NaN', '0711 / 25 24 28-90']], 200, ['+4971125242890'], [], []],
-			'Valid and invalid number' => ['DE', ['12345' => ['0711 / 25 24 28-90', 'NaN']], 200, ['+4971125242890'], [], []],
-			'Valid number and a match' => ['DE', ['12345' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], ['+4971125242890' => 'admin'], ['12345' => 'admin@localhost']],
-			'Same number twice, later hits' => ['DE', ['12345' => ['0711 / 25 24 28-90'], '23456' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], ['+4971125242890' => 'admin'], ['23456' => 'admin@localhost']],
-		];
-	}
-
-	/**
-	 * @dataProvider dataSearchByPhoneNumbers
-	 */
-	public function testSearchByPhoneNumbers(string $location, array $search, int $status, ?array $searchUsers, ?array $userMatches, array $expected): void {
-		$knownTo = 'knownTo';
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn($knownTo);
-		$this->userSession->method('getUser')
-			->willReturn($user);
-
-		if ($searchUsers === null) {
-			$this->accountManager->expects($this->never())
-				->method('searchUsers');
-		} else {
-			$this->accountManager->expects($this->once())
-				->method('searchUsers')
-				->with(IAccountManager::PROPERTY_PHONE, $searchUsers)
-				->willReturn($userMatches);
-
-			$this->knownUserService->expects($this->once())
-				->method('deleteKnownTo')
-				->with($knownTo);
-
-			$this->knownUserService->expects($this->exactly(count($expected)))
-				->method('storeIsKnownToUser')
-				->with($knownTo, $this->anything());
-		}
-
-		$this->urlGenerator->method('getAbsoluteURL')
-			->with('/')
-			->willReturn('https://localhost/');
-
-		$response = $this->api->searchByPhoneNumbers($location, $search);
-
-		self::assertEquals($status, $response->getStatus());
-		self::assertEquals($expected, $response->getData());
-	}
-
-	public function testEditUserRegularUserSelfEditChangeDisplayName(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->once())
-			->method('getBackend')
-			->willReturn($this->createMock(ISetDisplayNameBackend::class));
-		$targetUser
-			->expects($this->once())
-			->method('setDisplayName')
-			->with('NewDisplayName')
-			->willReturn(true);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'display', 'NewDisplayName')->getData());
-	}
-
-	public function testEditUserRegularUserSelfEditChangeEmailValid(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->once())
-			->method('setEMailAddress')
-			->with('demo@nextcloud.com');
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => $default);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'email', 'demo@nextcloud.com')->getData());
-	}
-
-	public function testEditUserRegularUserSelfEditAddAdditionalEmailValid(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$userAccount = $this->createMock(IAccount::class);
-
-		$this->accountManager
-			->expects($this->once())
-			->method('getAccount')
-			->with($targetUser)
-			->willReturn($userAccount);
-		$this->accountManager
-			->expects($this->once())
-			->method('updateAccount')
-			->with($userAccount);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'additional_mail', 'demo1@nextcloud.com')->getData());
-	}
-
-	public function testEditUserRegularUserSelfEditAddAdditionalEmailMainAddress(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-		$targetUser
-			->expects($this->any())
-			->method('getSystemEMailAddress')
-			->willReturn('demo@nextcloud.com');
-
-		$userAccount = $this->createMock(IAccount::class);
-
-		$this->accountManager
-			->expects($this->never())
-			->method('getAccount')
-			->with($targetUser)
-			->willReturn($userAccount);
-		$this->accountManager
-			->expects($this->never())
-			->method('updateAccount')
-			->with($userAccount);
-
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-		$this->api->editUser('UserToEdit', 'additional_mail', 'demo@nextcloud.com')->getData();
-	}
-
-	public function testEditUserRegularUserSelfEditAddAdditionalEmailDuplicate(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$property = $this->createMock(IAccountProperty::class);
-		$property->method('getValue')
-			->willReturn('demo1@nextcloud.com');
-		$collection = $this->createMock(IAccountPropertyCollection::class);
-		$collection->method('getPropertyByValue')
-			->with('demo1@nextcloud.com')
-			->willReturn($property);
-
-		$userAccount = $this->createMock(IAccount::class);
-		$userAccount->method('getPropertyCollection')
-			->with(IAccountManager::COLLECTION_EMAIL)
-			->willReturn($collection);
-
-		$this->accountManager
-			->expects($this->once())
-			->method('getAccount')
-			->with($targetUser)
-			->willReturn($userAccount);
-		$this->accountManager
-			->expects($this->never())
-			->method('updateAccount')
-			->with($userAccount);
-
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-		$this->api->editUser('UserToEdit', 'additional_mail', 'demo1@nextcloud.com')->getData();
-	}
-
-	public function testEditUserRegularUserSelfEditChangeEmailInvalid(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => $default);
-
-		$this->api->editUser('UserToEdit', 'email', 'demo.org');
-	}
-
-	public static function selfEditChangePropertyProvider(): array {
-		return [
-			[IAccountManager::PROPERTY_TWITTER, '@oldtwitter', '@newtwitter'],
-			[IAccountManager::PROPERTY_FEDIVERSE, '@oldFediverse@floss.social', '@newFediverse@floss.social'],
-			[IAccountManager::PROPERTY_PHONE, '1234', '12345'],
-			[IAccountManager::PROPERTY_ADDRESS, 'Something street 2', 'Another street 3'],
-			[IAccountManager::PROPERTY_WEBSITE, 'https://examplesite1', 'https://examplesite2'],
-			[IAccountManager::PROPERTY_ORGANISATION, 'Organisation A', 'Organisation B'],
-			[IAccountManager::PROPERTY_ROLE, 'Human', 'Alien'],
-			[IAccountManager::PROPERTY_HEADLINE, 'Hi', 'Hello'],
-			[IAccountManager::PROPERTY_BIOGRAPHY, 'A biography', 'Another biography'],
-			[IAccountManager::PROPERTY_PROFILE_ENABLED, '1', '0'],
-			[IAccountManager::PROPERTY_PRONOUNS, 'they/them', 'he/him'],
-		];
-	}
-
-	/**
-	 * @dataProvider selfEditChangePropertyProvider
-	 */
-	public function testEditUserRegularUserSelfEditChangeProperty($propertyName, $oldValue, $newValue): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($loggedInUser);
-
-		$backend = $this->createMock(UserInterface::class);
-		$loggedInUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$propertyMock = $this->createMock(IAccountProperty::class);
-		$propertyMock->expects($this->any())
-			->method('getName')
-			->willReturn($propertyName);
-		$propertyMock->expects($this->any())
-			->method('getValue')
-			->willReturn($oldValue);
-		$propertyMock->expects($this->once())
-			->method('setValue')
-			->with($newValue)
-			->willReturnSelf();
-		$propertyMock->expects($this->any())
-			->method('getScope')
-			->willReturn(IAccountManager::SCOPE_LOCAL);
-
-		$accountMock = $this->createMock(IAccount::class);
-		$accountMock->expects($this->any())
-			->method('getProperty')
-			->with($propertyName)
-			->willReturn($propertyMock);
-
-		$this->accountManager->expects($this->atLeastOnce())
-			->method('getAccount')
-			->with($loggedInUser)
-			->willReturn($accountMock);
-		$this->accountManager->expects($this->once())
-			->method('updateAccount')
-			->with($accountMock);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', $propertyName, $newValue)->getData());
-	}
-
-	public function selfEditChangePropertyScopeProvider() {
-		return [
-			[IAccountManager::PROPERTY_AVATAR, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_DISPLAYNAME, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_EMAIL, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_TWITTER, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_FEDIVERSE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_PHONE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_ADDRESS, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_WEBSITE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_ORGANISATION, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_ROLE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_HEADLINE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_BIOGRAPHY, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_PROFILE_ENABLED, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-			[IAccountManager::PROPERTY_PRONOUNS, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
-		];
-	}
-
-	/**
-	 * @dataProvider selfEditChangePropertyProvider
-	 */
-	public function testEditUserRegularUserSelfEditChangePropertyScope($propertyName, $oldScope, $newScope): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($loggedInUser);
-
-		$backend = $this->createMock(UserInterface::class);
-		$loggedInUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$propertyMock = $this->createMock(IAccountProperty::class);
-		$propertyMock->expects($this->any())
-			->method('getName')
-			->willReturn($propertyName);
-		$propertyMock->expects($this->any())
-			->method('getValue')
-			->willReturn('somevalue');
-		$propertyMock->expects($this->any())
-			->method('getScope')
-			->willReturn($oldScope);
-		$propertyMock->expects($this->atLeastOnce())
-			->method('setScope')
-			->with($newScope)
-			->willReturnSelf();
-
-		$accountMock = $this->createMock(IAccount::class);
-		$accountMock->expects($this->any())
-			->method('getProperty')
-			->with($propertyName)
-			->willReturn($propertyMock);
-
-		$this->accountManager->expects($this->atLeastOnce())
-			->method('getAccount')
-			->with($loggedInUser)
-			->willReturn($accountMock);
-		$this->accountManager->expects($this->once())
-			->method('updateAccount')
-			->with($accountMock);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', $propertyName . 'Scope', $newScope)->getData());
-	}
-
-	public function testEditUserRegularUserSelfEditChangePassword(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->once())
-			->method('canChangePassword')
-			->willReturn(true);
-		$targetUser
-			->expects($this->once())
-			->method('setPassword')
-			->with('NewPassword');
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'password', 'NewPassword')->getData());
-	}
-
-
-
-	public function testEditUserRegularUserSelfEditChangeQuota(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(113);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->api->editUser('UserToEdit', 'quota', 'NewQuota');
-	}
-
-	public function testEditUserAdminUserSelfEditChangeValidQuota(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->willReturnCallback(function ($appid, $key, $default) {
-				if ($key === 'max_quota') {
-					return '-1';
-				}
-				return null;
-			});
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser->expects($this->once())
-			->method('setQuota')
-			->with('2.9 MB');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->exactly(3))
-			->method('isAdmin')
-			->with('UID')
-			->willReturn(true);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData());
-	}
-
-
-
-	public function testEditUserAdminUserSelfEditChangeInvalidQuota(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Invalid quota value: ABC');
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->exactly(3))
-			->method('isAdmin')
-			->with('UID')
-			->willReturn(true);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->api->editUser('UserToEdit', 'quota', 'ABC');
-	}
-
-	public function testEditUserAdminUserEditChangeValidQuota(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->willReturnCallback(function ($appid, $key, $default) {
-				if ($key === 'max_quota') {
-					return '-1';
-				}
-				return null;
-			});
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser->expects($this->once())
-			->method('setQuota')
-			->with('2.9 MB');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData());
-	}
-
-	public function testEditUserSelfEditChangeLanguage(): void {
-		$this->l10nFactory->expects($this->once())
-			->method('findAvailableLanguages')
-			->willReturn(['en', 'de', 'sv']);
-		$this->config->expects($this->any())
-			->method('getSystemValue')
-			->willReturnMap([
-				['allow_user_to_change_display_name', true, true],
-				['force_language', false, false],
-			]);
-
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UserToEdit');
-		$targetUser = $this->createMock(IUser::class);
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with('UserToEdit', 'core', 'lang', 'de');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->atLeastOnce())
-			->method('isAdmin')
-			->with('UserToEdit')
-			->willReturn(false);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UserToEdit');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData());
-	}
-
-	public static function dataEditUserSelfEditChangeLanguageButForced(): array {
-		return [
-			['de'],
-			[true],
-		];
-	}
-
-	/**
-	 * @dataProvider dataEditUserSelfEditChangeLanguageButForced
-	 */
-	public function testEditUserSelfEditChangeLanguageButForced($forced): void {
-		$this->expectException(OCSException::class);
-
-		$this->config->expects($this->any())
-			->method('getSystemValue')
-			->willReturnMap([
-				['allow_user_to_change_display_name', true, true],
-				['force_language', false, $forced],
-			]);
-
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UserToEdit');
-		$targetUser = $this->createMock(IUser::class);
-		$this->config->expects($this->never())
-			->method('setUserValue');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->atLeastOnce())
-			->method('isAdmin')
-			->with('UserToEdit')
-			->willReturn(false);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UserToEdit');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData());
-	}
-
-	public function testEditUserAdminEditChangeLanguage(): void {
-		$this->l10nFactory->expects($this->once())
-			->method('findAvailableLanguages')
-			->willReturn(['en', 'de', 'sv']);
-
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->createMock(IUser::class);
-		$this->config->expects($this->once())
-			->method('setUserValue')
-			->with('UserToEdit', 'core', 'lang', 'de');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$subAdminManager = $this->createMock(SubAdmin::class);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UserToEdit');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData());
-	}
-
-	/**
-	 * @dataProvider dataEditUserSelfEditChangeLanguageButForced
-	 */
-	public function testEditUserAdminEditChangeLanguageInvalidLanguage(): void {
-		$this->expectException(OCSException::class);
-
-
-		$this->l10nFactory->expects($this->once())
-			->method('findAvailableLanguages')
-			->willReturn(['en', 'de', 'sv']);
-
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->createMock(IUser::class);
-		$this->config->expects($this->never())
-			->method('setUserValue');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$subAdminManager = $this->createMock(SubAdmin::class);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UserToEdit');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'ru')->getData());
-	}
-
-	public function testEditUserSubadminUserAccessible(): void {
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->willReturnCallback(function ($appid, $key, $default) {
-				if ($key === 'max_quota') {
-					return '-1';
-				}
-				return null;
-			});
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser->expects($this->once())
-			->method('setQuota')
-			->with('2.9 MB');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$backend = $this->createMock(UserInterface::class);
-		$targetUser
-			->expects($this->any())
-			->method('getBackend')
-			->willReturn($backend);
-
-		$this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData());
-	}
-
-
-	public function testEditUserSubadminUserInaccessible(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToEdit')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-
-		$this->api->editUser('UserToEdit', 'quota', 'value');
-	}
-
-
-	public function testDeleteUserNotExistingUser(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UserToEdit');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToDelete')
-			->willReturn(null);
-
-		$this->api->deleteUser('UserToDelete');
-	}
-
-
-	public function testDeleteUserSelf(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('UID');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToDelete')
-			->willReturn($targetUser);
-
-		$this->api->deleteUser('UserToDelete');
-	}
-
-	public function testDeleteSuccessfulUserAsAdmin(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToDelete')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$targetUser
-			->expects($this->once())
-			->method('delete')
-			->willReturn(true);
-
-		$this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData());
-	}
-
-
-	public function testDeleteUnsuccessfulUserAsAdmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToDelete')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$targetUser
-			->expects($this->once())
-			->method('delete')
-			->willReturn(false);
-
-		$this->api->deleteUser('UserToDelete');
-	}
-
-	public function testDeleteSuccessfulUserAsSubadmin(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToDelete')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->once())
-			->method('delete')
-			->willReturn(true);
-
-		$this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData());
-	}
-
-
-	public function testDeleteUnsuccessfulUserAsSubadmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToDelete')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->once())
-			->method('delete')
-			->willReturn(false);
-
-		$this->api->deleteUser('UserToDelete');
-	}
-
-
-	public function testDeleteUserAsSubAdminAndUserIsNotAccessible(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UID');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToDelete')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->api->deleteUser('UserToDelete');
-	}
-
-
-	public function testGetUsersGroupsTargetUserNotExisting(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-
-		$this->api->getUsersGroups('UserToLookup');
-	}
-
-	public function testGetUsersGroupsSelfTargetted(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->exactly(3))
-			->method('getUID')
-			->willReturn('UserToLookup');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UserToLookup');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToLookup')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('getUserGroupIds')
-			->with($targetUser)
-			->willReturn(['DummyValue']);
-
-		$this->assertEquals(['groups' => ['DummyValue']], $this->api->getUsersGroups('UserToLookup')->getData());
-	}
-
-	public function testGetUsersGroupsForAdminUser(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->exactly(3))
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UserToLookup');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToLookup')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('getUserGroupIds')
-			->with($targetUser)
-			->willReturn(['DummyValue']);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-
-		$this->assertEquals(['groups' => ['DummyValue']], $this->api->getUsersGroups('UserToLookup')->getData());
-	}
-
-	public function testGetUsersGroupsForSubAdminUserAndUserIsAccessible(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->exactly(3))
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UserToLookup');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToLookup')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$group1 = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$group1
-			->expects($this->any())
-			->method('getGID')
-			->willReturn('Group1');
-		$group2 = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$group2
-			->expects($this->any())
-			->method('getGID')
-			->willReturn('Group2');
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->with($loggedInUser)
-			->willReturn([$group1, $group2]);
-		$this->groupManager
-			->expects($this->any())
-			->method('getUserGroupIds')
-			->with($targetUser)
-			->willReturn(['Group1']);
-
-		$this->assertEquals(['groups' => ['Group1']], $this->api->getUsersGroups('UserToLookup')->getData());
-	}
-
-
-	public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->exactly(3))
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('UserToLookup');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToLookup')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->any())
-			->method('getUserGroupIds')
-			->with($targetUser)
-			->willReturn(['Group1']);
-
-		$this->api->getUsersGroups('UserToLookup');
-	}
-
-
-	public function testAddToGroupWithTargetGroupNotExisting(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(102);
-
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('GroupToAddTo')
-			->willReturn(null);
-
-		$this->api->addToGroup('TargetUser', 'GroupToAddTo');
-	}
-
-
-	public function testAddToGroupWithNoGroupSpecified(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$this->api->addToGroup('TargetUser');
-	}
-
-
-	public function testAddToGroupWithTargetUserNotExisting(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(103);
-
-		$targetGroup = $this->createMock(IGroup::class);
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('GroupToAddTo')
-			->willReturn($targetGroup);
-
-		$this->api->addToGroup('TargetUser', 'GroupToAddTo');
-	}
-
-
-	public function testAddToGroupNoSubadmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(104);
-
-		$targetUser = $this->createMock(IUser::class);
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('subadmin');
-
-		$targetGroup = $this->createMock(IGroup::class);
-		$targetGroup->expects($this->never())
-			->method('addUser')
-			->with($targetUser);
-
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('GroupToAddTo')
-			->willReturn($targetGroup);
-
-
-		$subAdminManager = $this->createMock(SubAdmin::class);
-		$subAdminManager->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($loggedInUser, $targetGroup)
-			->willReturn(false);
-
-		$this->groupManager->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('TargetUser')
-			->willReturn($targetUser);
-
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-
-		$this->api->addToGroup('TargetUser', 'GroupToAddTo');
-	}
-
-	public function testAddToGroupSuccessAsSubadmin(): void {
-		$targetUser = $this->createMock(IUser::class);
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('subadmin');
-
-		$targetGroup = $this->createMock(IGroup::class);
-		$targetGroup->expects($this->once())
-			->method('addUser')
-			->with($targetUser);
-
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('GroupToAddTo')
-			->willReturn($targetGroup);
+    protected IUserManager&MockObject $userManager;
+    protected IConfig&MockObject $config;
+    protected Manager&MockObject $groupManager;
+    protected IUserSession&MockObject $userSession;
+    protected LoggerInterface&MockObject $logger;
+    protected UsersController&MockObject $api;
+    protected IAccountManager&MockObject $accountManager;
+    protected ISubAdmin&MockObject $subAdminManager;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected IRequest&MockObject $request;
+    private IFactory&MockObject $l10nFactory;
+    private NewUserMailHelper&MockObject $newUserMailHelper;
+    private ISecureRandom&MockObject $secureRandom;
+    private RemoteWipe&MockObject $remoteWipe;
+    private KnownUserService&MockObject $knownUserService;
+    private IEventDispatcher&MockObject $eventDispatcher;
+    private IRootFolder $rootFolder;
+    private IPhoneNumberUtil $phoneNumberUtil;
+    private IAppManager $appManager;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->groupManager = $this->createMock(Manager::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->request = $this->createMock(IRequest::class);
+        $this->accountManager = $this->createMock(IAccountManager::class);
+        $this->subAdminManager = $this->createMock(ISubAdmin::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->newUserMailHelper = $this->createMock(NewUserMailHelper::class);
+        $this->secureRandom = $this->createMock(ISecureRandom::class);
+        $this->remoteWipe = $this->createMock(RemoteWipe::class);
+        $this->knownUserService = $this->createMock(KnownUserService::class);
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->phoneNumberUtil = new PhoneNumberUtil();
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->rootFolder = $this->createMock(IRootFolder::class);
+
+        $l10n = $this->createMock(IL10N::class);
+        $l10n->method('t')->willReturnCallback(fn (string $txt, array $replacement = []) => sprintf($txt, ...$replacement));
+        $this->l10nFactory->method('get')->with('provisioning_api')->willReturn($l10n);
+
+        $this->api = $this->getMockBuilder(UsersController::class)
+            ->setConstructorArgs([
+                'provisioning_api',
+                $this->request,
+                $this->userManager,
+                $this->config,
+                $this->groupManager,
+                $this->userSession,
+                $this->accountManager,
+                $this->subAdminManager,
+                $this->l10nFactory,
+                $this->rootFolder,
+                $this->urlGenerator,
+                $this->logger,
+                $this->newUserMailHelper,
+                $this->secureRandom,
+                $this->remoteWipe,
+                $this->knownUserService,
+                $this->eventDispatcher,
+                $this->phoneNumberUtil,
+                $this->appManager,
+            ])
+            ->onlyMethods(['fillStorageInfo'])
+            ->getMock();
+    }
+
+    public function testGetUsersAsAdmin(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('admin');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->willReturn(true);
+        $this->userManager
+            ->expects($this->once())
+            ->method('search')
+            ->with('MyCustomSearch')
+            ->willReturn(['Admin' => [], 'Foo' => [], 'Bar' => []]);
+
+        $expected = [
+            'users' => [
+                'Admin',
+                'Foo',
+                'Bar',
+            ],
+        ];
+        $this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData());
+    }
+
+    public function testGetUsersAsSubAdmin(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->willReturn(false);
+        $firstGroup = $this->getMockBuilder('OCP\IGroup')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $firstGroup
+            ->expects($this->once())
+            ->method('getGID')
+            ->willReturn('FirstGroup');
+        $secondGroup = $this->getMockBuilder('OCP\IGroup')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $secondGroup
+            ->expects($this->once())
+            ->method('getGID')
+            ->willReturn('SecondGroup');
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdmin')
+            ->with($loggedInUser)
+            ->willReturn(true);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->with($loggedInUser)
+            ->willReturn([$firstGroup, $secondGroup]);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('displayNamesInGroup')
+            ->will($this->onConsecutiveCalls(['AnotherUserInTheFirstGroup' => []], ['UserInTheSecondGroup' => []]));
+
+        $expected = [
+            'users' => [
+                'AnotherUserInTheFirstGroup',
+                'UserInTheSecondGroup',
+            ],
+        ];
+        $this->assertEquals($expected, $this->api->getUsers('MyCustomSearch')->getData());
+    }
+
+    private function createUserMock(string $uid, bool $enabled): MockObject&IUser {
+        $mockUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockUser
+            ->method('getUID')
+            ->willReturn($uid);
+        $mockUser
+            ->method('isEnabled')
+            ->willReturn($enabled);
+        return $mockUser;
+    }
+
+    public function testGetDisabledUsersAsAdmin(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('admin');
+        $this->userSession
+            ->expects($this->atLeastOnce())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->willReturn(true);
+        $this->userManager
+            ->expects($this->once())
+            ->method('getDisabledUsers')
+            ->with(3, 0, 'MyCustomSearch')
+            ->willReturn([
+                $this->createUserMock('admin', false),
+                $this->createUserMock('foo', false),
+                $this->createUserMock('bar', false),
+            ]);
+
+        $expected = [
+            'users' => [
+                'admin' => ['id' => 'admin'],
+                'foo' => ['id' => 'foo'],
+                'bar' => ['id' => 'bar'],
+            ],
+        ];
+        $this->assertEquals($expected, $this->api->getDisabledUsersDetails('MyCustomSearch', 3)->getData());
+    }
+
+    public function testGetDisabledUsersAsSubAdmin(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $this->userSession
+            ->expects($this->atLeastOnce())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->willReturn(false);
+        $firstGroup = $this->getMockBuilder('OCP\IGroup')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $secondGroup = $this->getMockBuilder('OCP\IGroup')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdmin')
+            ->with($loggedInUser)
+            ->willReturn(true);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->with($loggedInUser)
+            ->willReturn([$firstGroup, $secondGroup]);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->never())
+            ->method('displayNamesInGroup');
+
+        $firstGroup
+            ->expects($this->once())
+            ->method('searchUsers')
+            ->with('MyCustomSearch')
+            ->willReturn([
+                $this->createUserMock('user1', false),
+                $this->createUserMock('bob', true),
+                $this->createUserMock('user2', false),
+                $this->createUserMock('alice', true),
+            ]);
+
+        $secondGroup
+            ->expects($this->once())
+            ->method('searchUsers')
+            ->with('MyCustomSearch')
+            ->willReturn([
+                $this->createUserMock('user2', false),
+                $this->createUserMock('joe', true),
+                $this->createUserMock('user3', false),
+                $this->createUserMock('jim', true),
+                $this->createUserMock('john', true),
+            ]);
+
+
+        $expected = [
+            'users' => [
+                'user1' => ['id' => 'user1'],
+                'user2' => ['id' => 'user2'],
+                'user3' => ['id' => 'user3'],
+            ],
+        ];
+        $this->assertEquals($expected, $this->api->getDisabledUsersDetails('MyCustomSearch', 3)->getData());
+    }
+
+
+    public function testAddUserAlreadyExisting(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(102);
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('AlreadyExistingUser')
+            ->willReturn(true);
+        $this->logger
+            ->expects($this->once())
+            ->method('error')
+            ->with('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+
+        $this->api->addUser('AlreadyExistingUser', 'password', '', '', []);
+    }
+
+
+    public function testAddUserNonExistingGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Group NonExistingGroup does not exist');
+        $this->expectExceptionCode(104);
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('groupExists')
+            ->with('NonExistingGroup')
+            ->willReturn(false);
+
+        $this->api->addUser('NewUser', 'pass', '', '', ['NonExistingGroup']);
+    }
+
+
+    public function testAddUserExistingGroupNonExistingGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Group NonExistingGroup does not exist');
+        $this->expectExceptionCode(104);
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->exactly(2))
+            ->method('groupExists')
+            ->willReturnMap([
+                ['ExistingGroup', true],
+                ['NonExistingGroup', false]
+            ]);
+
+        $this->api->addUser('NewUser', 'pass', '', '', ['ExistingGroup', 'NonExistingGroup']);
+    }
+
+    public function testAddUserSuccessful(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $this->userManager
+            ->expects($this->once())
+            ->method('createUser')
+            ->with('NewUser', 'PasswordOfTheNewUser');
+        $this->logger
+            ->expects($this->once())
+            ->method('info')
+            ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+
+        $this->assertTrue(key_exists(
+            'id',
+            $this->api->addUser('NewUser', 'PasswordOfTheNewUser')->getData()
+        ));
+    }
+
+    public function testAddUserSuccessfulWithDisplayName(): void {
+        /**
+         * @var UserController
+         */
+        $api = $this->getMockBuilder(UsersController::class)
+            ->setConstructorArgs([
+                'provisioning_api',
+                $this->request,
+                $this->userManager,
+                $this->config,
+                $this->groupManager,
+                $this->userSession,
+                $this->accountManager,
+                $this->subAdminManager,
+                $this->l10nFactory,
+                $this->rootFolder,
+                $this->urlGenerator,
+                $this->logger,
+                $this->newUserMailHelper,
+                $this->secureRandom,
+                $this->remoteWipe,
+                $this->knownUserService,
+                $this->eventDispatcher,
+                $this->phoneNumberUtil,
+                $this->appManager,
+            ])
+            ->onlyMethods(['editUser'])
+            ->getMock();
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $this->userManager
+            ->expects($this->once())
+            ->method('createUser')
+            ->with('NewUser', 'PasswordOfTheNewUser');
+        $this->logger
+            ->expects($this->once())
+            ->method('info')
+            ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->any())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+        $api
+            ->expects($this->once())
+            ->method('editUser')
+            ->with('NewUser', 'display', 'DisplayNameOfTheNewUser');
+
+        $this->assertTrue(key_exists(
+            'id',
+            $api->addUser('NewUser', 'PasswordOfTheNewUser', 'DisplayNameOfTheNewUser')->getData()
+        ));
+    }
+
+    public function testAddUserSuccessfulGenerateUserID(): void {
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(function ($appid, $key, $default) {
+                if ($key === 'newUser.generateUserID') {
+                    return 'yes';
+                }
+                return null;
+            });
+        $this->userManager
+            ->expects($this->any())
+            ->method('userExists')
+            ->with($this->anything())
+            ->willReturn(false);
+        $this->userManager
+            ->expects($this->once())
+            ->method('createUser')
+            ->with($this->anything(), 'PasswordOfTheNewUser');
+        $this->logger
+            ->expects($this->once())
+            ->method('info')
+            ->with($this->stringStartsWith('Successful addUser call with userid: '), ['app' => 'ocs_api']);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+        $this->secureRandom->expects($this->any())
+            ->method('generate')
+            ->with(10)
+            ->willReturnCallback(function () {
+                return (string)rand(100000000, 999999999);
+            });
+
+        $this->assertTrue(key_exists(
+            'id',
+            $this->api->addUser('', 'PasswordOfTheNewUser')->getData()
+        ));
+    }
+
+    public function testAddUserSuccessfulGeneratePassword(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $newUser = $this->createMock(IUser::class);
+        $newUser->expects($this->once())
+            ->method('setEMailAddress');
+        $this->userManager
+            ->expects($this->once())
+            ->method('createUser')
+            ->willReturn($newUser);
+        $this->logger
+            ->expects($this->once())
+            ->method('info')
+            ->with('Successful addUser call with userid: NewUser', ['app' => 'ocs_api']);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+        $this->eventDispatcher
+            ->expects($this->once())
+            ->method('dispatchTyped')
+            ->with(new GenerateSecurePasswordEvent());
+
+        $this->assertTrue(key_exists(
+            'id',
+            $this->api->addUser('NewUser', '', '', 'foo@bar')->getData()
+        ));
+    }
+
+
+    public function testAddUserFailedToGenerateUserID(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Could not create non-existing user ID');
+        $this->expectExceptionCode(111);
+
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(function ($appid, $key, $default) {
+                if ($key === 'newUser.generateUserID') {
+                    return 'yes';
+                }
+                return null;
+            });
+        $this->userManager
+            ->expects($this->any())
+            ->method('userExists')
+            ->with($this->anything())
+            ->willReturn(true);
+        $this->userManager
+            ->expects($this->never())
+            ->method('createUser');
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+
+        $this->api->addUser('', 'PasswordOfTheNewUser')->getData();
+    }
+
+
+    public function testAddUserEmailRequired(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Required email address was not provided');
+        $this->expectExceptionCode(110);
+
+        $this->config
+            ->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(function ($appid, $key, $default) {
+                if ($key === 'newUser.requireEmail') {
+                    return 'yes';
+                }
+                return null;
+            });
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $this->userManager
+            ->expects($this->never())
+            ->method('createUser');
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+
+        $this->assertTrue(key_exists(
+            'id',
+            $this->api->addUser('NewUser', 'PasswordOfTheNewUser')->getData()
+        ));
+    }
+
+    public function testAddUserExistingGroup(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('groupExists')
+            ->with('ExistingGroup')
+            ->willReturn(true);
+        $user = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('createUser')
+            ->with('NewUser', 'PasswordOfTheNewUser')
+            ->willReturn($user);
+        $group = $this->getMockBuilder('OCP\IGroup')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $group
+            ->expects($this->once())
+            ->method('addUser')
+            ->with($user);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingGroup')
+            ->willReturn($group);
+
+        $calls = [
+            ['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']],
+            ['Added userid NewUser to group ExistingGroup', ['app' => 'ocs_api']],
+        ];
+        $this->logger
+            ->expects($this->exactly(2))
+            ->method('info')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+
+        $this->assertArrayHasKey('id', $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup'])->getData());
+    }
+
+
+    public function testAddUserUnsuccessful(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Bad request');
+        $this->expectExceptionCode(101);
+
+        $exception = new Exception('User backend not found.');
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $this->userManager
+            ->expects($this->once())
+            ->method('createUser')
+            ->with('NewUser', 'PasswordOfTheNewUser')
+            ->will($this->throwException($exception));
+        $this->logger
+            ->expects($this->once())
+            ->method('error')
+            ->with(
+                'Failed addUser attempt with exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $exception
+                ]
+            );
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('adminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('adminUser')
+            ->willReturn(true);
+
+        $this->api->addUser('NewUser', 'PasswordOfTheNewUser');
+    }
+
+
+    public function testAddUserAsSubAdminNoGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('No group specified (required for sub-admins)');
+        $this->expectExceptionCode(106);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('regularUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('regularUser')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->with()
+            ->willReturn($subAdminManager);
+
+        $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', []);
+    }
+
+
+    public function testAddUserAsSubAdminValidGroupNotSubAdmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Insufficient privileges for group ExistingGroup');
+        $this->expectExceptionCode(105);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('regularUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('regularUser')
+            ->willReturn(false);
+        $existingGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingGroup')
+            ->willReturn($existingGroup);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($loggedInUser, $existingGroup)
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->with()
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('groupExists')
+            ->with('ExistingGroup')
+            ->willReturn(true);
+
+        $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup'])->getData();
+    }
+
+    public function testAddUserAsSubAdminExistingGroups(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('subAdminUser');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subAdminUser')
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->exactly(2))
+            ->method('groupExists')
+            ->willReturnMap([
+                ['ExistingGroup1', true],
+                ['ExistingGroup2', true]
+            ]);
+        $user = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('createUser')
+            ->with('NewUser', 'PasswordOfTheNewUser')
+            ->willReturn($user);
+        $existingGroup1 = $this->getMockBuilder('OCP\IGroup')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $existingGroup2 = $this->getMockBuilder('OCP\IGroup')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $existingGroup1
+            ->expects($this->once())
+            ->method('addUser')
+            ->with($user);
+        $existingGroup2
+            ->expects($this->once())
+            ->method('addUser')
+            ->with($user);
+        $this->groupManager
+            ->expects($this->exactly(4))
+            ->method('get')
+            ->willReturnMap([
+                ['ExistingGroup1', $existingGroup1],
+                ['ExistingGroup2', $existingGroup2]
+            ]);
+
+        $calls = [
+            ['Successful addUser call with userid: NewUser', ['app' => 'ocs_api']],
+            ['Added userid NewUser to group ExistingGroup1', ['app' => 'ocs_api']],
+            ['Added userid NewUser to group ExistingGroup2', ['app' => 'ocs_api']],
+        ];
+        $this->logger
+            ->expects($this->exactly(3))
+            ->method('info')
+            ->willReturnCallback(function () use (&$calls) {
+                $expected = array_shift($calls);
+                $this->assertEquals($expected, func_get_args());
+            });
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $subAdminManager
+            ->expects($this->exactly(2))
+            ->method('isSubAdminOfGroup')
+            ->willReturnMap([
+                [$loggedInUser, $existingGroup1, true],
+                [$loggedInUser, $existingGroup2, true],
+            ]);
+
+        $this->assertArrayHasKey('id', $this->api->addUser('NewUser', 'PasswordOfTheNewUser', '', '', ['ExistingGroup1', 'ExistingGroup2'])->getData());
+    }
+
+
+    public function testGetUserTargetDoesNotExist(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('User does not exist');
+        $this->expectExceptionCode(404);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn(null);
+
+        $this->api->getUser('UserToGet');
+    }
+
+    public function testGetUserDataAsAdmin(): void {
+        $group0 = $this->createMock(IGroup::class);
+        $group1 = $this->createMock(IGroup::class);
+        $group2 = $this->createMock(IGroup::class);
+        $group3 = $this->createMock(IGroup::class);
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $targetUser->expects($this->once())
+            ->method('getSystemEMailAddress')
+            ->willReturn('demo@nextcloud.com');
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->method('get')
+            ->with('UID')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('getUserGroups')
+            ->willReturn([$group0, $group1, $group2]);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->willReturn([$group3]);
+        $group0->expects($this->once())
+            ->method('getGID')
+            ->willReturn('group0');
+        $group1->expects($this->once())
+            ->method('getGID')
+            ->willReturn('group1');
+        $group2->expects($this->once())
+            ->method('getGID')
+            ->willReturn('group2');
+        $group3->expects($this->once())
+            ->method('getGID')
+            ->willReturn('group3');
+
+        $this->mockAccount($targetUser, [
+            IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
+            IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
+            IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
+            IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'],
+            IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
+            IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
+            IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
+            IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
+            IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
+            IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'],
+            IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'],
+        ]);
+        $this->config
+            ->method('getUserValue')
+            ->willReturnMap([
+                ['UID', 'core', 'enabled', 'true', 'true'],
+            ]);
+        $this->api
+            ->expects($this->once())
+            ->method('fillStorageInfo')
+            ->with($targetUser)
+            ->willReturn(['DummyValue']);
+
+        $backend = $this->createMock(UserInterface::class);
+        $backend->expects($this->any())
+            ->method('implementsActions')
+            ->willReturn(true);
+
+        $targetUser
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Demo User');
+        $targetUser
+            ->expects($this->once())
+            ->method('getHome')
+            ->willReturn('/var/www/newtcloud/data/UID');
+        $targetUser
+            ->expects($this->exactly(2))
+            ->method('getLastLogin')
+            ->willReturn(1521191471);
+        $targetUser
+            ->expects($this->once())
+            ->method('getFirstLogin')
+            ->willReturn(1511191471);
+        $targetUser
+            ->expects($this->once())
+            ->method('getBackendClassName')
+            ->willReturn('Database');
+        $targetUser
+            ->expects($this->once())
+            ->method('getBackend')
+            ->willReturn($backend);
+        $targetUser
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $this->l10nFactory
+            ->expects($this->once())
+            ->method('getUserLanguage')
+            ->with($targetUser)
+            ->willReturn('de');
+
+        $expected = [
+            'id' => 'UID',
+            'enabled' => true,
+            'storageLocation' => '/var/www/newtcloud/data/UID',
+            'firstLoginTimestamp' => 1511191471,
+            'lastLoginTimestamp' => 1521191471,
+            'lastLogin' => 1521191471000,
+            'backend' => 'Database',
+            'subadmin' => ['group3'],
+            'quota' => ['DummyValue'],
+            'email' => 'demo@nextcloud.com',
+            'displayname' => 'Demo User',
+            'display-name' => 'Demo User',
+            'phone' => 'phone',
+            'address' => 'address',
+            'website' => 'website',
+            'twitter' => 'twitter',
+            'fediverse' => 'fediverse',
+            'groups' => ['group0', 'group1', 'group2'],
+            'language' => 'de',
+            'locale' => null,
+            'backendCapabilities' => [
+                'setDisplayName' => true,
+                'setPassword' => true,
+            ],
+            'additional_mail' => [],
+            'organisation' => 'organisation',
+            'role' => 'role',
+            'headline' => 'headline',
+            'biography' => 'biography',
+            'profile_enabled' => '1',
+            'notify_email' => null,
+            'manager' => '',
+            'pronouns' => 'they/them',
+        ];
+        $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID']));
+    }
+
+    public function testGetUserDataAsSubAdminAndUserIsAccessible(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getSystemEMailAddress')
+            ->willReturn('demo@nextcloud.com');
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->method('get')
+            ->with('UID')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('getUserGroups')
+            ->willReturn([]);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->willReturn([]);
+        $this->groupManager
+            ->expects($this->exactly(2))
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->config
+            ->method('getUserValue')
+            ->willReturnMap([
+                ['UID', 'core', 'enabled', 'true', 'true'],
+            ]);
+        $this->api
+            ->expects($this->once())
+            ->method('fillStorageInfo')
+            ->with($targetUser)
+            ->willReturn(['DummyValue']);
+
+        $backend = $this->createMock(UserInterface::class);
+        $backend->expects($this->any())
+            ->method('implementsActions')
+            ->willReturn(true);
+
+        $targetUser
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Demo User');
+        $targetUser
+            ->expects($this->never())
+            ->method('getHome');
+        $targetUser
+            ->expects($this->exactly(2))
+            ->method('getLastLogin')
+            ->willReturn(1521191471);
+        $targetUser
+            ->expects($this->once())
+            ->method('getFirstLogin')
+            ->willReturn(1511191471);
+        $targetUser
+            ->expects($this->once())
+            ->method('getBackendClassName')
+            ->willReturn('Database');
+        $targetUser
+            ->expects($this->once())
+            ->method('getBackend')
+            ->willReturn($backend);
+        $targetUser
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $this->mockAccount($targetUser, [
+            IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
+            IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
+            IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
+            IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'],
+            IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
+            IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
+            IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
+            IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
+            IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
+            IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'],
+            IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'],
+        ]);
+
+        $this->l10nFactory
+            ->expects($this->once())
+            ->method('getUserLanguage')
+            ->with($targetUser)
+            ->willReturn('da');
+
+        $expected = [
+            'id' => 'UID',
+            'enabled' => true,
+            'firstLoginTimestamp' => 1511191471,
+            'lastLoginTimestamp' => 1521191471,
+            'lastLogin' => 1521191471000,
+            'backend' => 'Database',
+            'subadmin' => [],
+            'quota' => ['DummyValue'],
+            'email' => 'demo@nextcloud.com',
+            'displayname' => 'Demo User',
+            'display-name' => 'Demo User',
+            'phone' => 'phone',
+            'address' => 'address',
+            'website' => 'website',
+            'twitter' => 'twitter',
+            'fediverse' => 'fediverse',
+            'groups' => [],
+            'language' => 'da',
+            'locale' => null,
+            'backendCapabilities' => [
+                'setDisplayName' => true,
+                'setPassword' => true,
+            ],
+            'additional_mail' => [],
+            'organisation' => 'organisation',
+            'role' => 'role',
+            'headline' => 'headline',
+            'biography' => 'biography',
+            'profile_enabled' => '1',
+            'notify_email' => null,
+            'manager' => '',
+            'pronouns' => 'they/them',
+        ];
+        $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID']));
+    }
+
+
+
+    public function testGetUserDataAsSubAdminAndUserIsNotAccessible(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(4))
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->invokePrivate($this->api, 'getUser', ['UserToGet']);
+    }
+
+    public function testGetUserDataAsSubAdminSelfLookup(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->method('get')
+            ->with('UID')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->method('isAdmin')
+            ->with('UID')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(false);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->willReturn([]);
+        $this->groupManager
+            ->expects($this->exactly(2))
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('getUserGroups')
+            ->willReturn([]);
+        $this->api
+            ->expects($this->once())
+            ->method('fillStorageInfo')
+            ->with($targetUser)
+            ->willReturn(['DummyValue']);
+
+        $backend = $this->createMock(UserInterface::class);
+        $backend->expects($this->atLeastOnce())
+            ->method('implementsActions')
+            ->willReturn(false);
+
+        $targetUser
+            ->expects($this->once())
+            ->method('getDisplayName')
+            ->willReturn('Subadmin User');
+        $targetUser
+            ->expects($this->once())
+            ->method('getSystemEMailAddress')
+            ->willReturn('subadmin@nextcloud.com');
+        $targetUser
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser
+            ->expects($this->never())
+            ->method('getHome');
+        $targetUser
+            ->expects($this->exactly(2))
+            ->method('getLastLogin')
+            ->willReturn(1521191471);
+        $targetUser
+            ->expects($this->once())
+            ->method('getFirstLogin')
+            ->willReturn(1511191471);
+        $targetUser
+            ->expects($this->once())
+            ->method('getBackendClassName')
+            ->willReturn('Database');
+        $targetUser
+            ->expects($this->once())
+            ->method('getBackend')
+            ->willReturn($backend);
+        $this->mockAccount($targetUser, [
+            IAccountManager::PROPERTY_ADDRESS => ['value' => 'address'],
+            IAccountManager::PROPERTY_PHONE => ['value' => 'phone'],
+            IAccountManager::PROPERTY_TWITTER => ['value' => 'twitter'],
+            IAccountManager::PROPERTY_FEDIVERSE => ['value' => 'fediverse'],
+            IAccountManager::PROPERTY_WEBSITE => ['value' => 'website'],
+            IAccountManager::PROPERTY_ORGANISATION => ['value' => 'organisation'],
+            IAccountManager::PROPERTY_ROLE => ['value' => 'role'],
+            IAccountManager::PROPERTY_HEADLINE => ['value' => 'headline'],
+            IAccountManager::PROPERTY_BIOGRAPHY => ['value' => 'biography'],
+            IAccountManager::PROPERTY_PROFILE_ENABLED => ['value' => '1'],
+            IAccountManager::PROPERTY_PRONOUNS => ['value' => 'they/them'],
+        ]);
+
+        $this->l10nFactory
+            ->expects($this->once())
+            ->method('getUserLanguage')
+            ->with($targetUser)
+            ->willReturn('ru');
+
+        $expected = [
+            'id' => 'UID',
+            'firstLoginTimestamp' => 1511191471,
+            'lastLoginTimestamp' => 1521191471,
+            'lastLogin' => 1521191471000,
+            'backend' => 'Database',
+            'subadmin' => [],
+            'quota' => ['DummyValue'],
+            'email' => 'subadmin@nextcloud.com',
+            'displayname' => 'Subadmin User',
+            'display-name' => 'Subadmin User',
+            'phone' => 'phone',
+            'address' => 'address',
+            'website' => 'website',
+            'twitter' => 'twitter',
+            'fediverse' => 'fediverse',
+            'groups' => [],
+            'language' => 'ru',
+            'locale' => null,
+            'backendCapabilities' => [
+                'setDisplayName' => false,
+                'setPassword' => false,
+            ],
+            'additional_mail' => [],
+            'organisation' => 'organisation',
+            'role' => 'role',
+            'headline' => 'headline',
+            'biography' => 'biography',
+            'profile_enabled' => '1',
+            'notify_email' => null,
+            'manager' => '',
+            'pronouns' => 'they/them',
+        ];
+        $this->assertEquals($expected, $this->invokePrivate($this->api, 'getUserData', ['UID']));
+    }
+
+    public static function dataSearchByPhoneNumbers(): array {
+        return [
+            'Invalid country' => ['Not a country code', ['12345' => ['NaN']], 400, null, null, []],
+            'No number to search' => ['DE', ['12345' => ['NaN']], 200, null, null, []],
+            'Valid number but no match' => ['DE', ['12345' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], [], []],
+            'Invalid number' => ['FR', ['12345' => ['0711 / 25 24 28-90']], 200, null, null, []],
+            'Invalid and valid number' => ['DE', ['12345' => ['NaN', '0711 / 25 24 28-90']], 200, ['+4971125242890'], [], []],
+            'Valid and invalid number' => ['DE', ['12345' => ['0711 / 25 24 28-90', 'NaN']], 200, ['+4971125242890'], [], []],
+            'Valid number and a match' => ['DE', ['12345' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], ['+4971125242890' => 'admin'], ['12345' => 'admin@localhost']],
+            'Same number twice, later hits' => ['DE', ['12345' => ['0711 / 25 24 28-90'], '23456' => ['0711 / 25 24 28-90']], 200, ['+4971125242890'], ['+4971125242890' => 'admin'], ['23456' => 'admin@localhost']],
+        ];
+    }
+
+    /**
+     * @dataProvider dataSearchByPhoneNumbers
+     */
+    public function testSearchByPhoneNumbers(string $location, array $search, int $status, ?array $searchUsers, ?array $userMatches, array $expected): void {
+        $knownTo = 'knownTo';
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn($knownTo);
+        $this->userSession->method('getUser')
+            ->willReturn($user);
+
+        if ($searchUsers === null) {
+            $this->accountManager->expects($this->never())
+                ->method('searchUsers');
+        } else {
+            $this->accountManager->expects($this->once())
+                ->method('searchUsers')
+                ->with(IAccountManager::PROPERTY_PHONE, $searchUsers)
+                ->willReturn($userMatches);
+
+            $this->knownUserService->expects($this->once())
+                ->method('deleteKnownTo')
+                ->with($knownTo);
+
+            $this->knownUserService->expects($this->exactly(count($expected)))
+                ->method('storeIsKnownToUser')
+                ->with($knownTo, $this->anything());
+        }
+
+        $this->urlGenerator->method('getAbsoluteURL')
+            ->with('/')
+            ->willReturn('https://localhost/');
+
+        $response = $this->api->searchByPhoneNumbers($location, $search);
+
+        self::assertEquals($status, $response->getStatus());
+        self::assertEquals($expected, $response->getData());
+    }
+
+    public function testEditUserRegularUserSelfEditChangeDisplayName(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->once())
+            ->method('getBackend')
+            ->willReturn($this->createMock(ISetDisplayNameBackend::class));
+        $targetUser
+            ->expects($this->once())
+            ->method('setDisplayName')
+            ->with('NewDisplayName')
+            ->willReturn(true);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'display', 'NewDisplayName')->getData());
+    }
+
+    public function testEditUserRegularUserSelfEditChangeEmailValid(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->once())
+            ->method('setEMailAddress')
+            ->with('demo@nextcloud.com');
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => $default);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'email', 'demo@nextcloud.com')->getData());
+    }
+
+    public function testEditUserRegularUserSelfEditAddAdditionalEmailValid(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $userAccount = $this->createMock(IAccount::class);
+
+        $this->accountManager
+            ->expects($this->once())
+            ->method('getAccount')
+            ->with($targetUser)
+            ->willReturn($userAccount);
+        $this->accountManager
+            ->expects($this->once())
+            ->method('updateAccount')
+            ->with($userAccount);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'additional_mail', 'demo1@nextcloud.com')->getData());
+    }
+
+    public function testEditUserRegularUserSelfEditAddAdditionalEmailMainAddress(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+        $targetUser
+            ->expects($this->any())
+            ->method('getSystemEMailAddress')
+            ->willReturn('demo@nextcloud.com');
+
+        $userAccount = $this->createMock(IAccount::class);
+
+        $this->accountManager
+            ->expects($this->never())
+            ->method('getAccount')
+            ->with($targetUser)
+            ->willReturn($userAccount);
+        $this->accountManager
+            ->expects($this->never())
+            ->method('updateAccount')
+            ->with($userAccount);
+
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+        $this->api->editUser('UserToEdit', 'additional_mail', 'demo@nextcloud.com')->getData();
+    }
+
+    public function testEditUserRegularUserSelfEditAddAdditionalEmailDuplicate(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $property = $this->createMock(IAccountProperty::class);
+        $property->method('getValue')
+            ->willReturn('demo1@nextcloud.com');
+        $collection = $this->createMock(IAccountPropertyCollection::class);
+        $collection->method('getPropertyByValue')
+            ->with('demo1@nextcloud.com')
+            ->willReturn($property);
+
+        $userAccount = $this->createMock(IAccount::class);
+        $userAccount->method('getPropertyCollection')
+            ->with(IAccountManager::COLLECTION_EMAIL)
+            ->willReturn($collection);
+
+        $this->accountManager
+            ->expects($this->once())
+            ->method('getAccount')
+            ->with($targetUser)
+            ->willReturn($userAccount);
+        $this->accountManager
+            ->expects($this->never())
+            ->method('updateAccount')
+            ->with($userAccount);
+
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+        $this->api->editUser('UserToEdit', 'additional_mail', 'demo1@nextcloud.com')->getData();
+    }
+
+    public function testEditUserRegularUserSelfEditChangeEmailInvalid(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => $default);
+
+        $this->api->editUser('UserToEdit', 'email', 'demo.org');
+    }
+
+    public static function selfEditChangePropertyProvider(): array {
+        return [
+            [IAccountManager::PROPERTY_TWITTER, '@oldtwitter', '@newtwitter'],
+            [IAccountManager::PROPERTY_FEDIVERSE, '@oldFediverse@floss.social', '@newFediverse@floss.social'],
+            [IAccountManager::PROPERTY_PHONE, '1234', '12345'],
+            [IAccountManager::PROPERTY_ADDRESS, 'Something street 2', 'Another street 3'],
+            [IAccountManager::PROPERTY_WEBSITE, 'https://examplesite1', 'https://examplesite2'],
+            [IAccountManager::PROPERTY_ORGANISATION, 'Organisation A', 'Organisation B'],
+            [IAccountManager::PROPERTY_ROLE, 'Human', 'Alien'],
+            [IAccountManager::PROPERTY_HEADLINE, 'Hi', 'Hello'],
+            [IAccountManager::PROPERTY_BIOGRAPHY, 'A biography', 'Another biography'],
+            [IAccountManager::PROPERTY_PROFILE_ENABLED, '1', '0'],
+            [IAccountManager::PROPERTY_PRONOUNS, 'they/them', 'he/him'],
+        ];
+    }
+
+    /**
+     * @dataProvider selfEditChangePropertyProvider
+     */
+    public function testEditUserRegularUserSelfEditChangeProperty($propertyName, $oldValue, $newValue): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($loggedInUser);
+
+        $backend = $this->createMock(UserInterface::class);
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $propertyMock = $this->createMock(IAccountProperty::class);
+        $propertyMock->expects($this->any())
+            ->method('getName')
+            ->willReturn($propertyName);
+        $propertyMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn($oldValue);
+        $propertyMock->expects($this->once())
+            ->method('setValue')
+            ->with($newValue)
+            ->willReturnSelf();
+        $propertyMock->expects($this->any())
+            ->method('getScope')
+            ->willReturn(IAccountManager::SCOPE_LOCAL);
+
+        $accountMock = $this->createMock(IAccount::class);
+        $accountMock->expects($this->any())
+            ->method('getProperty')
+            ->with($propertyName)
+            ->willReturn($propertyMock);
+
+        $this->accountManager->expects($this->atLeastOnce())
+            ->method('getAccount')
+            ->with($loggedInUser)
+            ->willReturn($accountMock);
+        $this->accountManager->expects($this->once())
+            ->method('updateAccount')
+            ->with($accountMock);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', $propertyName, $newValue)->getData());
+    }
+
+    public function selfEditChangePropertyScopeProvider() {
+        return [
+            [IAccountManager::PROPERTY_AVATAR, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_DISPLAYNAME, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_EMAIL, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_TWITTER, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_FEDIVERSE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_PHONE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_ADDRESS, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_WEBSITE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_ORGANISATION, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_ROLE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_HEADLINE, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_BIOGRAPHY, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_PROFILE_ENABLED, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+            [IAccountManager::PROPERTY_PRONOUNS, IAccountManager::SCOPE_LOCAL, IAccountManager::SCOPE_FEDERATED],
+        ];
+    }
+
+    /**
+     * @dataProvider selfEditChangePropertyProvider
+     */
+    public function testEditUserRegularUserSelfEditChangePropertyScope($propertyName, $oldScope, $newScope): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($loggedInUser);
+
+        $backend = $this->createMock(UserInterface::class);
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $propertyMock = $this->createMock(IAccountProperty::class);
+        $propertyMock->expects($this->any())
+            ->method('getName')
+            ->willReturn($propertyName);
+        $propertyMock->expects($this->any())
+            ->method('getValue')
+            ->willReturn('somevalue');
+        $propertyMock->expects($this->any())
+            ->method('getScope')
+            ->willReturn($oldScope);
+        $propertyMock->expects($this->atLeastOnce())
+            ->method('setScope')
+            ->with($newScope)
+            ->willReturnSelf();
+
+        $accountMock = $this->createMock(IAccount::class);
+        $accountMock->expects($this->any())
+            ->method('getProperty')
+            ->with($propertyName)
+            ->willReturn($propertyMock);
+
+        $this->accountManager->expects($this->atLeastOnce())
+            ->method('getAccount')
+            ->with($loggedInUser)
+            ->willReturn($accountMock);
+        $this->accountManager->expects($this->once())
+            ->method('updateAccount')
+            ->with($accountMock);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', $propertyName . 'Scope', $newScope)->getData());
+    }
+
+    public function testEditUserRegularUserSelfEditChangePassword(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->once())
+            ->method('canChangePassword')
+            ->willReturn(true);
+        $targetUser
+            ->expects($this->once())
+            ->method('setPassword')
+            ->with('NewPassword');
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'password', 'NewPassword')->getData());
+    }
+
+
+
+    public function testEditUserRegularUserSelfEditChangeQuota(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(113);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->api->editUser('UserToEdit', 'quota', 'NewQuota');
+    }
+
+    public function testEditUserAdminUserSelfEditChangeValidQuota(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->willReturnCallback(function ($appid, $key, $default) {
+                if ($key === 'max_quota') {
+                    return '-1';
+                }
+                return null;
+            });
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser->expects($this->once())
+            ->method('setQuota')
+            ->with('2.9 MB');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->exactly(3))
+            ->method('isAdmin')
+            ->with('UID')
+            ->willReturn(true);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData());
+    }
+
+
+
+    public function testEditUserAdminUserSelfEditChangeInvalidQuota(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Invalid quota value: ABC');
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->exactly(3))
+            ->method('isAdmin')
+            ->with('UID')
+            ->willReturn(true);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->api->editUser('UserToEdit', 'quota', 'ABC');
+    }
+
+    public function testEditUserAdminUserEditChangeValidQuota(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->willReturnCallback(function ($appid, $key, $default) {
+                if ($key === 'max_quota') {
+                    return '-1';
+                }
+                return null;
+            });
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser->expects($this->once())
+            ->method('setQuota')
+            ->with('2.9 MB');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData());
+    }
+
+    public function testEditUserSelfEditChangeLanguage(): void {
+        $this->l10nFactory->expects($this->once())
+            ->method('findAvailableLanguages')
+            ->willReturn(['en', 'de', 'sv']);
+        $this->config->expects($this->any())
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['allow_user_to_change_display_name', true, true],
+                ['force_language', false, false],
+            ]);
+
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UserToEdit');
+        $targetUser = $this->createMock(IUser::class);
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with('UserToEdit', 'core', 'lang', 'de');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->atLeastOnce())
+            ->method('isAdmin')
+            ->with('UserToEdit')
+            ->willReturn(false);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UserToEdit');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData());
+    }
+
+    public static function dataEditUserSelfEditChangeLanguageButForced(): array {
+        return [
+            ['de'],
+            [true],
+        ];
+    }
+
+    /**
+     * @dataProvider dataEditUserSelfEditChangeLanguageButForced
+     */
+    public function testEditUserSelfEditChangeLanguageButForced($forced): void {
+        $this->expectException(OCSException::class);
+
+        $this->config->expects($this->any())
+            ->method('getSystemValue')
+            ->willReturnMap([
+                ['allow_user_to_change_display_name', true, true],
+                ['force_language', false, $forced],
+            ]);
+
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UserToEdit');
+        $targetUser = $this->createMock(IUser::class);
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->atLeastOnce())
+            ->method('isAdmin')
+            ->with('UserToEdit')
+            ->willReturn(false);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UserToEdit');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData());
+    }
+
+    public function testEditUserAdminEditChangeLanguage(): void {
+        $this->l10nFactory->expects($this->once())
+            ->method('findAvailableLanguages')
+            ->willReturn(['en', 'de', 'sv']);
+
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->createMock(IUser::class);
+        $this->config->expects($this->once())
+            ->method('setUserValue')
+            ->with('UserToEdit', 'core', 'lang', 'de');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+        $subAdminManager = $this->createMock(SubAdmin::class);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UserToEdit');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'de')->getData());
+    }
+
+    /**
+     * @dataProvider dataEditUserSelfEditChangeLanguageButForced
+     */
+    public function testEditUserAdminEditChangeLanguageInvalidLanguage(): void {
+        $this->expectException(OCSException::class);
+
+
+        $this->l10nFactory->expects($this->once())
+            ->method('findAvailableLanguages')
+            ->willReturn(['en', 'de', 'sv']);
+
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->createMock(IUser::class);
+        $this->config->expects($this->never())
+            ->method('setUserValue');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+        $subAdminManager = $this->createMock(SubAdmin::class);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UserToEdit');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'language', 'ru')->getData());
+    }
+
+    public function testEditUserSubadminUserAccessible(): void {
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->willReturnCallback(function ($appid, $key, $default) {
+                if ($key === 'max_quota') {
+                    return '-1';
+                }
+                return null;
+            });
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser->expects($this->once())
+            ->method('setQuota')
+            ->with('2.9 MB');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $backend = $this->createMock(UserInterface::class);
+        $targetUser
+            ->expects($this->any())
+            ->method('getBackend')
+            ->willReturn($backend);
+
+        $this->assertEquals([], $this->api->editUser('UserToEdit', 'quota', '3042824')->getData());
+    }
+
+
+    public function testEditUserSubadminUserInaccessible(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToEdit')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+
+        $this->api->editUser('UserToEdit', 'quota', 'value');
+    }
+
+
+    public function testDeleteUserNotExistingUser(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UserToEdit');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToDelete')
+            ->willReturn(null);
+
+        $this->api->deleteUser('UserToDelete');
+    }
+
+
+    public function testDeleteUserSelf(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('UID');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToDelete')
+            ->willReturn($targetUser);
+
+        $this->api->deleteUser('UserToDelete');
+    }
+
+    public function testDeleteSuccessfulUserAsAdmin(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToDelete')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+        $targetUser
+            ->expects($this->once())
+            ->method('delete')
+            ->willReturn(true);
+
+        $this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData());
+    }
+
+
+    public function testDeleteUnsuccessfulUserAsAdmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToDelete')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+        $targetUser
+            ->expects($this->once())
+            ->method('delete')
+            ->willReturn(false);
+
+        $this->api->deleteUser('UserToDelete');
+    }
+
+    public function testDeleteSuccessfulUserAsSubadmin(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToDelete')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->once())
+            ->method('delete')
+            ->willReturn(true);
+
+        $this->assertEquals([], $this->api->deleteUser('UserToDelete')->getData());
+    }
+
+
+    public function testDeleteUnsuccessfulUserAsSubadmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToDelete')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->once())
+            ->method('delete')
+            ->willReturn(false);
+
+        $this->api->deleteUser('UserToDelete');
+    }
+
+
+    public function testDeleteUserAsSubAdminAndUserIsNotAccessible(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UID');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToDelete')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->api->deleteUser('UserToDelete');
+    }
+
+
+    public function testGetUsersGroupsTargetUserNotExisting(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+
+        $this->api->getUsersGroups('UserToLookup');
+    }
+
+    public function testGetUsersGroupsSelfTargetted(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->exactly(3))
+            ->method('getUID')
+            ->willReturn('UserToLookup');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UserToLookup');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToLookup')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getUserGroupIds')
+            ->with($targetUser)
+            ->willReturn(['DummyValue']);
+
+        $this->assertEquals(['groups' => ['DummyValue']], $this->api->getUsersGroups('UserToLookup')->getData());
+    }
+
+    public function testGetUsersGroupsForAdminUser(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->exactly(3))
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UserToLookup');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToLookup')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getUserGroupIds')
+            ->with($targetUser)
+            ->willReturn(['DummyValue']);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+
+        $this->assertEquals(['groups' => ['DummyValue']], $this->api->getUsersGroups('UserToLookup')->getData());
+    }
+
+    public function testGetUsersGroupsForSubAdminUserAndUserIsAccessible(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->exactly(3))
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UserToLookup');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToLookup')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $group1 = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $group1
+            ->expects($this->any())
+            ->method('getGID')
+            ->willReturn('Group1');
+        $group2 = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $group2
+            ->expects($this->any())
+            ->method('getGID')
+            ->willReturn('Group2');
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->with($loggedInUser)
+            ->willReturn([$group1, $group2]);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('getUserGroupIds')
+            ->with($targetUser)
+            ->willReturn(['Group1']);
+
+        $this->assertEquals(['groups' => ['Group1']], $this->api->getUsersGroups('UserToLookup')->getData());
+    }
+
+
+    public function testGetUsersGroupsForSubAdminUserAndUserIsInaccessible(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->exactly(3))
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('UserToLookup');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToLookup')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('getUserGroupIds')
+            ->with($targetUser)
+            ->willReturn(['Group1']);
+
+        $this->api->getUsersGroups('UserToLookup');
+    }
+
+
+    public function testAddToGroupWithTargetGroupNotExisting(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(102);
+
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('GroupToAddTo')
+            ->willReturn(null);
+
+        $this->api->addToGroup('TargetUser', 'GroupToAddTo');
+    }
+
+
+    public function testAddToGroupWithNoGroupSpecified(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $this->api->addToGroup('TargetUser');
+    }
+
+
+    public function testAddToGroupWithTargetUserNotExisting(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(103);
+
+        $targetGroup = $this->createMock(IGroup::class);
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('GroupToAddTo')
+            ->willReturn($targetGroup);
+
+        $this->api->addToGroup('TargetUser', 'GroupToAddTo');
+    }
+
+
+    public function testAddToGroupNoSubadmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(104);
+
+        $targetUser = $this->createMock(IUser::class);
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('subadmin');
+
+        $targetGroup = $this->createMock(IGroup::class);
+        $targetGroup->expects($this->never())
+            ->method('addUser')
+            ->with($targetUser);
+
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('GroupToAddTo')
+            ->willReturn($targetGroup);
+
+
+        $subAdminManager = $this->createMock(SubAdmin::class);
+        $subAdminManager->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($loggedInUser, $targetGroup)
+            ->willReturn(false);
+
+        $this->groupManager->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('TargetUser')
+            ->willReturn($targetUser);
+
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+
+        $this->api->addToGroup('TargetUser', 'GroupToAddTo');
+    }
+
+    public function testAddToGroupSuccessAsSubadmin(): void {
+        $targetUser = $this->createMock(IUser::class);
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('subadmin');
+
+        $targetGroup = $this->createMock(IGroup::class);
+        $targetGroup->expects($this->once())
+            ->method('addUser')
+            ->with($targetUser);
+
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('GroupToAddTo')
+            ->willReturn($targetGroup);
 
-
-		$subAdminManager = $this->createMock(SubAdmin::class);
-		$subAdminManager->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($loggedInUser, $targetGroup)
-			->willReturn(true);
-
-		$this->groupManager->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('TargetUser')
-			->willReturn($targetUser);
-
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-
-		$this->assertEquals(new DataResponse(), $this->api->addToGroup('TargetUser', 'GroupToAddTo'));
-	}
-
-	public function testAddToGroupSuccessAsAdmin(): void {
-		$targetUser = $this->createMock(IUser::class);
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('admin');
-
-		$targetGroup = $this->createMock(IGroup::class);
-		$targetGroup->expects($this->once())
-			->method('addUser')
-			->with($targetUser);
-
-		$this->groupManager->expects($this->once())
-			->method('get')
-			->with('GroupToAddTo')
-			->willReturn($targetGroup);
-
-
-		$subAdminManager = $this->createMock(SubAdmin::class);
-		$subAdminManager->expects($this->never())
-			->method('isSubAdminOfGroup');
-
-		$this->groupManager->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager->expects($this->once())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-
-		$this->userManager->expects($this->once())
-			->method('get')
-			->with('TargetUser')
-			->willReturn($targetUser);
-
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-
-		$this->assertEquals(new DataResponse(), $this->api->addToGroup('TargetUser', 'GroupToAddTo'));
-	}
-
-
-	public function testRemoveFromGroupWithNoTargetGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-
-		$this->api->removeFromGroup('TargetUser', '');
-	}
-
-
-	public function testRemoveFromGroupWithEmptyTargetGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-
-		$this->api->removeFromGroup('TargetUser', '');
-	}
-
-
-	public function testRemoveFromGroupWithNotExistingTargetGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(102);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetGroup')
-			->willReturn(null);
-
-		$this->api->removeFromGroup('TargetUser', 'TargetGroup');
-	}
-
-
-	public function testRemoveFromGroupWithNotExistingTargetUser(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(103);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetGroup')
-			->willReturn($targetGroup);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetUser')
-			->willReturn(null);
-
-		$this->api->removeFromGroup('TargetUser', 'TargetGroup');
-	}
-
-
-	public function testRemoveFromGroupWithoutPermission(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(104);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('unauthorizedUser');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetGroup')
-			->willReturn($targetGroup);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetUser')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('unauthorizedUser')
-			->willReturn(false);
-
-		$this->api->removeFromGroup('TargetUser', 'TargetGroup');
-	}
-
-
-	public function testRemoveFromGroupAsAdminFromAdmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Cannot remove yourself from the admin group');
-		$this->expectExceptionCode(105);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('admin');
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$targetGroup
-			->expects($this->once())
-			->method('getGID')
-			->willReturn('admin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($targetGroup);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('Admin')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->any())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-
-		$this->api->removeFromGroup('Admin', 'admin');
-	}
-
-
-	public function testRemoveFromGroupAsSubAdminFromSubAdmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Cannot remove yourself from this group as you are a sub-admin');
-		$this->expectExceptionCode(105);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$targetGroup
-			->expects($this->any())
-			->method('getGID')
-			->willReturn('subadmin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('subadmin')
-			->willReturn($targetGroup);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('SubAdmin')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($loggedInUser, $targetGroup)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->any())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-
-		$this->api->removeFromGroup('SubAdmin', 'subadmin');
-	}
-
-
-	public function testRemoveFromGroupAsSubAdminFromLastSubAdminGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Not viable to remove user from the last group you are sub-admin of');
-		$this->expectExceptionCode(105);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$targetGroup
-			->expects($this->any())
-			->method('getGID')
-			->willReturn('subadmin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('subadmin')
-			->willReturn($targetGroup);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('AnotherUser')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($loggedInUser, $targetGroup)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->with($loggedInUser)
-			->willReturn([$targetGroup]);
-
-		$this->groupManager
-			->expects($this->any())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getUserGroupIds')
-			->with($targetUser)
-			->willReturn(['subadmin', 'other group']);
-
-		$this->api->removeFromGroup('AnotherUser', 'subadmin');
-	}
-
-	public function testRemoveFromGroupSuccessful(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->any())
-			->method('getUID')
-			->willReturn('admin');
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('admin')
-			->willReturn($targetGroup);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('AnotherUser')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$this->groupManager
-			->expects($this->any())
-			->method('isAdmin')
-			->with('admin')
-			->willReturn(true);
-		$targetGroup
-			->expects($this->once())
-			->method('removeUser')
-			->with($targetUser);
-
-		$this->assertEquals([], $this->api->removeFromGroup('AnotherUser', 'admin')->getData());
-	}
-
-
-	public function testAddSubAdminWithNotExistingTargetUser(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('User does not exist');
-		$this->expectExceptionCode(101);
-
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('NotExistingUser')
-			->willReturn(null);
-
-		$this->api->addSubAdmin('NotExistingUser', '');
-	}
-
-
-	public function testAddSubAdminWithNotExistingTargetGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Group does not exist');
-		$this->expectExceptionCode(102);
-
-
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingUser')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('NotExistingGroup')
-			->willReturn(null);
-
-		$this->api->addSubAdmin('ExistingUser', 'NotExistingGroup');
-	}
-
-
-	public function testAddSubAdminToAdminGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Cannot create sub-admins for admin group');
-		$this->expectExceptionCode(103);
-
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$targetGroup
-			->expects($this->once())
-			->method('getGID')
-			->willReturn('admin');
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingUser')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('ADmiN')
-			->willReturn($targetGroup);
-
-		$this->api->addSubAdmin('ExistingUser', 'ADmiN');
-	}
-
-	public function testAddSubAdminTwice(): void {
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingUser')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetGroup')
-			->willReturn($targetGroup);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($targetUser, $targetGroup)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->assertEquals([], $this->api->addSubAdmin('ExistingUser', 'TargetGroup')->getData());
-	}
-
-	public function testAddSubAdminSuccessful(): void {
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingUser')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('TargetGroup')
-			->willReturn($targetGroup);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($targetUser, $targetGroup)
-			->willReturn(false);
-		$subAdminManager
-			->expects($this->once())
-			->method('createSubAdmin')
-			->with($targetUser, $targetGroup);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->assertEquals([], $this->api->addSubAdmin('ExistingUser', 'TargetGroup')->getData());
-	}
-
-
-	public function testRemoveSubAdminNotExistingTargetUser(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('User does not exist');
-		$this->expectExceptionCode(101);
-
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('NotExistingUser')
-			->willReturn(null);
-
-		$this->api->removeSubAdmin('NotExistingUser', 'GroupToDeleteFrom');
-	}
-
-
-	public function testRemoveSubAdminNotExistingTargetGroup(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Group does not exist');
-		$this->expectExceptionCode(101);
-
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingUser')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('GroupToDeleteFrom')
-			->willReturn(null);
-
-		$this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom');
-	}
-
-
-
-	public function testRemoveSubAdminFromNotASubadmin(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('User is not a sub-admin of this group');
-		$this->expectExceptionCode(102);
-
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingUser')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('GroupToDeleteFrom')
-			->willReturn($targetGroup);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($targetUser, $targetGroup)
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom');
-	}
-
-	public function testRemoveSubAdminSuccessful(): void {
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('ExistingUser')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('get')
-			->with('GroupToDeleteFrom')
-			->willReturn($targetGroup);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isSubAdminOfGroup')
-			->with($targetUser, $targetGroup)
-			->willReturn(true);
-		$subAdminManager
-			->expects($this->once())
-			->method('deleteSubAdmin')
-			->with($targetUser, $targetGroup);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->assertEquals([], $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom')->getData());
-	}
-
-
-	public function testGetUserSubAdminGroupsNotExistingTargetUser(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('User does not exist');
-		$this->expectExceptionCode(404);
-
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('RequestedUser')
-			->willReturn(null);
-
-		$this->api->getUserSubAdminGroups('RequestedUser');
-	}
-
-	public function testGetUserSubAdminGroupsWithGroups(): void {
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
-		$targetGroup
-			->expects($this->once())
-			->method('getGID')
-			->willReturn('TargetGroup');
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('RequestedUser')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('getSubAdminsGroups')
-			->with($targetUser)
-			->willReturn([$targetGroup]);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->assertEquals(['TargetGroup'], $this->api->getUserSubAdminGroups('RequestedUser')->getData());
-	}
-
-	public function testEnableUser(): void {
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser->expects($this->once())
-			->method('setEnabled')
-			->with(true);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('RequestedUser')
-			->willReturn($targetUser);
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->exactly(3))
-			->method('getUID')
-			->willReturn('admin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->willReturn(true);
-
-		$this->assertEquals([], $this->api->enableUser('RequestedUser')->getData());
-	}
-
-	public function testDisableUser(): void {
-		$targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$targetUser->expects($this->once())
-			->method('setEnabled')
-			->with(false);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('RequestedUser')
-			->willReturn($targetUser);
-		$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
-		$loggedInUser
-			->expects($this->exactly(3))
-			->method('getUID')
-			->willReturn('admin');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->willReturn(true);
-
-		$this->assertEquals([], $this->api->disableUser('RequestedUser')->getData());
-	}
-
-	public function testGetCurrentUserLoggedIn(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())->method('getUID')->willReturn('UID');
-
-		$this->userSession->expects($this->once())->method('getUser')
-			->willReturn($user);
-
-		/** @var UsersController | MockObject $api */
-		$api = $this->getMockBuilder(UsersController::class)
-			->setConstructorArgs([
-				'provisioning_api',
-				$this->request,
-				$this->userManager,
-				$this->config,
-				$this->groupManager,
-				$this->userSession,
-				$this->accountManager,
-				$this->subAdminManager,
-				$this->l10nFactory,
-				$this->rootFolder,
-				$this->urlGenerator,
-				$this->logger,
-				$this->newUserMailHelper,
-				$this->secureRandom,
-				$this->remoteWipe,
-				$this->knownUserService,
-				$this->eventDispatcher,
-				$this->phoneNumberUtil,
-				$this->appManager,
-			])
-			->onlyMethods(['getUserData'])
-			->getMock();
-
-		$api->expects($this->once())->method('getUserData')->with('UID', true)
-			->willReturn(
-				[
-					'id' => 'UID',
-					'enabled' => 'true',
-					'quota' => ['DummyValue'],
-					'email' => 'demo@nextcloud.com',
-					'displayname' => 'Demo User',
-					'display-name' => 'Demo User',
-					'phone' => 'phone',
-					'address' => 'address',
-					'website' => 'website',
-					'twitter' => 'twitter',
-					'fediverse' => 'fediverse',
-					'organisation' => 'organisation',
-					'role' => 'role',
-					'headline' => 'headline',
-					'biography' => 'biography',
-					'profile_enabled' => '1',
-					'pronouns' => 'they/them',
-				]
-			);
-
-		$expected = [
-			'id' => 'UID',
-			'enabled' => 'true',
-			'quota' => ['DummyValue'],
-			'email' => 'demo@nextcloud.com',
-			'displayname' => 'Demo User',
-			'display-name' => 'Demo User',
-			'phone' => 'phone',
-			'address' => 'address',
-			'website' => 'website',
-			'twitter' => 'twitter',
-			'fediverse' => 'fediverse',
-			'organisation' => 'organisation',
-			'role' => 'role',
-			'headline' => 'headline',
-			'biography' => 'biography',
-			'profile_enabled' => '1',
-			'pronouns' => 'they/them',
-		];
-
-		$this->assertSame($expected, $api->getCurrentUser()->getData());
-	}
-
-
-	public function testGetCurrentUserNotLoggedIn(): void {
-		$this->expectException(OCSException::class);
-
-
-		$this->userSession->expects($this->once())->method('getUser')
-			->willReturn(null);
-
-		$this->api->getCurrentUser();
-	}
-
-	public function testGetUser(): void {
-		$loggedInUser = $this->createMock(IUser::class);
-		$loggedInUser
-			->method('getUID')
-			->willReturn('currentuser');
-		$this->userSession
-			->method('getUser')
-			->willReturn($loggedInUser);
-
-		/** @var UsersController | MockObject $api */
-		$api = $this->getMockBuilder(UsersController::class)
-			->setConstructorArgs([
-				'provisioning_api',
-				$this->request,
-				$this->userManager,
-				$this->config,
-				$this->groupManager,
-				$this->userSession,
-				$this->accountManager,
-				$this->subAdminManager,
-				$this->l10nFactory,
-				$this->rootFolder,
-				$this->urlGenerator,
-				$this->logger,
-				$this->newUserMailHelper,
-				$this->secureRandom,
-				$this->remoteWipe,
-				$this->knownUserService,
-				$this->eventDispatcher,
-				$this->phoneNumberUtil,
-				$this->appManager,
-			])
-			->onlyMethods(['getUserData'])
-			->getMock();
-
-		$expected = [
-			'id' => 'UID',
-			'enabled' => 'true',
-			'quota' => ['DummyValue'],
-			'email' => 'demo@nextcloud.com',
-			'phone' => 'phone',
-			'address' => 'address',
-			'website' => 'website',
-			'twitter' => 'twitter',
-			'fediverse' => 'fediverse',
-			'displayname' => 'Demo User',
-			'display-name' => 'Demo User',
-			'organisation' => 'organisation',
-			'role' => 'role',
-			'headline' => 'headline',
-			'biography' => 'biography',
-			'profile_enabled' => '1',
-			'pronouns' => 'they/them',
-		];
-
-		$api->expects($this->exactly(2))
-			->method('getUserData')
-			->willReturnMap([
-				['uid', false, $expected],
-				['currentuser', true, $expected],
-			]);
-
-		$this->assertSame($expected, $api->getUser('uid')->getData());
-
-		$this->assertSame($expected, $api->getUser('currentuser')->getData());
-	}
-
-
-	public function testResendWelcomeMessageWithNotExistingTargetUser(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('NotExistingUser')
-			->willReturn(null);
-
-		$this->api->resendWelcomeMessage('NotExistingUser');
-	}
-
-
-	public function testResendWelcomeMessageAsSubAdminAndUserIsNotAccessible(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionCode(998);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('subadmin');
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn($targetUser);
-		$this->groupManager
-			->expects($this->once())
-			->method('isAdmin')
-			->with('subadmin')
-			->willReturn(false);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(false);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-
-		$this->api->resendWelcomeMessage('UserToGet');
-	}
-
-
-	public function testResendWelcomeMessageNoEmail(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Email address not available');
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('logged-user-id');
-		$targetUser
-			->expects($this->once())
-			->method('getEmailAddress')
-			->willReturn('');
-
-		$this->api->resendWelcomeMessage('UserToGet');
-	}
-
-
-	public function testResendWelcomeMessageNullEmail(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Email address not available');
-		$this->expectExceptionCode(101);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('logged-user-id');
-		$targetUser
-			->expects($this->once())
-			->method('getEmailAddress')
-			->willReturn(null);
-
-		$this->api->resendWelcomeMessage('UserToGet');
-	}
-
-	public function testResendWelcomeMessageSuccess(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->method('getUID')
-			->willReturn('logged-user-id');
-		$targetUser
-			->method('getUID')
-			->willReturn('user-id');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->once())
-			->method('getEmailAddress')
-			->willReturn('abc@example.org');
-		$emailTemplate = $this->createMock(IEMailTemplate::class);
-		$this->newUserMailHelper
-			->expects($this->once())
-			->method('generateTemplate')
-			->willReturn($emailTemplate);
-		$this->newUserMailHelper
-			->expects($this->once())
-			->method('sendMail')
-			->with($targetUser, $emailTemplate);
-
-		$this->api->resendWelcomeMessage('UserToGet');
-	}
-
-	public function testResendWelcomeMessageSuccessWithFallbackLanguage(): void {
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->method('getUID')
-			->willReturn('logged-user-id');
-		$targetUser
-			->method('getUID')
-			->willReturn('user-id');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->once())
-			->method('getEmailAddress')
-			->willReturn('abc@example.org');
-		$emailTemplate = $this->createMock(IEMailTemplate::class);
-		$this->newUserMailHelper
-			->expects($this->once())
-			->method('generateTemplate')
-			->willReturn($emailTemplate);
-		$this->newUserMailHelper
-			->expects($this->once())
-			->method('sendMail')
-			->with($targetUser, $emailTemplate);
-
-		$this->api->resendWelcomeMessage('UserToGet');
-	}
-
-
-	public function testResendWelcomeMessageFailed(): void {
-		$this->expectException(OCSException::class);
-		$this->expectExceptionMessage('Sending email failed');
-		$this->expectExceptionCode(102);
-
-		$loggedInUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$targetUser = $this->getMockBuilder(IUser::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$loggedInUser
-			->expects($this->exactly(2))
-			->method('getUID')
-			->willReturn('logged-user-id');
-		$targetUser
-			->method('getUID')
-			->willReturn('user-id');
-		$this->userSession
-			->expects($this->once())
-			->method('getUser')
-			->willReturn($loggedInUser);
-		$this->userManager
-			->expects($this->once())
-			->method('get')
-			->with('UserToGet')
-			->willReturn($targetUser);
-		$subAdminManager = $this->getMockBuilder('OC\SubAdmin')
-			->disableOriginalConstructor()
-			->getMock();
-		$subAdminManager
-			->expects($this->once())
-			->method('isUserAccessible')
-			->with($loggedInUser, $targetUser)
-			->willReturn(true);
-		$this->groupManager
-			->expects($this->once())
-			->method('getSubAdmin')
-			->willReturn($subAdminManager);
-		$targetUser
-			->expects($this->once())
-			->method('getEmailAddress')
-			->willReturn('abc@example.org');
-		$emailTemplate = $this->createMock(IEMailTemplate::class);
-		$this->newUserMailHelper
-			->expects($this->once())
-			->method('generateTemplate')
-			->willReturn($emailTemplate);
-		$this->newUserMailHelper
-			->expects($this->once())
-			->method('sendMail')
-			->with($targetUser, $emailTemplate)
-			->willThrowException(new \Exception());
-
-		$this->api->resendWelcomeMessage('UserToGet');
-	}
-
-
-	public static function dataGetEditableFields(): array {
-		return [
-			[false, true, ISetDisplayNameBackend::class, [
-				IAccountManager::PROPERTY_EMAIL,
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-			[true, false, ISetDisplayNameBackend::class, [
-				IAccountManager::PROPERTY_DISPLAYNAME,
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-			[true, true, ISetDisplayNameBackend::class, [
-				IAccountManager::PROPERTY_DISPLAYNAME,
-				IAccountManager::PROPERTY_EMAIL,
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-			[false, false, ISetDisplayNameBackend::class, [
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-			[false, true, UserInterface::class, [
-				IAccountManager::PROPERTY_EMAIL,
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-			[true, false, UserInterface::class, [
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-			[true, true, UserInterface::class, [
-				IAccountManager::PROPERTY_EMAIL,
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-			[false, false, UserInterface::class, [
-				IAccountManager::COLLECTION_EMAIL,
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGetEditableFields
-	 */
-	public function testGetEditableFields(bool $allowedToChangeDisplayName, bool $allowedToChangeEmail, string $userBackend, array $expected): void {
-		$this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => match ($key) {
-			'allow_user_to_change_display_name' => $allowedToChangeDisplayName,
-			'allow_user_to_change_email' => $allowedToChangeEmail,
-			default => throw new RuntimeException('Unexpected system config key: ' . $key),
-		});
-
-		$user = $this->createMock(IUser::class);
-		$this->userSession->method('getUser')
-			->willReturn($user);
-
-		$backend = $this->createMock($userBackend);
-
-		$user->method('getUID')
-			->willReturn('userId');
-		$user->method('getBackend')
-			->willReturn($backend);
-
-		$expectedResp = new DataResponse($expected);
-		$this->assertEquals($expectedResp, $this->api->getEditableFields('userId'));
-	}
-
-	private function mockAccount($targetUser, $accountProperties) {
-		$mockedProperties = [];
-
-		foreach ($accountProperties as $propertyName => $data) {
-			$mockedProperty = $this->createMock(IAccountProperty::class);
-			$mockedProperty->method('getValue')->willReturn($data['value'] ?? '');
-			$mockedProperty->method('getScope')->willReturn($data['scope'] ?? '');
-			$mockedProperties[] = [$propertyName, $mockedProperty];
-		}
-
-		$account = $this->createMock(IAccount::class);
-		$account->method('getProperty')
-			->will($this->returnValueMap($mockedProperties));
-
-		$this->accountManager->expects($this->any())->method('getAccount')
-			->with($targetUser)
-			->willReturn($account);
-	}
+
+        $subAdminManager = $this->createMock(SubAdmin::class);
+        $subAdminManager->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($loggedInUser, $targetGroup)
+            ->willReturn(true);
+
+        $this->groupManager->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('TargetUser')
+            ->willReturn($targetUser);
+
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+
+        $this->assertEquals(new DataResponse(), $this->api->addToGroup('TargetUser', 'GroupToAddTo'));
+    }
+
+    public function testAddToGroupSuccessAsAdmin(): void {
+        $targetUser = $this->createMock(IUser::class);
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('admin');
+
+        $targetGroup = $this->createMock(IGroup::class);
+        $targetGroup->expects($this->once())
+            ->method('addUser')
+            ->with($targetUser);
+
+        $this->groupManager->expects($this->once())
+            ->method('get')
+            ->with('GroupToAddTo')
+            ->willReturn($targetGroup);
+
+
+        $subAdminManager = $this->createMock(SubAdmin::class);
+        $subAdminManager->expects($this->never())
+            ->method('isSubAdminOfGroup');
+
+        $this->groupManager->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager->expects($this->once())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+
+        $this->userManager->expects($this->once())
+            ->method('get')
+            ->with('TargetUser')
+            ->willReturn($targetUser);
+
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+
+        $this->assertEquals(new DataResponse(), $this->api->addToGroup('TargetUser', 'GroupToAddTo'));
+    }
+
+
+    public function testRemoveFromGroupWithNoTargetGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+
+        $this->api->removeFromGroup('TargetUser', '');
+    }
+
+
+    public function testRemoveFromGroupWithEmptyTargetGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+
+        $this->api->removeFromGroup('TargetUser', '');
+    }
+
+
+    public function testRemoveFromGroupWithNotExistingTargetGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(102);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('TargetGroup')
+            ->willReturn(null);
+
+        $this->api->removeFromGroup('TargetUser', 'TargetGroup');
+    }
+
+
+    public function testRemoveFromGroupWithNotExistingTargetUser(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(103);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('TargetGroup')
+            ->willReturn($targetGroup);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('TargetUser')
+            ->willReturn(null);
+
+        $this->api->removeFromGroup('TargetUser', 'TargetGroup');
+    }
+
+
+    public function testRemoveFromGroupWithoutPermission(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(104);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('unauthorizedUser');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('TargetGroup')
+            ->willReturn($targetGroup);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('TargetUser')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('unauthorizedUser')
+            ->willReturn(false);
+
+        $this->api->removeFromGroup('TargetUser', 'TargetGroup');
+    }
+
+
+    public function testRemoveFromGroupAsAdminFromAdmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Cannot remove yourself from the admin group');
+        $this->expectExceptionCode(105);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $targetGroup
+            ->expects($this->once())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($targetGroup);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('Admin')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+
+        $this->api->removeFromGroup('Admin', 'admin');
+    }
+
+
+    public function testRemoveFromGroupAsSubAdminFromSubAdmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Cannot remove yourself from this group as you are a sub-admin');
+        $this->expectExceptionCode(105);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser
+            ->expects($this->once())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $targetGroup
+            ->expects($this->any())
+            ->method('getGID')
+            ->willReturn('subadmin');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('subadmin')
+            ->willReturn($targetGroup);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('SubAdmin')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($loggedInUser, $targetGroup)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+
+        $this->api->removeFromGroup('SubAdmin', 'subadmin');
+    }
+
+
+    public function testRemoveFromGroupAsSubAdminFromLastSubAdminGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Not viable to remove user from the last group you are sub-admin of');
+        $this->expectExceptionCode(105);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $targetGroup
+            ->expects($this->any())
+            ->method('getGID')
+            ->willReturn('subadmin');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('subadmin')
+            ->willReturn($targetGroup);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('AnotherUser')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($loggedInUser, $targetGroup)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->with($loggedInUser)
+            ->willReturn([$targetGroup]);
+
+        $this->groupManager
+            ->expects($this->any())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getUserGroupIds')
+            ->with($targetUser)
+            ->willReturn(['subadmin', 'other group']);
+
+        $this->api->removeFromGroup('AnotherUser', 'subadmin');
+    }
+
+    public function testRemoveFromGroupSuccessful(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin');
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('admin')
+            ->willReturn($targetGroup);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('AnotherUser')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $this->groupManager
+            ->expects($this->any())
+            ->method('isAdmin')
+            ->with('admin')
+            ->willReturn(true);
+        $targetGroup
+            ->expects($this->once())
+            ->method('removeUser')
+            ->with($targetUser);
+
+        $this->assertEquals([], $this->api->removeFromGroup('AnotherUser', 'admin')->getData());
+    }
+
+
+    public function testAddSubAdminWithNotExistingTargetUser(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('User does not exist');
+        $this->expectExceptionCode(101);
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('NotExistingUser')
+            ->willReturn(null);
+
+        $this->api->addSubAdmin('NotExistingUser', '');
+    }
+
+
+    public function testAddSubAdminWithNotExistingTargetGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Group does not exist');
+        $this->expectExceptionCode(102);
+
+
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingUser')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('NotExistingGroup')
+            ->willReturn(null);
+
+        $this->api->addSubAdmin('ExistingUser', 'NotExistingGroup');
+    }
+
+
+    public function testAddSubAdminToAdminGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Cannot create sub-admins for admin group');
+        $this->expectExceptionCode(103);
+
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $targetGroup
+            ->expects($this->once())
+            ->method('getGID')
+            ->willReturn('admin');
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingUser')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ADmiN')
+            ->willReturn($targetGroup);
+
+        $this->api->addSubAdmin('ExistingUser', 'ADmiN');
+    }
+
+    public function testAddSubAdminTwice(): void {
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingUser')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('TargetGroup')
+            ->willReturn($targetGroup);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($targetUser, $targetGroup)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->assertEquals([], $this->api->addSubAdmin('ExistingUser', 'TargetGroup')->getData());
+    }
+
+    public function testAddSubAdminSuccessful(): void {
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingUser')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('TargetGroup')
+            ->willReturn($targetGroup);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($targetUser, $targetGroup)
+            ->willReturn(false);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('createSubAdmin')
+            ->with($targetUser, $targetGroup);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->assertEquals([], $this->api->addSubAdmin('ExistingUser', 'TargetGroup')->getData());
+    }
+
+
+    public function testRemoveSubAdminNotExistingTargetUser(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('User does not exist');
+        $this->expectExceptionCode(101);
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('NotExistingUser')
+            ->willReturn(null);
+
+        $this->api->removeSubAdmin('NotExistingUser', 'GroupToDeleteFrom');
+    }
+
+
+    public function testRemoveSubAdminNotExistingTargetGroup(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Group does not exist');
+        $this->expectExceptionCode(101);
+
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingUser')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('GroupToDeleteFrom')
+            ->willReturn(null);
+
+        $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom');
+    }
+
+
+
+    public function testRemoveSubAdminFromNotASubadmin(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('User is not a sub-admin of this group');
+        $this->expectExceptionCode(102);
+
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingUser')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('GroupToDeleteFrom')
+            ->willReturn($targetGroup);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($targetUser, $targetGroup)
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom');
+    }
+
+    public function testRemoveSubAdminSuccessful(): void {
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('ExistingUser')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('GroupToDeleteFrom')
+            ->willReturn($targetGroup);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isSubAdminOfGroup')
+            ->with($targetUser, $targetGroup)
+            ->willReturn(true);
+        $subAdminManager
+            ->expects($this->once())
+            ->method('deleteSubAdmin')
+            ->with($targetUser, $targetGroup);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->assertEquals([], $this->api->removeSubAdmin('ExistingUser', 'GroupToDeleteFrom')->getData());
+    }
+
+
+    public function testGetUserSubAdminGroupsNotExistingTargetUser(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('User does not exist');
+        $this->expectExceptionCode(404);
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('RequestedUser')
+            ->willReturn(null);
+
+        $this->api->getUserSubAdminGroups('RequestedUser');
+    }
+
+    public function testGetUserSubAdminGroupsWithGroups(): void {
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetGroup = $this->getMockBuilder('\OCP\IGroup')->disableOriginalConstructor()->getMock();
+        $targetGroup
+            ->expects($this->once())
+            ->method('getGID')
+            ->willReturn('TargetGroup');
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('RequestedUser')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('getSubAdminsGroups')
+            ->with($targetUser)
+            ->willReturn([$targetGroup]);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->assertEquals(['TargetGroup'], $this->api->getUserSubAdminGroups('RequestedUser')->getData());
+    }
+
+    public function testEnableUser(): void {
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser->expects($this->once())
+            ->method('setEnabled')
+            ->with(true);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('RequestedUser')
+            ->willReturn($targetUser);
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->exactly(3))
+            ->method('getUID')
+            ->willReturn('admin');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->willReturn(true);
+
+        $this->assertEquals([], $this->api->enableUser('RequestedUser')->getData());
+    }
+
+    public function testDisableUser(): void {
+        $targetUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $targetUser->expects($this->once())
+            ->method('setEnabled')
+            ->with(false);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('RequestedUser')
+            ->willReturn($targetUser);
+        $loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
+        $loggedInUser
+            ->expects($this->exactly(3))
+            ->method('getUID')
+            ->willReturn('admin');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->willReturn(true);
+
+        $this->assertEquals([], $this->api->disableUser('RequestedUser')->getData());
+    }
+
+    public function testGetCurrentUserLoggedIn(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())->method('getUID')->willReturn('UID');
+
+        $this->userSession->expects($this->once())->method('getUser')
+            ->willReturn($user);
+
+        /** @var UsersController | MockObject $api */
+        $api = $this->getMockBuilder(UsersController::class)
+            ->setConstructorArgs([
+                'provisioning_api',
+                $this->request,
+                $this->userManager,
+                $this->config,
+                $this->groupManager,
+                $this->userSession,
+                $this->accountManager,
+                $this->subAdminManager,
+                $this->l10nFactory,
+                $this->rootFolder,
+                $this->urlGenerator,
+                $this->logger,
+                $this->newUserMailHelper,
+                $this->secureRandom,
+                $this->remoteWipe,
+                $this->knownUserService,
+                $this->eventDispatcher,
+                $this->phoneNumberUtil,
+                $this->appManager,
+            ])
+            ->onlyMethods(['getUserData'])
+            ->getMock();
+
+        $api->expects($this->once())->method('getUserData')->with('UID', true)
+            ->willReturn(
+                [
+                    'id' => 'UID',
+                    'enabled' => 'true',
+                    'quota' => ['DummyValue'],
+                    'email' => 'demo@nextcloud.com',
+                    'displayname' => 'Demo User',
+                    'display-name' => 'Demo User',
+                    'phone' => 'phone',
+                    'address' => 'address',
+                    'website' => 'website',
+                    'twitter' => 'twitter',
+                    'fediverse' => 'fediverse',
+                    'organisation' => 'organisation',
+                    'role' => 'role',
+                    'headline' => 'headline',
+                    'biography' => 'biography',
+                    'profile_enabled' => '1',
+                    'pronouns' => 'they/them',
+                ]
+            );
+
+        $expected = [
+            'id' => 'UID',
+            'enabled' => 'true',
+            'quota' => ['DummyValue'],
+            'email' => 'demo@nextcloud.com',
+            'displayname' => 'Demo User',
+            'display-name' => 'Demo User',
+            'phone' => 'phone',
+            'address' => 'address',
+            'website' => 'website',
+            'twitter' => 'twitter',
+            'fediverse' => 'fediverse',
+            'organisation' => 'organisation',
+            'role' => 'role',
+            'headline' => 'headline',
+            'biography' => 'biography',
+            'profile_enabled' => '1',
+            'pronouns' => 'they/them',
+        ];
+
+        $this->assertSame($expected, $api->getCurrentUser()->getData());
+    }
+
+
+    public function testGetCurrentUserNotLoggedIn(): void {
+        $this->expectException(OCSException::class);
+
+
+        $this->userSession->expects($this->once())->method('getUser')
+            ->willReturn(null);
+
+        $this->api->getCurrentUser();
+    }
+
+    public function testGetUser(): void {
+        $loggedInUser = $this->createMock(IUser::class);
+        $loggedInUser
+            ->method('getUID')
+            ->willReturn('currentuser');
+        $this->userSession
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+
+        /** @var UsersController | MockObject $api */
+        $api = $this->getMockBuilder(UsersController::class)
+            ->setConstructorArgs([
+                'provisioning_api',
+                $this->request,
+                $this->userManager,
+                $this->config,
+                $this->groupManager,
+                $this->userSession,
+                $this->accountManager,
+                $this->subAdminManager,
+                $this->l10nFactory,
+                $this->rootFolder,
+                $this->urlGenerator,
+                $this->logger,
+                $this->newUserMailHelper,
+                $this->secureRandom,
+                $this->remoteWipe,
+                $this->knownUserService,
+                $this->eventDispatcher,
+                $this->phoneNumberUtil,
+                $this->appManager,
+            ])
+            ->onlyMethods(['getUserData'])
+            ->getMock();
+
+        $expected = [
+            'id' => 'UID',
+            'enabled' => 'true',
+            'quota' => ['DummyValue'],
+            'email' => 'demo@nextcloud.com',
+            'phone' => 'phone',
+            'address' => 'address',
+            'website' => 'website',
+            'twitter' => 'twitter',
+            'fediverse' => 'fediverse',
+            'displayname' => 'Demo User',
+            'display-name' => 'Demo User',
+            'organisation' => 'organisation',
+            'role' => 'role',
+            'headline' => 'headline',
+            'biography' => 'biography',
+            'profile_enabled' => '1',
+            'pronouns' => 'they/them',
+        ];
+
+        $api->expects($this->exactly(2))
+            ->method('getUserData')
+            ->willReturnMap([
+                ['uid', false, $expected],
+                ['currentuser', true, $expected],
+            ]);
+
+        $this->assertSame($expected, $api->getUser('uid')->getData());
+
+        $this->assertSame($expected, $api->getUser('currentuser')->getData());
+    }
+
+
+    public function testResendWelcomeMessageWithNotExistingTargetUser(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('NotExistingUser')
+            ->willReturn(null);
+
+        $this->api->resendWelcomeMessage('NotExistingUser');
+    }
+
+
+    public function testResendWelcomeMessageAsSubAdminAndUserIsNotAccessible(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionCode(998);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('subadmin');
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn($targetUser);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('isAdmin')
+            ->with('subadmin')
+            ->willReturn(false);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(false);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+
+        $this->api->resendWelcomeMessage('UserToGet');
+    }
+
+
+    public function testResendWelcomeMessageNoEmail(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Email address not available');
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('logged-user-id');
+        $targetUser
+            ->expects($this->once())
+            ->method('getEmailAddress')
+            ->willReturn('');
+
+        $this->api->resendWelcomeMessage('UserToGet');
+    }
+
+
+    public function testResendWelcomeMessageNullEmail(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Email address not available');
+        $this->expectExceptionCode(101);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('logged-user-id');
+        $targetUser
+            ->expects($this->once())
+            ->method('getEmailAddress')
+            ->willReturn(null);
+
+        $this->api->resendWelcomeMessage('UserToGet');
+    }
+
+    public function testResendWelcomeMessageSuccess(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->method('getUID')
+            ->willReturn('logged-user-id');
+        $targetUser
+            ->method('getUID')
+            ->willReturn('user-id');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->once())
+            ->method('getEmailAddress')
+            ->willReturn('abc@example.org');
+        $emailTemplate = $this->createMock(IEMailTemplate::class);
+        $this->newUserMailHelper
+            ->expects($this->once())
+            ->method('generateTemplate')
+            ->willReturn($emailTemplate);
+        $this->newUserMailHelper
+            ->expects($this->once())
+            ->method('sendMail')
+            ->with($targetUser, $emailTemplate);
+
+        $this->api->resendWelcomeMessage('UserToGet');
+    }
+
+    public function testResendWelcomeMessageSuccessWithFallbackLanguage(): void {
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->method('getUID')
+            ->willReturn('logged-user-id');
+        $targetUser
+            ->method('getUID')
+            ->willReturn('user-id');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->once())
+            ->method('getEmailAddress')
+            ->willReturn('abc@example.org');
+        $emailTemplate = $this->createMock(IEMailTemplate::class);
+        $this->newUserMailHelper
+            ->expects($this->once())
+            ->method('generateTemplate')
+            ->willReturn($emailTemplate);
+        $this->newUserMailHelper
+            ->expects($this->once())
+            ->method('sendMail')
+            ->with($targetUser, $emailTemplate);
+
+        $this->api->resendWelcomeMessage('UserToGet');
+    }
+
+
+    public function testResendWelcomeMessageFailed(): void {
+        $this->expectException(OCSException::class);
+        $this->expectExceptionMessage('Sending email failed');
+        $this->expectExceptionCode(102);
+
+        $loggedInUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $targetUser = $this->getMockBuilder(IUser::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $loggedInUser
+            ->expects($this->exactly(2))
+            ->method('getUID')
+            ->willReturn('logged-user-id');
+        $targetUser
+            ->method('getUID')
+            ->willReturn('user-id');
+        $this->userSession
+            ->expects($this->once())
+            ->method('getUser')
+            ->willReturn($loggedInUser);
+        $this->userManager
+            ->expects($this->once())
+            ->method('get')
+            ->with('UserToGet')
+            ->willReturn($targetUser);
+        $subAdminManager = $this->getMockBuilder('OC\SubAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $subAdminManager
+            ->expects($this->once())
+            ->method('isUserAccessible')
+            ->with($loggedInUser, $targetUser)
+            ->willReturn(true);
+        $this->groupManager
+            ->expects($this->once())
+            ->method('getSubAdmin')
+            ->willReturn($subAdminManager);
+        $targetUser
+            ->expects($this->once())
+            ->method('getEmailAddress')
+            ->willReturn('abc@example.org');
+        $emailTemplate = $this->createMock(IEMailTemplate::class);
+        $this->newUserMailHelper
+            ->expects($this->once())
+            ->method('generateTemplate')
+            ->willReturn($emailTemplate);
+        $this->newUserMailHelper
+            ->expects($this->once())
+            ->method('sendMail')
+            ->with($targetUser, $emailTemplate)
+            ->willThrowException(new \Exception());
+
+        $this->api->resendWelcomeMessage('UserToGet');
+    }
+
+
+    public static function dataGetEditableFields(): array {
+        return [
+            [false, true, ISetDisplayNameBackend::class, [
+                IAccountManager::PROPERTY_EMAIL,
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+            [true, false, ISetDisplayNameBackend::class, [
+                IAccountManager::PROPERTY_DISPLAYNAME,
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+            [true, true, ISetDisplayNameBackend::class, [
+                IAccountManager::PROPERTY_DISPLAYNAME,
+                IAccountManager::PROPERTY_EMAIL,
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+            [false, false, ISetDisplayNameBackend::class, [
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+            [false, true, UserInterface::class, [
+                IAccountManager::PROPERTY_EMAIL,
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+            [true, false, UserInterface::class, [
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+            [true, true, UserInterface::class, [
+                IAccountManager::PROPERTY_EMAIL,
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+            [false, false, UserInterface::class, [
+                IAccountManager::COLLECTION_EMAIL,
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider dataGetEditableFields
+     */
+    public function testGetEditableFields(bool $allowedToChangeDisplayName, bool $allowedToChangeEmail, string $userBackend, array $expected): void {
+        $this->config->method('getSystemValue')->willReturnCallback(fn (string $key, mixed $default) => match ($key) {
+            'allow_user_to_change_display_name' => $allowedToChangeDisplayName,
+            'allow_user_to_change_email' => $allowedToChangeEmail,
+            default => throw new RuntimeException('Unexpected system config key: ' . $key),
+        });
+
+        $user = $this->createMock(IUser::class);
+        $this->userSession->method('getUser')
+            ->willReturn($user);
+
+        $backend = $this->createMock($userBackend);
+
+        $user->method('getUID')
+            ->willReturn('userId');
+        $user->method('getBackend')
+            ->willReturn($backend);
+
+        $expectedResp = new DataResponse($expected);
+        $this->assertEquals($expectedResp, $this->api->getEditableFields('userId'));
+    }
+
+    private function mockAccount($targetUser, $accountProperties) {
+        $mockedProperties = [];
+
+        foreach ($accountProperties as $propertyName => $data) {
+            $mockedProperty = $this->createMock(IAccountProperty::class);
+            $mockedProperty->method('getValue')->willReturn($data['value'] ?? '');
+            $mockedProperty->method('getScope')->willReturn($data['scope'] ?? '');
+            $mockedProperties[] = [$propertyName, $mockedProperty];
+        }
+
+        $account = $this->createMock(IAccount::class);
+        $account->method('getProperty')
+            ->will($this->returnValueMap($mockedProperties));
+
+        $this->accountManager->expects($this->any())->method('getAccount')
+            ->with($targetUser)
+            ->willReturn($account);
+    }
 }

apps/provisioning_api/lib/Controller/UsersController.php

Indentation +1739 added lines, -1739 removed lines

@@ -59,1743 +59,1743 @@
  */
 class UsersController extends AUserDataOCSController {
 
-	private IL10N $l10n;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IUserManager $userManager,
-		IConfig $config,
-		IGroupManager $groupManager,
-		IUserSession $userSession,
-		IAccountManager $accountManager,
-		ISubAdmin $subAdminManager,
-		IFactory $l10nFactory,
-		IRootFolder $rootFolder,
-		private IURLGenerator $urlGenerator,
-		private LoggerInterface $logger,
-		private NewUserMailHelper $newUserMailHelper,
-		private ISecureRandom $secureRandom,
-		private RemoteWipe $remoteWipe,
-		private KnownUserService $knownUserService,
-		private IEventDispatcher $eventDispatcher,
-		private IPhoneNumberUtil $phoneNumberUtil,
-		private IAppManager $appManager,
-	) {
-		parent::__construct(
-			$appName,
-			$request,
-			$userManager,
-			$config,
-			$groupManager,
-			$userSession,
-			$accountManager,
-			$subAdminManager,
-			$l10nFactory,
-			$rootFolder,
-		);
-
-		$this->l10n = $l10nFactory->get($appName);
-	}
-
-	/**
-	 * Get a list of users
-	 *
-	 * @param string $search Text to search for
-	 * @param int|null $limit Limit the amount of groups returned
-	 * @param int $offset Offset for searching for groups
-	 * @return DataResponse<Http::STATUS_OK, array{users: list<string>}, array{}>
-	 *
-	 * 200: Users returned
-	 */
-	#[NoAdminRequired]
-	public function getUsers(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
-		$user = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $user->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($uid);
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
-		if ($isAdmin || $isDelegatedAdmin) {
-			$users = $this->userManager->search($search, $limit, $offset);
-		} elseif ($subAdminManager->isSubAdmin($user)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-		}
-
-		/** @var list<string> $users */
-		$users = array_keys($users);
-
-		return new DataResponse([
-			'users' => $users
-		]);
-	}
-
-	/**
-	 * Get a list of users and their details
-	 *
-	 * @param string $search Text to search for
-	 * @param int|null $limit Limit the amount of groups returned
-	 * @param int $offset Offset for searching for groups
-	 * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
-	 *
-	 * 200: Users details returned
-	 */
-	#[NoAdminRequired]
-	public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
-		$currentUser = $this->userSession->getUser();
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $currentUser->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($uid);
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
-		if ($isAdmin || $isDelegatedAdmin) {
-			$users = $this->userManager->search($search, $limit, $offset);
-			$users = array_keys($users);
-		} elseif ($subAdminManager->isSubAdmin($currentUser)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
-			foreach ($subAdminOfGroups as $key => $group) {
-				$subAdminOfGroups[$key] = $group->getGID();
-			}
-
-			$users = [];
-			foreach ($subAdminOfGroups as $group) {
-				$users[] = array_keys($this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
-			}
-			$users = array_merge(...$users);
-		}
-
-		$usersDetails = [];
-		foreach ($users as $userId) {
-			$userId = (string)$userId;
-			try {
-				$userData = $this->getUserData($userId);
-			} catch (OCSNotFoundException $e) {
-				// We still want to return all other accounts, but this one was removed from the backends
-				// yet they are still in our database. Might be a LDAP remnant.
-				$userData = null;
-				$this->logger->warning('Found one enabled account that is removed from its backend, but still exists in Nextcloud database', ['accountId' => $userId]);
-			}
-			// Do not insert empty entry
-			if ($userData !== null) {
-				$usersDetails[$userId] = $userData;
-			} else {
-				// Logged user does not have permissions to see this user
-				// only showing its id
-				$usersDetails[$userId] = ['id' => $userId];
-			}
-		}
-
-		return new DataResponse([
-			'users' => $usersDetails
-		]);
-	}
-
-	/**
-	 * Get the list of disabled users and their details
-	 *
-	 * @param string $search Text to search for
-	 * @param ?int $limit Limit the amount of users returned
-	 * @param int $offset Offset
-	 * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
-	 *
-	 * 200: Disabled users details returned
-	 */
-	#[NoAdminRequired]
-	public function getDisabledUsersDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser === null) {
-			return new DataResponse(['users' => []]);
-		}
-		if ($limit !== null && $limit < 0) {
-			throw new InvalidArgumentException("Invalid limit value: $limit");
-		}
-		if ($offset < 0) {
-			throw new InvalidArgumentException("Invalid offset value: $offset");
-		}
-
-		$users = [];
-
-		// Admin? Or SubAdmin?
-		$uid = $currentUser->getUID();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($uid);
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
-		if ($isAdmin || $isDelegatedAdmin) {
-			$users = $this->userManager->getDisabledUsers($limit, $offset, $search);
-			$users = array_map(fn (IUser $user): string => $user->getUID(), $users);
-		} elseif ($subAdminManager->isSubAdmin($currentUser)) {
-			$subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
-
-			$users = [];
-			/* We have to handle offset ourselve for correctness */
-			$tempLimit = ($limit === null ? null : $limit + $offset);
-			foreach ($subAdminOfGroups as $group) {
-				$users = array_unique(array_merge(
-					$users,
-					array_map(
-						fn (IUser $user): string => $user->getUID(),
-						array_filter(
-							$group->searchUsers($search),
-							fn (IUser $user): bool => !$user->isEnabled()
-						)
-					)
-				));
-				if (($tempLimit !== null) && (count($users) >= $tempLimit)) {
-					break;
-				}
-			}
-			$users = array_slice($users, $offset, $limit);
-		}
-
-		$usersDetails = [];
-		foreach ($users as $userId) {
-			try {
-				$userData = $this->getUserData($userId);
-			} catch (OCSNotFoundException $e) {
-				// We still want to return all other accounts, but this one was removed from the backends
-				// yet they are still in our database. Might be a LDAP remnant.
-				$userData = null;
-				$this->logger->warning('Found one disabled account that was removed from its backend, but still exists in Nextcloud database', ['accountId' => $userId]);
-			}
-			// Do not insert empty entry
-			if ($userData !== null) {
-				$usersDetails[$userId] = $userData;
-			} else {
-				// Currently logged in user does not have permissions to see this user
-				// only showing its id
-				$usersDetails[$userId] = ['id' => $userId];
-			}
-		}
-
-		return new DataResponse([
-			'users' => $usersDetails
-		]);
-	}
-
-	/**
-	 * Gets the list of users sorted by lastLogin, from most recent to least recent
-	 *
-	 * @param string $search Text to search for
-	 * @param ?int $limit Limit the amount of users returned
-	 * @param int $offset Offset
-	 * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
-	 *
-	 * 200: Users details returned based on last logged in information
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	public function getLastLoggedInUsers(string $search = '',
-		?int $limit = null,
-		int $offset = 0,
-	): DataResponse {
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser === null) {
-			return new DataResponse(['users' => []]);
-		}
-		if ($limit !== null && $limit < 0) {
-			throw new InvalidArgumentException("Invalid limit value: $limit");
-		}
-		if ($offset < 0) {
-			throw new InvalidArgumentException("Invalid offset value: $offset");
-		}
-
-		$users = [];
-
-		// For Admin alone user sorting based on lastLogin. For sub admin and groups this is not supported
-		$users = $this->userManager->getLastLoggedInUsers($limit, $offset, $search);
-
-		$usersDetails = [];
-		foreach ($users as $userId) {
-			try {
-				$userData = $this->getUserData($userId);
-			} catch (OCSNotFoundException $e) {
-				// We still want to return all other accounts, but this one was removed from the backends
-				// yet they are still in our database. Might be a LDAP remnant.
-				$userData = null;
-				$this->logger->warning('Found one account that was removed from its backend, but still exists in Nextcloud database', ['accountId' => $userId]);
-			}
-			// Do not insert empty entry
-			if ($userData !== null) {
-				$usersDetails[$userId] = $userData;
-			} else {
-				// Currently logged-in user does not have permissions to see this user
-				// only showing its id
-				$usersDetails[$userId] = ['id' => $userId];
-			}
-		}
-
-		return new DataResponse([
-			'users' => $usersDetails
-		]);
-	}
-
-
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Search users by their phone numbers
-	 *
-	 * @param string $location Location of the phone number (for country code)
-	 * @param array<string, list<string>> $search Phone numbers to search for
-	 * @return DataResponse<Http::STATUS_OK, array<string, string>, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, list<empty>, array{}>
-	 *
-	 * 200: Users returned
-	 * 400: Invalid location
-	 */
-	#[NoAdminRequired]
-	public function searchByPhoneNumbers(string $location, array $search): DataResponse {
-		if ($this->phoneNumberUtil->getCountryCodeForRegion($location) === null) {
-			// Not a valid region code
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		/** @var IUser $user */
-		$user = $this->userSession->getUser();
-		$knownTo = $user->getUID();
-		$defaultPhoneRegion = $this->config->getSystemValueString('default_phone_region');
-
-		$normalizedNumberToKey = [];
-		foreach ($search as $key => $phoneNumbers) {
-			foreach ($phoneNumbers as $phone) {
-				$normalizedNumber = $this->phoneNumberUtil->convertToStandardFormat($phone, $location);
-				if ($normalizedNumber !== null) {
-					$normalizedNumberToKey[$normalizedNumber] = (string)$key;
-				}
-
-				if ($defaultPhoneRegion !== '' && $defaultPhoneRegion !== $location && str_starts_with($phone, '0')) {
-					// If the number has a leading zero (no country code),
-					// we also check the default phone region of the instance,
-					// when it's different to the user's given region.
-					$normalizedNumber = $this->phoneNumberUtil->convertToStandardFormat($phone, $defaultPhoneRegion);
-					if ($normalizedNumber !== null) {
-						$normalizedNumberToKey[$normalizedNumber] = (string)$key;
-					}
-				}
-			}
-		}
-
-		$phoneNumbers = array_keys($normalizedNumberToKey);
-
-		if (empty($phoneNumbers)) {
-			return new DataResponse();
-		}
-
-		// Cleanup all previous entries and only allow new matches
-		$this->knownUserService->deleteKnownTo($knownTo);
-
-		$userMatches = $this->accountManager->searchUsers(IAccountManager::PROPERTY_PHONE, $phoneNumbers);
-
-		if (empty($userMatches)) {
-			return new DataResponse();
-		}
-
-		$cloudUrl = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
-		if (strpos($cloudUrl, 'http://') === 0) {
-			$cloudUrl = substr($cloudUrl, strlen('http://'));
-		} elseif (strpos($cloudUrl, 'https://') === 0) {
-			$cloudUrl = substr($cloudUrl, strlen('https://'));
-		}
-
-		$matches = [];
-		foreach ($userMatches as $phone => $userId) {
-			// Not using the ICloudIdManager as that would run a search for each contact to find the display name in the address book
-			$matches[$normalizedNumberToKey[$phone]] = $userId . '@' . $cloudUrl;
-			$this->knownUserService->storeIsKnownToUser($knownTo, $userId);
-		}
-
-		return new DataResponse($matches);
-	}
-
-	/**
-	 * @throws OCSException
-	 */
-	private function createNewUserId(): string {
-		$attempts = 0;
-		do {
-			$uidCandidate = $this->secureRandom->generate(10, ISecureRandom::CHAR_HUMAN_READABLE);
-			if (!$this->userManager->userExists($uidCandidate)) {
-				return $uidCandidate;
-			}
-			$attempts++;
-		} while ($attempts < 10);
-		throw new OCSException($this->l10n->t('Could not create non-existing user ID'), 111);
-	}
-
-	/**
-	 * Create a new user
-	 *
-	 * @param string $userid ID of the user
-	 * @param string $password Password of the user
-	 * @param string $displayName Display name of the user
-	 * @param string $email Email of the user
-	 * @param list<string> $groups Groups of the user
-	 * @param list<string> $subadmin Groups where the user is subadmin
-	 * @param string $quota Quota of the user
-	 * @param string $language Language of the user
-	 * @param ?string $manager Manager of the user
-	 * @return DataResponse<Http::STATUS_OK, array{id: string}, array{}>
-	 * @throws OCSException
-	 * @throws OCSForbiddenException Missing permissions to make user subadmin
-	 *
-	 * 200: User added successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function addUser(
-		string $userid,
-		string $password = '',
-		string $displayName = '',
-		string $email = '',
-		array $groups = [],
-		array $subadmin = [],
-		string $quota = '',
-		string $language = '',
-		?string $manager = null,
-	): DataResponse {
-		$user = $this->userSession->getUser();
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($user->getUID());
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		if (empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
-			$userid = $this->createNewUserId();
-		}
-
-		if ($this->userManager->userExists($userid)) {
-			$this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
-			throw new OCSException($this->l10n->t('User already exists'), 102);
-		}
-
-		if ($groups !== []) {
-			foreach ($groups as $group) {
-				if (!$this->groupManager->groupExists($group)) {
-					throw new OCSException($this->l10n->t('Group %1$s does not exist', [$group]), 104);
-				}
-				if (!$isAdmin && !($isDelegatedAdmin && $group !== 'admin') && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException($this->l10n->t('Insufficient privileges for group %1$s', [$group]), 105);
-				}
-			}
-		} else {
-			if (!$isAdmin && !$isDelegatedAdmin) {
-				throw new OCSException($this->l10n->t('No group specified (required for sub-admins)'), 106);
-			}
-		}
-
-		$subadminGroups = [];
-		if ($subadmin !== []) {
-			foreach ($subadmin as $groupid) {
-				$group = $this->groupManager->get($groupid);
-				// Check if group exists
-				if ($group === null) {
-					throw new OCSException($this->l10n->t('Sub-admin group does not exist'), 109);
-				}
-				// Check if trying to make subadmin of admin group
-				if ($group->getGID() === 'admin') {
-					throw new OCSException($this->l10n->t('Cannot create sub-admins for admin group'), 103);
-				}
-				// Check if has permission to promote subadmins
-				if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin && !$isDelegatedAdmin) {
-					throw new OCSForbiddenException($this->l10n->t('No permissions to promote sub-admins'));
-				}
-				$subadminGroups[] = $group;
-			}
-		}
-
-		$generatePasswordResetToken = false;
-		if (strlen($password) > IUserManager::MAX_PASSWORD_LENGTH) {
-			throw new OCSException($this->l10n->t('Invalid password value'), 101);
-		}
-		if ($password === '') {
-			if ($email === '') {
-				throw new OCSException($this->l10n->t('An email address is required, to send a password link to the user.'), 108);
-			}
-
-			$passwordEvent = new GenerateSecurePasswordEvent();
-			$this->eventDispatcher->dispatchTyped($passwordEvent);
-
-			$password = $passwordEvent->getPassword();
-			if ($password === null) {
-				// Fallback: ensure to pass password_policy in any case
-				$password = $this->secureRandom->generate(10)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_UPPER)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_LOWER)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_DIGITS)
-					. $this->secureRandom->generate(1, ISecureRandom::CHAR_SYMBOLS);
-			}
-			$generatePasswordResetToken = true;
-		}
-
-		if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
-			throw new OCSException($this->l10n->t('Required email address was not provided'), 110);
-		}
-
-		try {
-			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
-
-			foreach ($groups as $group) {
-				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
-			}
-			foreach ($subadminGroups as $group) {
-				$subAdminManager->createSubAdmin($newUser, $group);
-			}
-
-			if ($displayName !== '') {
-				try {
-					$this->editUser($userid, self::USER_FIELD_DISPLAYNAME, $displayName);
-				} catch (OCSException $e) {
-					if ($newUser instanceof IUser) {
-						$newUser->delete();
-					}
-					throw $e;
-				}
-			}
-
-			if ($quota !== '') {
-				$this->editUser($userid, self::USER_FIELD_QUOTA, $quota);
-			}
-
-			if ($language !== '') {
-				$this->editUser($userid, self::USER_FIELD_LANGUAGE, $language);
-			}
-
-			/**
-			 * null -> nothing sent
-			 * '' -> unset manager
-			 * else -> set manager
-			 */
-			if ($manager !== null) {
-				$this->editUser($userid, self::USER_FIELD_MANAGER, $manager);
-			}
-
-			// Send new user mail only if a mail is set
-			if ($email !== '') {
-				$newUser->setEMailAddress($email);
-				if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
-					try {
-						$emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
-						$this->newUserMailHelper->sendMail($newUser, $emailTemplate);
-					} catch (\Exception $e) {
-						// Mail could be failing hard or just be plain not configured
-						// Logging error as it is the hardest of the two
-						$this->logger->error(
-							"Unable to send the invitation mail to $email",
-							[
-								'app' => 'ocs_api',
-								'exception' => $e,
-							]
-						);
-					}
-				}
-			}
-
-			return new DataResponse(['id' => $userid]);
-		} catch (HintException $e) {
-			$this->logger->warning(
-				'Failed addUser attempt with hint exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e,
-				]
-			);
-			throw new OCSException($e->getHint(), 107);
-		} catch (OCSException $e) {
-			$this->logger->warning(
-				'Failed addUser attempt with ocs exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e,
-				]
-			);
-			throw $e;
-		} catch (InvalidArgumentException $e) {
-			$this->logger->error(
-				'Failed addUser attempt with invalid argument exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e,
-				]
-			);
-			throw new OCSException($e->getMessage(), 101);
-		} catch (\Exception $e) {
-			$this->logger->error(
-				'Failed addUser attempt with exception.',
-				[
-					'app' => 'ocs_api',
-					'exception' => $e
-				]
-			);
-			throw new OCSException('Bad request', 101);
-		}
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get the details of a user
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, Provisioning_APIUserDetails, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User returned
-	 */
-	#[NoAdminRequired]
-	public function getUser(string $userId): DataResponse {
-		$includeScopes = false;
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser && $currentUser->getUID() === $userId) {
-			$includeScopes = true;
-		}
-
-		$data = $this->getUserData($userId, $includeScopes);
-		// getUserData returns null if not enough permissions
-		if ($data === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-		return new DataResponse($data);
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get the details of the current user
-	 *
-	 * @return DataResponse<Http::STATUS_OK, Provisioning_APIUserDetails, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Current user returned
-	 */
-	#[NoAdminRequired]
-	public function getCurrentUser(): DataResponse {
-		$user = $this->userSession->getUser();
-		if ($user) {
-			/** @var Provisioning_APIUserDetails $data */
-			$data = $this->getUserData($user->getUID(), true);
-			return new DataResponse($data);
-		}
-
-		throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get a list of fields that are editable for the current user
-	 *
-	 * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Editable fields returned
-	 */
-	#[NoAdminRequired]
-	public function getEditableFields(): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-		if (!$currentLoggedInUser instanceof IUser) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		return $this->getEditableFieldsForUser($currentLoggedInUser->getUID());
-	}
-
-	/**
-	 * Get a list of enabled apps for the current user
-	 *
-	 * @return DataResponse<Http::STATUS_OK, array{apps: list<string>}, array{}>
-	 *
-	 * 200: Enabled apps returned
-	 */
-	#[NoAdminRequired]
-	public function getEnabledApps(): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-		return new DataResponse(['apps' => $this->appManager->getEnabledAppsForUser($currentLoggedInUser)]);
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get a list of fields that are editable for a user
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Editable fields for user returned
-	 */
-	#[NoAdminRequired]
-	public function getEditableFieldsForUser(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-		if (!$currentLoggedInUser instanceof IUser) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$permittedFields = [];
-
-		if ($userId !== $currentLoggedInUser->getUID()) {
-			$targetUser = $this->userManager->get($userId);
-			if (!$targetUser instanceof IUser) {
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-			$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-			if (
-				!($isAdmin || $isDelegatedAdmin)
-				&& !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			) {
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		} else {
-			$targetUser = $currentLoggedInUser;
-		}
-
-		$allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
-		if ($allowDisplayNameChange === true && (
-			$targetUser->getBackend() instanceof ISetDisplayNameBackend
-			|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
-		)) {
-			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-		}
-
-		// Fallback to display name value to avoid changing behavior with the new option.
-		if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-		}
-
-		$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-		$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-		$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-		$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-		$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-		$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
-		$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
-		$permittedFields[] = IAccountManager::PROPERTY_ROLE;
-		$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
-		$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
-		$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-		$permittedFields[] = IAccountManager::PROPERTY_PRONOUNS;
-
-		return new DataResponse($permittedFields);
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Update multiple values of the user's details
-	 *
-	 * @param string $userId ID of the user
-	 * @param string $collectionName Collection to update
-	 * @param string $key Key that will be updated
-	 * @param string $value New value for the key
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User values edited successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	#[UserRateLimit(limit: 5, period: 60)]
-	public function editUserMultiValue(
-		string $userId,
-		string $collectionName,
-		string $key,
-		string $value,
-	): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-		if ($currentLoggedInUser === null) {
-			throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
-		}
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-		$isAdminOrSubadmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID())
-			|| $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser);
-
-		$permittedFields = [];
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			// Editing self (display, email)
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
-		} else {
-			// Check if admin / subadmin
-			if ($isAdminOrSubadmin || $isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) {
-				// They have permissions over the user
-				$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-			} else {
-				// No rights
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		}
-
-		// Check if permitted to edit this field
-		if (!in_array($collectionName, $permittedFields)) {
-			throw new OCSException('', 103);
-		}
-
-		switch ($collectionName) {
-			case IAccountManager::COLLECTION_EMAIL:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-				$mailCollection->removePropertyByValue($key);
-				if ($value !== '') {
-					$mailCollection->addPropertyWithDefaults($value);
-					$property = $mailCollection->getPropertyByValue($key);
-					if ($isAdminOrSubadmin && $property) {
-						// admin set mails are auto-verified
-						$property->setLocallyVerified(IAccountManager::VERIFIED);
-					}
-				}
-				$this->accountManager->updateAccount($userAccount);
-				if ($value === '' && $key === $targetUser->getPrimaryEMailAddress()) {
-					$targetUser->setPrimaryEMailAddress('');
-				}
-				break;
-
-			case IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-				$targetProperty = null;
-				foreach ($mailCollection->getProperties() as $property) {
-					if ($property->getValue() === $key) {
-						$targetProperty = $property;
-						break;
-					}
-				}
-				if ($targetProperty instanceof IAccountProperty) {
-					try {
-						$targetProperty->setScope($value);
-						$this->accountManager->updateAccount($userAccount);
-					} catch (InvalidArgumentException $e) {
-						throw new OCSException('', 102);
-					}
-				} else {
-					throw new OCSException('', 102);
-				}
-				break;
-
-			default:
-				throw new OCSException('', 103);
-		}
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Update a value of the user's details
-	 *
-	 * @param string $userId ID of the user
-	 * @param string $key Key that will be updated
-	 * @param string $value New value for the key
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User value edited successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	#[UserRateLimit(limit: 50, period: 600)]
-	public function editUser(string $userId, string $key, string $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$permittedFields = [];
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			$allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
-			if ($allowDisplayNameChange !== false && (
-				$targetUser->getBackend() instanceof ISetDisplayNameBackend
-				|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
-			)) {
-				$permittedFields[] = self::USER_FIELD_DISPLAYNAME;
-				$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-			}
-
-			// Fallback to display name value to avoid changing behavior with the new option.
-			if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {
-				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-			}
-
-			$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
-
-			$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-
-			$permittedFields[] = self::USER_FIELD_PASSWORD;
-			$permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
-			if (
-				$this->config->getSystemValue('force_language', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID()) ||
-				$this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID())
-			) {
-				$permittedFields[] = self::USER_FIELD_LANGUAGE;
-			}
-
-			if (
-				$this->config->getSystemValue('force_locale', false) === false ||
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID()) ||
-				$this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID())
-			) {
-				$permittedFields[] = self::USER_FIELD_LOCALE;
-				$permittedFields[] = self::USER_FIELD_FIRST_DAY_OF_WEEK;
-			}
-
-			$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-			$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
-			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
-			$permittedFields[] = IAccountManager::PROPERTY_ROLE;
-			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
-			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
-			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-			$permittedFields[] = IAccountManager::PROPERTY_BIRTHDATE;
-			$permittedFields[] = IAccountManager::PROPERTY_PRONOUNS;
-
-			$permittedFields[] = IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_BIRTHDATE . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX;
-			$permittedFields[] = IAccountManager::PROPERTY_PRONOUNS . self::SCOPE_SUFFIX;
-
-			// If admin they can edit their own quota and manager
-			$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-			$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-			if ($isAdmin || $isDelegatedAdmin) {
-				$permittedFields[] = self::USER_FIELD_QUOTA;
-				$permittedFields[] = self::USER_FIELD_MANAGER;
-			}
-		} else {
-			// Check if admin / subadmin
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			if (
-				$this->groupManager->isAdmin($currentLoggedInUser->getUID()) ||
-				$this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID()) && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')
-				|| $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			) {
-				// They have permissions over the user
-				if (
-					$targetUser->getBackend() instanceof ISetDisplayNameBackend
-					|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
-				) {
-					$permittedFields[] = self::USER_FIELD_DISPLAYNAME;
-					$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
-				}
-				$permittedFields[] = IAccountManager::PROPERTY_EMAIL;
-				$permittedFields[] = IAccountManager::COLLECTION_EMAIL;
-				$permittedFields[] = self::USER_FIELD_PASSWORD;
-				$permittedFields[] = self::USER_FIELD_LANGUAGE;
-				$permittedFields[] = self::USER_FIELD_LOCALE;
-				$permittedFields[] = self::USER_FIELD_FIRST_DAY_OF_WEEK;
-				$permittedFields[] = IAccountManager::PROPERTY_PHONE;
-				$permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
-				$permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
-				$permittedFields[] = IAccountManager::PROPERTY_TWITTER;
-				$permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
-				$permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
-				$permittedFields[] = IAccountManager::PROPERTY_ROLE;
-				$permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
-				$permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
-				$permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
-				$permittedFields[] = IAccountManager::PROPERTY_PRONOUNS;
-				$permittedFields[] = self::USER_FIELD_QUOTA;
-				$permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
-				$permittedFields[] = self::USER_FIELD_MANAGER;
-			} else {
-				// No rights
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		}
-		// Check if permitted to edit this field
-		if (!in_array($key, $permittedFields)) {
-			throw new OCSException('', 113);
-		}
-		// Process the edit
-		switch ($key) {
-			case self::USER_FIELD_DISPLAYNAME:
-			case IAccountManager::PROPERTY_DISPLAYNAME:
-				try {
-					$targetUser->setDisplayName($value);
-				} catch (InvalidArgumentException $e) {
-					throw new OCSException($e->getMessage(), 101);
-				}
-				break;
-			case self::USER_FIELD_QUOTA:
-				$quota = $value;
-				if ($quota !== 'none' && $quota !== 'default') {
-					if (is_numeric($quota)) {
-						$quota = (float)$quota;
-					} else {
-						$quota = Util::computerFileSize($quota);
-					}
-					if ($quota === false) {
-						throw new OCSException($this->l10n->t('Invalid quota value: %1$s', [$value]), 101);
-					}
-					if ($quota === -1) {
-						$quota = 'none';
-					} else {
-						$maxQuota = (int)$this->config->getAppValue('files', 'max_quota', '-1');
-						if ($maxQuota !== -1 && $quota > $maxQuota) {
-							throw new OCSException($this->l10n->t('Invalid quota value. %1$s is exceeding the maximum quota', [$value]), 101);
-						}
-						$quota = Util::humanFileSize($quota);
-					}
-				}
-				// no else block because quota can be set to 'none' in previous if
-				if ($quota === 'none') {
-					$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
-					if (!$allowUnlimitedQuota) {
-						throw new OCSException($this->l10n->t('Unlimited quota is forbidden on this instance'), 101);
-					}
-				}
-				$targetUser->setQuota($quota);
-				break;
-			case self::USER_FIELD_MANAGER:
-				$targetUser->setManagerUids([$value]);
-				break;
-			case self::USER_FIELD_PASSWORD:
-				try {
-					if (strlen($value) > IUserManager::MAX_PASSWORD_LENGTH) {
-						throw new OCSException($this->l10n->t('Invalid password value'), 101);
-					}
-					if (!$targetUser->canChangePassword()) {
-						throw new OCSException($this->l10n->t('Setting the password is not supported by the users backend'), 112);
-					}
-					$targetUser->setPassword($value);
-				} catch (HintException $e) { // password policy error
-					throw new OCSException($e->getHint(), 107);
-				}
-				break;
-			case self::USER_FIELD_LANGUAGE:
-				$languagesCodes = $this->l10nFactory->findAvailableLanguages();
-				if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
-					throw new OCSException($this->l10n->t('Invalid language'), 101);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
-				break;
-			case self::USER_FIELD_LOCALE:
-				if (!$this->l10nFactory->localeExists($value)) {
-					throw new OCSException($this->l10n->t('Invalid locale'), 101);
-				}
-				$this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
-				break;
-			case self::USER_FIELD_FIRST_DAY_OF_WEEK:
-				$intValue = (int)$value;
-				if ($intValue < -1 || $intValue > 6) {
-					throw new OCSException($this->l10n->t('Invalid first day of week'), 101);
-				}
-				if ($intValue === -1) {
-					$this->config->deleteUserValue($targetUser->getUID(), 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK);
-				} else {
-					$this->config->setUserValue($targetUser->getUID(), 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK, $value);
-				}
-				break;
-			case self::USER_FIELD_NOTIFICATION_EMAIL:
-				$success = false;
-				if ($value === '' || filter_var($value, FILTER_VALIDATE_EMAIL)) {
-					try {
-						$targetUser->setPrimaryEMailAddress($value);
-						$success = true;
-					} catch (InvalidArgumentException $e) {
-						$this->logger->info(
-							'Cannot set primary email, because provided address is not verified',
-							[
-								'app' => 'provisioning_api',
-								'exception' => $e,
-							]
-						);
-					}
-				}
-				if (!$success) {
-					throw new OCSException('', 101);
-				}
-				break;
-			case IAccountManager::PROPERTY_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
-					$targetUser->setEMailAddress($value);
-				} else {
-					throw new OCSException('', 101);
-				}
-				break;
-			case IAccountManager::COLLECTION_EMAIL:
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) && $value !== $targetUser->getSystemEMailAddress()) {
-					$userAccount = $this->accountManager->getAccount($targetUser);
-					$mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-
-					if ($mailCollection->getPropertyByValue($value)) {
-						throw new OCSException('', 101);
-					}
-
-					$mailCollection->addPropertyWithDefaults($value);
-					$this->accountManager->updateAccount($userAccount);
-				} else {
-					throw new OCSException('', 101);
-				}
-				break;
-			case IAccountManager::PROPERTY_PHONE:
-			case IAccountManager::PROPERTY_ADDRESS:
-			case IAccountManager::PROPERTY_WEBSITE:
-			case IAccountManager::PROPERTY_TWITTER:
-			case IAccountManager::PROPERTY_FEDIVERSE:
-			case IAccountManager::PROPERTY_ORGANISATION:
-			case IAccountManager::PROPERTY_ROLE:
-			case IAccountManager::PROPERTY_HEADLINE:
-			case IAccountManager::PROPERTY_BIOGRAPHY:
-			case IAccountManager::PROPERTY_BIRTHDATE:
-			case IAccountManager::PROPERTY_PRONOUNS:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				try {
-					$userProperty = $userAccount->getProperty($key);
-					if ($userProperty->getValue() !== $value) {
-						try {
-							$userProperty->setValue($value);
-							if ($userProperty->getName() === IAccountManager::PROPERTY_PHONE) {
-								$this->knownUserService->deleteByContactUserId($targetUser->getUID());
-							}
-						} catch (InvalidArgumentException $e) {
-							throw new OCSException('Invalid ' . $e->getMessage(), 101);
-						}
-					}
-				} catch (PropertyDoesNotExistException $e) {
-					$userAccount->setProperty($key, $value, IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED);
-				}
-				try {
-					$this->accountManager->updateAccount($userAccount);
-				} catch (InvalidArgumentException $e) {
-					throw new OCSException('Invalid ' . $e->getMessage(), 101);
-				}
-				break;
-			case IAccountManager::PROPERTY_PROFILE_ENABLED:
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				try {
-					$userProperty = $userAccount->getProperty($key);
-					if ($userProperty->getValue() !== $value) {
-						$userProperty->setValue($value);
-					}
-				} catch (PropertyDoesNotExistException $e) {
-					$userAccount->setProperty($key, $value, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
-				}
-				$this->accountManager->updateAccount($userAccount);
-				break;
-			case IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_BIRTHDATE . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX:
-			case IAccountManager::PROPERTY_PRONOUNS . self::SCOPE_SUFFIX:
-				$propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
-				$userAccount = $this->accountManager->getAccount($targetUser);
-				$userProperty = $userAccount->getProperty($propertyName);
-				if ($userProperty->getScope() !== $value) {
-					try {
-						$userProperty->setScope($value);
-						$this->accountManager->updateAccount($userAccount);
-					} catch (InvalidArgumentException $e) {
-						throw new OCSException('Invalid ' . $e->getMessage(), 101);
-					}
-				}
-				break;
-			default:
-				throw new OCSException('', 113);
-		}
-		return new DataResponse();
-	}
-
-	/**
-	 * Wipe all devices of a user
-	 *
-	 * @param string $userId ID of the user
-	 *
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 *
-	 * @throws OCSException
-	 *
-	 * 200: Wiped all user devices successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function wipeUserDevices(string $userId): DataResponse {
-		/** @var IUser $currentLoggedInUser */
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-		if (!$isAdmin && !($isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$this->remoteWipe->markAllTokensForWipe($targetUser);
-
-		return new DataResponse();
-	}
-
-	/**
-	 * Delete a user
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User deleted successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function deleteUser(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-		if (!$isAdmin && !($isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		// Go ahead with the delete
-		if ($targetUser->delete()) {
-			return new DataResponse();
-		} else {
-			throw new OCSException('', 101);
-		}
-	}
-
-	/**
-	 * Disable a user
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User disabled successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function disableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, false);
-	}
-
-	/**
-	 * Enable a user
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User enabled successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function enableUser(string $userId): DataResponse {
-		return $this->setEnabled($userId, true);
-	}
-
-	/**
-	 * @param string $userId
-	 * @param bool $value
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 */
-	private function setEnabled(string $userId, bool $value): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
-			throw new OCSException('', 101);
-		}
-
-		// If not permitted
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-		if (!$isAdmin && !($isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		// enable/disable the user now
-		$targetUser->setEnabled($value);
-		return new DataResponse();
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get a list of groups the user belongs to
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, array{groups: list<string>}, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Users groups returned
-	 */
-	#[NoAdminRequired]
-	public function getUsersGroups(string $userId): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
-		if ($targetUser->getUID() === $loggedInUser->getUID() || $isAdmin || $isDelegatedAdmin) {
-			// Self lookup or admin lookup
-			return new DataResponse([
-				'groups' => $this->groupManager->getUserGroupIds($targetUser)
-			]);
-		} else {
-			$subAdminManager = $this->groupManager->getSubAdmin();
-
-			// Looking up someone else
-			if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
-				// Return the group that the method caller is subadmin of for the user in question
-				$groups = array_values(array_intersect(
-					array_map(static fn (IGroup $group) => $group->getGID(), $subAdminManager->getSubAdminsGroups($loggedInUser)),
-					$this->groupManager->getUserGroupIds($targetUser)
-				));
-				return new DataResponse(['groups' => $groups]);
-			} else {
-				// Not permitted
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		}
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get a list of groups with details
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, array{groups: list<Provisioning_APIGroupDetails>}, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Users groups returned
-	 */
-	#[NoAdminRequired]
-	public function getUsersGroupsDetails(string $userId): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
-		if ($targetUser->getUID() === $loggedInUser->getUID() || $isAdmin || $isDelegatedAdmin) {
-			// Self lookup or admin lookup
-			$groups = array_map(
-				function (Group $group) {
-					return [
-						'id' => $group->getGID(),
-						'displayname' => $group->getDisplayName(),
-						'usercount' => $group->count(),
-						'disabled' => $group->countDisabled(),
-						'canAdd' => $group->canAddUser(),
-						'canRemove' => $group->canRemoveUser(),
-					];
-				},
-				array_values($this->groupManager->getUserGroups($targetUser)),
-			);
-			return new DataResponse([
-				'groups' => $groups,
-			]);
-		} else {
-			$subAdminManager = $this->groupManager->getSubAdmin();
-
-			// Looking up someone else
-			if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
-				// Return the group that the method caller is subadmin of for the user in question
-				$gids = array_values(array_intersect(
-					array_map(
-						static fn (IGroup $group) => $group->getGID(),
-						$subAdminManager->getSubAdminsGroups($loggedInUser),
-					),
-					$this->groupManager->getUserGroupIds($targetUser)
-				));
-				$groups = array_map(
-					function (string $gid) {
-						$group = $this->groupManager->get($gid);
-						return [
-							'id' => $group->getGID(),
-							'displayname' => $group->getDisplayName(),
-							'usercount' => $group->count(),
-							'disabled' => $group->countDisabled(),
-							'canAdd' => $group->canAddUser(),
-							'canRemove' => $group->canRemoveUser(),
-						];
-					},
-					$gids,
-				);
-				return new DataResponse([
-					'groups' => $groups,
-				]);
-			} else {
-				// Not permitted
-				throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-			}
-		}
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * Get a list of the groups the user is a subadmin of, with details
-	 *
-	 * @param string $userId ID of the user
-	 * @return DataResponse<Http::STATUS_OK, array{groups: list<Provisioning_APIGroupDetails>}, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Users subadmin groups returned
-	 */
-	#[NoAdminRequired]
-	public function getUserSubAdminGroupsDetails(string $userId): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
-		if ($targetUser->getUID() === $loggedInUser->getUID() || $isAdmin || $isDelegatedAdmin) {
-			$subAdminManager = $this->groupManager->getSubAdmin();
-			$groups = array_map(
-				function (IGroup $group) {
-					return [
-						'id' => $group->getGID(),
-						'displayname' => $group->getDisplayName(),
-						'usercount' => $group->count(),
-						'disabled' => $group->countDisabled(),
-						'canAdd' => $group->canAddUser(),
-						'canRemove' => $group->canRemoveUser(),
-					];
-				},
-				array_values($subAdminManager->getSubAdminsGroups($targetUser)),
-			);
-			return new DataResponse([
-				'groups' => $groups,
-			]);
-		}
-		throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-	}
-
-	/**
-	 * Add a user to a group
-	 *
-	 * @param string $userId ID of the user
-	 * @param string $groupid ID of the group
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User added to group successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function addToGroup(string $userId, string $groupid = ''): DataResponse {
-		if ($groupid === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		$targetUser = $this->userManager->get($userId);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$loggedInUser = $this->userSession->getUser();
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
-		if (!$isAdmin && !($isDelegatedAdmin && $groupid !== 'admin') && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Add user to group
-		$group->addUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * Remove a user from a group
-	 *
-	 * @param string $userId ID of the user
-	 * @param string $groupid ID of the group
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User removed from group successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function removeFromGroup(string $userId, string $groupid): DataResponse {
-		$loggedInUser = $this->userSession->getUser();
-
-		if ($groupid === null || trim($groupid) === '') {
-			throw new OCSException('', 101);
-		}
-
-		$group = $this->groupManager->get($groupid);
-		if ($group === null) {
-			throw new OCSException('', 102);
-		}
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', 103);
-		}
-
-		// If they're not an admin, check they are a subadmin of the group in question
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
-		if (!$isAdmin && !($isDelegatedAdmin && $groupid !== 'admin') && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
-			throw new OCSException('', 104);
-		}
-
-		// Check they aren't removing themselves from 'admin' or their 'subadmin; group
-		if ($targetUser->getUID() === $loggedInUser->getUID()) {
-			if ($isAdmin || $isDelegatedAdmin) {
-				if ($group->getGID() === 'admin') {
-					throw new OCSException($this->l10n->t('Cannot remove yourself from the admin group'), 105);
-				}
-			} else {
-				// Not an admin, so the user must be a subadmin of this group, but that is not allowed.
-				throw new OCSException($this->l10n->t('Cannot remove yourself from this group as you are a sub-admin'), 105);
-			}
-		} elseif (!($isAdmin || $isDelegatedAdmin)) {
-			/** @var IGroup[] $subAdminGroups */
-			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
-				return $subAdminGroup->getGID();
-			}, $subAdminGroups);
-			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
-			$userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
-
-			if (count($userSubAdminGroups) <= 1) {
-				// Subadmin must not be able to remove a user from all their subadmin groups.
-				throw new OCSException($this->l10n->t('Not viable to remove user from the last group you are sub-admin of'), 105);
-			}
-		}
-
-		// Remove user from group
-		$group->removeUser($targetUser);
-		return new DataResponse();
-	}
-
-	/**
-	 * Make a user a subadmin of a group
-	 *
-	 * @param string $userId ID of the user
-	 * @param string $groupid ID of the group
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User added as group subadmin successfully
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	#[PasswordConfirmationRequired]
-	public function addSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException($this->l10n->t('User does not exist'), 101);
-		}
-		// Check if group exists
-		if ($group === null) {
-			throw new OCSException($this->l10n->t('Group does not exist'), 102);
-		}
-		// Check if trying to make subadmin of admin group
-		if ($group->getGID() === 'admin') {
-			throw new OCSException($this->l10n->t('Cannot create sub-admins for admin group'), 103);
-		}
-
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// We cannot be subadmin twice
-		if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
-			return new DataResponse();
-		}
-		// Go
-		$subAdminManager->createSubAdmin($user, $group);
-		return new DataResponse();
-	}
-
-	/**
-	 * Remove a user from the subadmins of a group
-	 *
-	 * @param string $userId ID of the user
-	 * @param string $groupid ID of the group
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User removed as group subadmin successfully
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	#[PasswordConfirmationRequired]
-	public function removeSubAdmin(string $userId, string $groupid): DataResponse {
-		$group = $this->groupManager->get($groupid);
-		$user = $this->userManager->get($userId);
-		$subAdminManager = $this->groupManager->getSubAdmin();
-
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSException($this->l10n->t('User does not exist'), 101);
-		}
-		// Check if the group exists
-		if ($group === null) {
-			throw new OCSException($this->l10n->t('Group does not exist'), 101);
-		}
-		// Check if they are a subadmin of this said group
-		if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
-			throw new OCSException($this->l10n->t('User is not a sub-admin of this group'), 102);
-		}
-
-		// Go
-		$subAdminManager->deleteSubAdmin($user, $group);
-		return new DataResponse();
-	}
-
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId ID if the user
-	 * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: User subadmin groups returned
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	public function getUserSubAdminGroups(string $userId): DataResponse {
-		$groups = $this->getUserSubAdminGroupsData($userId);
-		return new DataResponse($groups);
-	}
-
-	/**
-	 * Resend the welcome message
-	 *
-	 * @param string $userId ID if the user
-	 * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
-	 * @throws OCSException
-	 *
-	 * 200: Resent welcome message successfully
-	 */
-	#[PasswordConfirmationRequired]
-	#[NoAdminRequired]
-	public function resendWelcomeMessage(string $userId): DataResponse {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$targetUser = $this->userManager->get($userId);
-		if ($targetUser === null) {
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		// Check if admin / subadmin
-		$subAdminManager = $this->groupManager->getSubAdmin();
-		$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-		if (
-			!$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
-			&& !($isAdmin || $isDelegatedAdmin)
-		) {
-			// No rights
-			throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
-		}
-
-		$email = $targetUser->getEMailAddress();
-		if ($email === '' || $email === null) {
-			throw new OCSException($this->l10n->t('Email address not available'), 101);
-		}
-
-		try {
-			if ($this->config->getUserValue($targetUser->getUID(), 'core', 'lostpassword')) {
-				$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, true);
-			} else {
-				$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
-			}
-
-			$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
-		} catch (\Exception $e) {
-			$this->logger->error(
-				"Can't send new user mail to $email",
-				[
-					'app' => 'settings',
-					'exception' => $e,
-				]
-			);
-			throw new OCSException($this->l10n->t('Sending email failed'), 102);
-		}
-
-		return new DataResponse();
-	}
+    private IL10N $l10n;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IUserManager $userManager,
+        IConfig $config,
+        IGroupManager $groupManager,
+        IUserSession $userSession,
+        IAccountManager $accountManager,
+        ISubAdmin $subAdminManager,
+        IFactory $l10nFactory,
+        IRootFolder $rootFolder,
+        private IURLGenerator $urlGenerator,
+        private LoggerInterface $logger,
+        private NewUserMailHelper $newUserMailHelper,
+        private ISecureRandom $secureRandom,
+        private RemoteWipe $remoteWipe,
+        private KnownUserService $knownUserService,
+        private IEventDispatcher $eventDispatcher,
+        private IPhoneNumberUtil $phoneNumberUtil,
+        private IAppManager $appManager,
+    ) {
+        parent::__construct(
+            $appName,
+            $request,
+            $userManager,
+            $config,
+            $groupManager,
+            $userSession,
+            $accountManager,
+            $subAdminManager,
+            $l10nFactory,
+            $rootFolder,
+        );
+
+        $this->l10n = $l10nFactory->get($appName);
+    }
+
+    /**
+     * Get a list of users
+     *
+     * @param string $search Text to search for
+     * @param int|null $limit Limit the amount of groups returned
+     * @param int $offset Offset for searching for groups
+     * @return DataResponse<Http::STATUS_OK, array{users: list<string>}, array{}>
+     *
+     * 200: Users returned
+     */
+    #[NoAdminRequired]
+    public function getUsers(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
+        $user = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $user->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($uid);
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
+        if ($isAdmin || $isDelegatedAdmin) {
+            $users = $this->userManager->search($search, $limit, $offset);
+        } elseif ($subAdminManager->isSubAdmin($user)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($user);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users = array_merge($users, $this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+        }
+
+        /** @var list<string> $users */
+        $users = array_keys($users);
+
+        return new DataResponse([
+            'users' => $users
+        ]);
+    }
+
+    /**
+     * Get a list of users and their details
+     *
+     * @param string $search Text to search for
+     * @param int|null $limit Limit the amount of groups returned
+     * @param int $offset Offset for searching for groups
+     * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
+     *
+     * 200: Users details returned
+     */
+    #[NoAdminRequired]
+    public function getUsersDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
+        $currentUser = $this->userSession->getUser();
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $currentUser->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($uid);
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
+        if ($isAdmin || $isDelegatedAdmin) {
+            $users = $this->userManager->search($search, $limit, $offset);
+            $users = array_keys($users);
+        } elseif ($subAdminManager->isSubAdmin($currentUser)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
+            foreach ($subAdminOfGroups as $key => $group) {
+                $subAdminOfGroups[$key] = $group->getGID();
+            }
+
+            $users = [];
+            foreach ($subAdminOfGroups as $group) {
+                $users[] = array_keys($this->groupManager->displayNamesInGroup($group, $search, $limit, $offset));
+            }
+            $users = array_merge(...$users);
+        }
+
+        $usersDetails = [];
+        foreach ($users as $userId) {
+            $userId = (string)$userId;
+            try {
+                $userData = $this->getUserData($userId);
+            } catch (OCSNotFoundException $e) {
+                // We still want to return all other accounts, but this one was removed from the backends
+                // yet they are still in our database. Might be a LDAP remnant.
+                $userData = null;
+                $this->logger->warning('Found one enabled account that is removed from its backend, but still exists in Nextcloud database', ['accountId' => $userId]);
+            }
+            // Do not insert empty entry
+            if ($userData !== null) {
+                $usersDetails[$userId] = $userData;
+            } else {
+                // Logged user does not have permissions to see this user
+                // only showing its id
+                $usersDetails[$userId] = ['id' => $userId];
+            }
+        }
+
+        return new DataResponse([
+            'users' => $usersDetails
+        ]);
+    }
+
+    /**
+     * Get the list of disabled users and their details
+     *
+     * @param string $search Text to search for
+     * @param ?int $limit Limit the amount of users returned
+     * @param int $offset Offset
+     * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
+     *
+     * 200: Disabled users details returned
+     */
+    #[NoAdminRequired]
+    public function getDisabledUsersDetails(string $search = '', ?int $limit = null, int $offset = 0): DataResponse {
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser === null) {
+            return new DataResponse(['users' => []]);
+        }
+        if ($limit !== null && $limit < 0) {
+            throw new InvalidArgumentException("Invalid limit value: $limit");
+        }
+        if ($offset < 0) {
+            throw new InvalidArgumentException("Invalid offset value: $offset");
+        }
+
+        $users = [];
+
+        // Admin? Or SubAdmin?
+        $uid = $currentUser->getUID();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($uid);
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
+        if ($isAdmin || $isDelegatedAdmin) {
+            $users = $this->userManager->getDisabledUsers($limit, $offset, $search);
+            $users = array_map(fn (IUser $user): string => $user->getUID(), $users);
+        } elseif ($subAdminManager->isSubAdmin($currentUser)) {
+            $subAdminOfGroups = $subAdminManager->getSubAdminsGroups($currentUser);
+
+            $users = [];
+            /* We have to handle offset ourselve for correctness */
+            $tempLimit = ($limit === null ? null : $limit + $offset);
+            foreach ($subAdminOfGroups as $group) {
+                $users = array_unique(array_merge(
+                    $users,
+                    array_map(
+                        fn (IUser $user): string => $user->getUID(),
+                        array_filter(
+                            $group->searchUsers($search),
+                            fn (IUser $user): bool => !$user->isEnabled()
+                        )
+                    )
+                ));
+                if (($tempLimit !== null) && (count($users) >= $tempLimit)) {
+                    break;
+                }
+            }
+            $users = array_slice($users, $offset, $limit);
+        }
+
+        $usersDetails = [];
+        foreach ($users as $userId) {
+            try {
+                $userData = $this->getUserData($userId);
+            } catch (OCSNotFoundException $e) {
+                // We still want to return all other accounts, but this one was removed from the backends
+                // yet they are still in our database. Might be a LDAP remnant.
+                $userData = null;
+                $this->logger->warning('Found one disabled account that was removed from its backend, but still exists in Nextcloud database', ['accountId' => $userId]);
+            }
+            // Do not insert empty entry
+            if ($userData !== null) {
+                $usersDetails[$userId] = $userData;
+            } else {
+                // Currently logged in user does not have permissions to see this user
+                // only showing its id
+                $usersDetails[$userId] = ['id' => $userId];
+            }
+        }
+
+        return new DataResponse([
+            'users' => $usersDetails
+        ]);
+    }
+
+    /**
+     * Gets the list of users sorted by lastLogin, from most recent to least recent
+     *
+     * @param string $search Text to search for
+     * @param ?int $limit Limit the amount of users returned
+     * @param int $offset Offset
+     * @return DataResponse<Http::STATUS_OK, array{users: array<string, Provisioning_APIUserDetails|array{id: string}>}, array{}>
+     *
+     * 200: Users details returned based on last logged in information
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    public function getLastLoggedInUsers(string $search = '',
+        ?int $limit = null,
+        int $offset = 0,
+    ): DataResponse {
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser === null) {
+            return new DataResponse(['users' => []]);
+        }
+        if ($limit !== null && $limit < 0) {
+            throw new InvalidArgumentException("Invalid limit value: $limit");
+        }
+        if ($offset < 0) {
+            throw new InvalidArgumentException("Invalid offset value: $offset");
+        }
+
+        $users = [];
+
+        // For Admin alone user sorting based on lastLogin. For sub admin and groups this is not supported
+        $users = $this->userManager->getLastLoggedInUsers($limit, $offset, $search);
+
+        $usersDetails = [];
+        foreach ($users as $userId) {
+            try {
+                $userData = $this->getUserData($userId);
+            } catch (OCSNotFoundException $e) {
+                // We still want to return all other accounts, but this one was removed from the backends
+                // yet they are still in our database. Might be a LDAP remnant.
+                $userData = null;
+                $this->logger->warning('Found one account that was removed from its backend, but still exists in Nextcloud database', ['accountId' => $userId]);
+            }
+            // Do not insert empty entry
+            if ($userData !== null) {
+                $usersDetails[$userId] = $userData;
+            } else {
+                // Currently logged-in user does not have permissions to see this user
+                // only showing its id
+                $usersDetails[$userId] = ['id' => $userId];
+            }
+        }
+
+        return new DataResponse([
+            'users' => $usersDetails
+        ]);
+    }
+
+
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Search users by their phone numbers
+     *
+     * @param string $location Location of the phone number (for country code)
+     * @param array<string, list<string>> $search Phone numbers to search for
+     * @return DataResponse<Http::STATUS_OK, array<string, string>, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, list<empty>, array{}>
+     *
+     * 200: Users returned
+     * 400: Invalid location
+     */
+    #[NoAdminRequired]
+    public function searchByPhoneNumbers(string $location, array $search): DataResponse {
+        if ($this->phoneNumberUtil->getCountryCodeForRegion($location) === null) {
+            // Not a valid region code
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        /** @var IUser $user */
+        $user = $this->userSession->getUser();
+        $knownTo = $user->getUID();
+        $defaultPhoneRegion = $this->config->getSystemValueString('default_phone_region');
+
+        $normalizedNumberToKey = [];
+        foreach ($search as $key => $phoneNumbers) {
+            foreach ($phoneNumbers as $phone) {
+                $normalizedNumber = $this->phoneNumberUtil->convertToStandardFormat($phone, $location);
+                if ($normalizedNumber !== null) {
+                    $normalizedNumberToKey[$normalizedNumber] = (string)$key;
+                }
+
+                if ($defaultPhoneRegion !== '' && $defaultPhoneRegion !== $location && str_starts_with($phone, '0')) {
+                    // If the number has a leading zero (no country code),
+                    // we also check the default phone region of the instance,
+                    // when it's different to the user's given region.
+                    $normalizedNumber = $this->phoneNumberUtil->convertToStandardFormat($phone, $defaultPhoneRegion);
+                    if ($normalizedNumber !== null) {
+                        $normalizedNumberToKey[$normalizedNumber] = (string)$key;
+                    }
+                }
+            }
+        }
+
+        $phoneNumbers = array_keys($normalizedNumberToKey);
+
+        if (empty($phoneNumbers)) {
+            return new DataResponse();
+        }
+
+        // Cleanup all previous entries and only allow new matches
+        $this->knownUserService->deleteKnownTo($knownTo);
+
+        $userMatches = $this->accountManager->searchUsers(IAccountManager::PROPERTY_PHONE, $phoneNumbers);
+
+        if (empty($userMatches)) {
+            return new DataResponse();
+        }
+
+        $cloudUrl = rtrim($this->urlGenerator->getAbsoluteURL('/'), '/');
+        if (strpos($cloudUrl, 'http://') === 0) {
+            $cloudUrl = substr($cloudUrl, strlen('http://'));
+        } elseif (strpos($cloudUrl, 'https://') === 0) {
+            $cloudUrl = substr($cloudUrl, strlen('https://'));
+        }
+
+        $matches = [];
+        foreach ($userMatches as $phone => $userId) {
+            // Not using the ICloudIdManager as that would run a search for each contact to find the display name in the address book
+            $matches[$normalizedNumberToKey[$phone]] = $userId . '@' . $cloudUrl;
+            $this->knownUserService->storeIsKnownToUser($knownTo, $userId);
+        }
+
+        return new DataResponse($matches);
+    }
+
+    /**
+     * @throws OCSException
+     */
+    private function createNewUserId(): string {
+        $attempts = 0;
+        do {
+            $uidCandidate = $this->secureRandom->generate(10, ISecureRandom::CHAR_HUMAN_READABLE);
+            if (!$this->userManager->userExists($uidCandidate)) {
+                return $uidCandidate;
+            }
+            $attempts++;
+        } while ($attempts < 10);
+        throw new OCSException($this->l10n->t('Could not create non-existing user ID'), 111);
+    }
+
+    /**
+     * Create a new user
+     *
+     * @param string $userid ID of the user
+     * @param string $password Password of the user
+     * @param string $displayName Display name of the user
+     * @param string $email Email of the user
+     * @param list<string> $groups Groups of the user
+     * @param list<string> $subadmin Groups where the user is subadmin
+     * @param string $quota Quota of the user
+     * @param string $language Language of the user
+     * @param ?string $manager Manager of the user
+     * @return DataResponse<Http::STATUS_OK, array{id: string}, array{}>
+     * @throws OCSException
+     * @throws OCSForbiddenException Missing permissions to make user subadmin
+     *
+     * 200: User added successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function addUser(
+        string $userid,
+        string $password = '',
+        string $displayName = '',
+        string $email = '',
+        array $groups = [],
+        array $subadmin = [],
+        string $quota = '',
+        string $language = '',
+        ?string $manager = null,
+    ): DataResponse {
+        $user = $this->userSession->getUser();
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($user->getUID());
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        if (empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
+            $userid = $this->createNewUserId();
+        }
+
+        if ($this->userManager->userExists($userid)) {
+            $this->logger->error('Failed addUser attempt: User already exists.', ['app' => 'ocs_api']);
+            throw new OCSException($this->l10n->t('User already exists'), 102);
+        }
+
+        if ($groups !== []) {
+            foreach ($groups as $group) {
+                if (!$this->groupManager->groupExists($group)) {
+                    throw new OCSException($this->l10n->t('Group %1$s does not exist', [$group]), 104);
+                }
+                if (!$isAdmin && !($isDelegatedAdmin && $group !== 'admin') && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
+                    throw new OCSException($this->l10n->t('Insufficient privileges for group %1$s', [$group]), 105);
+                }
+            }
+        } else {
+            if (!$isAdmin && !$isDelegatedAdmin) {
+                throw new OCSException($this->l10n->t('No group specified (required for sub-admins)'), 106);
+            }
+        }
+
+        $subadminGroups = [];
+        if ($subadmin !== []) {
+            foreach ($subadmin as $groupid) {
+                $group = $this->groupManager->get($groupid);
+                // Check if group exists
+                if ($group === null) {
+                    throw new OCSException($this->l10n->t('Sub-admin group does not exist'), 109);
+                }
+                // Check if trying to make subadmin of admin group
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException($this->l10n->t('Cannot create sub-admins for admin group'), 103);
+                }
+                // Check if has permission to promote subadmins
+                if (!$subAdminManager->isSubAdminOfGroup($user, $group) && !$isAdmin && !$isDelegatedAdmin) {
+                    throw new OCSForbiddenException($this->l10n->t('No permissions to promote sub-admins'));
+                }
+                $subadminGroups[] = $group;
+            }
+        }
+
+        $generatePasswordResetToken = false;
+        if (strlen($password) > IUserManager::MAX_PASSWORD_LENGTH) {
+            throw new OCSException($this->l10n->t('Invalid password value'), 101);
+        }
+        if ($password === '') {
+            if ($email === '') {
+                throw new OCSException($this->l10n->t('An email address is required, to send a password link to the user.'), 108);
+            }
+
+            $passwordEvent = new GenerateSecurePasswordEvent();
+            $this->eventDispatcher->dispatchTyped($passwordEvent);
+
+            $password = $passwordEvent->getPassword();
+            if ($password === null) {
+                // Fallback: ensure to pass password_policy in any case
+                $password = $this->secureRandom->generate(10)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_UPPER)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_LOWER)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_DIGITS)
+                    . $this->secureRandom->generate(1, ISecureRandom::CHAR_SYMBOLS);
+            }
+            $generatePasswordResetToken = true;
+        }
+
+        if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
+            throw new OCSException($this->l10n->t('Required email address was not provided'), 110);
+        }
+
+        try {
+            $newUser = $this->userManager->createUser($userid, $password);
+            $this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+
+            foreach ($groups as $group) {
+                $this->groupManager->get($group)->addUser($newUser);
+                $this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+            }
+            foreach ($subadminGroups as $group) {
+                $subAdminManager->createSubAdmin($newUser, $group);
+            }
+
+            if ($displayName !== '') {
+                try {
+                    $this->editUser($userid, self::USER_FIELD_DISPLAYNAME, $displayName);
+                } catch (OCSException $e) {
+                    if ($newUser instanceof IUser) {
+                        $newUser->delete();
+                    }
+                    throw $e;
+                }
+            }
+
+            if ($quota !== '') {
+                $this->editUser($userid, self::USER_FIELD_QUOTA, $quota);
+            }
+
+            if ($language !== '') {
+                $this->editUser($userid, self::USER_FIELD_LANGUAGE, $language);
+            }
+
+            /**
+             * null -> nothing sent
+             * '' -> unset manager
+             * else -> set manager
+             */
+            if ($manager !== null) {
+                $this->editUser($userid, self::USER_FIELD_MANAGER, $manager);
+            }
+
+            // Send new user mail only if a mail is set
+            if ($email !== '') {
+                $newUser->setEMailAddress($email);
+                if ($this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes') {
+                    try {
+                        $emailTemplate = $this->newUserMailHelper->generateTemplate($newUser, $generatePasswordResetToken);
+                        $this->newUserMailHelper->sendMail($newUser, $emailTemplate);
+                    } catch (\Exception $e) {
+                        // Mail could be failing hard or just be plain not configured
+                        // Logging error as it is the hardest of the two
+                        $this->logger->error(
+                            "Unable to send the invitation mail to $email",
+                            [
+                                'app' => 'ocs_api',
+                                'exception' => $e,
+                            ]
+                        );
+                    }
+                }
+            }
+
+            return new DataResponse(['id' => $userid]);
+        } catch (HintException $e) {
+            $this->logger->warning(
+                'Failed addUser attempt with hint exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e,
+                ]
+            );
+            throw new OCSException($e->getHint(), 107);
+        } catch (OCSException $e) {
+            $this->logger->warning(
+                'Failed addUser attempt with ocs exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e,
+                ]
+            );
+            throw $e;
+        } catch (InvalidArgumentException $e) {
+            $this->logger->error(
+                'Failed addUser attempt with invalid argument exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e,
+                ]
+            );
+            throw new OCSException($e->getMessage(), 101);
+        } catch (\Exception $e) {
+            $this->logger->error(
+                'Failed addUser attempt with exception.',
+                [
+                    'app' => 'ocs_api',
+                    'exception' => $e
+                ]
+            );
+            throw new OCSException('Bad request', 101);
+        }
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get the details of a user
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, Provisioning_APIUserDetails, array{}>
+     * @throws OCSException
+     *
+     * 200: User returned
+     */
+    #[NoAdminRequired]
+    public function getUser(string $userId): DataResponse {
+        $includeScopes = false;
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser && $currentUser->getUID() === $userId) {
+            $includeScopes = true;
+        }
+
+        $data = $this->getUserData($userId, $includeScopes);
+        // getUserData returns null if not enough permissions
+        if ($data === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+        return new DataResponse($data);
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get the details of the current user
+     *
+     * @return DataResponse<Http::STATUS_OK, Provisioning_APIUserDetails, array{}>
+     * @throws OCSException
+     *
+     * 200: Current user returned
+     */
+    #[NoAdminRequired]
+    public function getCurrentUser(): DataResponse {
+        $user = $this->userSession->getUser();
+        if ($user) {
+            /** @var Provisioning_APIUserDetails $data */
+            $data = $this->getUserData($user->getUID(), true);
+            return new DataResponse($data);
+        }
+
+        throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get a list of fields that are editable for the current user
+     *
+     * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
+     * @throws OCSException
+     *
+     * 200: Editable fields returned
+     */
+    #[NoAdminRequired]
+    public function getEditableFields(): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+        if (!$currentLoggedInUser instanceof IUser) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        return $this->getEditableFieldsForUser($currentLoggedInUser->getUID());
+    }
+
+    /**
+     * Get a list of enabled apps for the current user
+     *
+     * @return DataResponse<Http::STATUS_OK, array{apps: list<string>}, array{}>
+     *
+     * 200: Enabled apps returned
+     */
+    #[NoAdminRequired]
+    public function getEnabledApps(): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+        return new DataResponse(['apps' => $this->appManager->getEnabledAppsForUser($currentLoggedInUser)]);
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get a list of fields that are editable for a user
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
+     * @throws OCSException
+     *
+     * 200: Editable fields for user returned
+     */
+    #[NoAdminRequired]
+    public function getEditableFieldsForUser(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+        if (!$currentLoggedInUser instanceof IUser) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $permittedFields = [];
+
+        if ($userId !== $currentLoggedInUser->getUID()) {
+            $targetUser = $this->userManager->get($userId);
+            if (!$targetUser instanceof IUser) {
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+            $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+            if (
+                !($isAdmin || $isDelegatedAdmin)
+                && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            ) {
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        } else {
+            $targetUser = $currentLoggedInUser;
+        }
+
+        $allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
+        if ($allowDisplayNameChange === true && (
+            $targetUser->getBackend() instanceof ISetDisplayNameBackend
+            || $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
+        )) {
+            $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+        }
+
+        // Fallback to display name value to avoid changing behavior with the new option.
+        if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {
+            $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+        }
+
+        $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+        $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+        $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+        $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+        $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+        $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
+        $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+        $permittedFields[] = IAccountManager::PROPERTY_ROLE;
+        $permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
+        $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
+        $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
+        $permittedFields[] = IAccountManager::PROPERTY_PRONOUNS;
+
+        return new DataResponse($permittedFields);
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Update multiple values of the user's details
+     *
+     * @param string $userId ID of the user
+     * @param string $collectionName Collection to update
+     * @param string $key Key that will be updated
+     * @param string $value New value for the key
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User values edited successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    #[UserRateLimit(limit: 5, period: 60)]
+    public function editUserMultiValue(
+        string $userId,
+        string $collectionName,
+        string $key,
+        string $value,
+    ): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+        if ($currentLoggedInUser === null) {
+            throw new OCSException('', OCSController::RESPOND_UNAUTHORISED);
+        }
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+        $isAdminOrSubadmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID())
+            || $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser);
+
+        $permittedFields = [];
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            // Editing self (display, email)
+            $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+            $permittedFields[] = IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX;
+        } else {
+            // Check if admin / subadmin
+            if ($isAdminOrSubadmin || $isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) {
+                // They have permissions over the user
+                $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+            } else {
+                // No rights
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        }
+
+        // Check if permitted to edit this field
+        if (!in_array($collectionName, $permittedFields)) {
+            throw new OCSException('', 103);
+        }
+
+        switch ($collectionName) {
+            case IAccountManager::COLLECTION_EMAIL:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                $mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+                $mailCollection->removePropertyByValue($key);
+                if ($value !== '') {
+                    $mailCollection->addPropertyWithDefaults($value);
+                    $property = $mailCollection->getPropertyByValue($key);
+                    if ($isAdminOrSubadmin && $property) {
+                        // admin set mails are auto-verified
+                        $property->setLocallyVerified(IAccountManager::VERIFIED);
+                    }
+                }
+                $this->accountManager->updateAccount($userAccount);
+                if ($value === '' && $key === $targetUser->getPrimaryEMailAddress()) {
+                    $targetUser->setPrimaryEMailAddress('');
+                }
+                break;
+
+            case IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                $mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+                $targetProperty = null;
+                foreach ($mailCollection->getProperties() as $property) {
+                    if ($property->getValue() === $key) {
+                        $targetProperty = $property;
+                        break;
+                    }
+                }
+                if ($targetProperty instanceof IAccountProperty) {
+                    try {
+                        $targetProperty->setScope($value);
+                        $this->accountManager->updateAccount($userAccount);
+                    } catch (InvalidArgumentException $e) {
+                        throw new OCSException('', 102);
+                    }
+                } else {
+                    throw new OCSException('', 102);
+                }
+                break;
+
+            default:
+                throw new OCSException('', 103);
+        }
+        return new DataResponse();
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Update a value of the user's details
+     *
+     * @param string $userId ID of the user
+     * @param string $key Key that will be updated
+     * @param string $value New value for the key
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User value edited successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    #[UserRateLimit(limit: 50, period: 600)]
+    public function editUser(string $userId, string $key, string $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $permittedFields = [];
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            $allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
+            if ($allowDisplayNameChange !== false && (
+                $targetUser->getBackend() instanceof ISetDisplayNameBackend
+                || $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
+            )) {
+                $permittedFields[] = self::USER_FIELD_DISPLAYNAME;
+                $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+            }
+
+            // Fallback to display name value to avoid changing behavior with the new option.
+            if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) {
+                $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+            }
+
+            $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX;
+
+            $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+
+            $permittedFields[] = self::USER_FIELD_PASSWORD;
+            $permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
+            if (
+                $this->config->getSystemValue('force_language', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID()) ||
+                $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID())
+            ) {
+                $permittedFields[] = self::USER_FIELD_LANGUAGE;
+            }
+
+            if (
+                $this->config->getSystemValue('force_locale', false) === false ||
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID()) ||
+                $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID())
+            ) {
+                $permittedFields[] = self::USER_FIELD_LOCALE;
+                $permittedFields[] = self::USER_FIELD_FIRST_DAY_OF_WEEK;
+            }
+
+            $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+            $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+            $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+            $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+            $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
+            $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+            $permittedFields[] = IAccountManager::PROPERTY_ROLE;
+            $permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
+            $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
+            $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
+            $permittedFields[] = IAccountManager::PROPERTY_BIRTHDATE;
+            $permittedFields[] = IAccountManager::PROPERTY_PRONOUNS;
+
+            $permittedFields[] = IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_BIRTHDATE . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX;
+            $permittedFields[] = IAccountManager::PROPERTY_PRONOUNS . self::SCOPE_SUFFIX;
+
+            // If admin they can edit their own quota and manager
+            $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+            $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+            if ($isAdmin || $isDelegatedAdmin) {
+                $permittedFields[] = self::USER_FIELD_QUOTA;
+                $permittedFields[] = self::USER_FIELD_MANAGER;
+            }
+        } else {
+            // Check if admin / subadmin
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            if (
+                $this->groupManager->isAdmin($currentLoggedInUser->getUID()) ||
+                $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID()) && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')
+                || $subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            ) {
+                // They have permissions over the user
+                if (
+                    $targetUser->getBackend() instanceof ISetDisplayNameBackend
+                    || $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)
+                ) {
+                    $permittedFields[] = self::USER_FIELD_DISPLAYNAME;
+                    $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
+                }
+                $permittedFields[] = IAccountManager::PROPERTY_EMAIL;
+                $permittedFields[] = IAccountManager::COLLECTION_EMAIL;
+                $permittedFields[] = self::USER_FIELD_PASSWORD;
+                $permittedFields[] = self::USER_FIELD_LANGUAGE;
+                $permittedFields[] = self::USER_FIELD_LOCALE;
+                $permittedFields[] = self::USER_FIELD_FIRST_DAY_OF_WEEK;
+                $permittedFields[] = IAccountManager::PROPERTY_PHONE;
+                $permittedFields[] = IAccountManager::PROPERTY_ADDRESS;
+                $permittedFields[] = IAccountManager::PROPERTY_WEBSITE;
+                $permittedFields[] = IAccountManager::PROPERTY_TWITTER;
+                $permittedFields[] = IAccountManager::PROPERTY_FEDIVERSE;
+                $permittedFields[] = IAccountManager::PROPERTY_ORGANISATION;
+                $permittedFields[] = IAccountManager::PROPERTY_ROLE;
+                $permittedFields[] = IAccountManager::PROPERTY_HEADLINE;
+                $permittedFields[] = IAccountManager::PROPERTY_BIOGRAPHY;
+                $permittedFields[] = IAccountManager::PROPERTY_PROFILE_ENABLED;
+                $permittedFields[] = IAccountManager::PROPERTY_PRONOUNS;
+                $permittedFields[] = self::USER_FIELD_QUOTA;
+                $permittedFields[] = self::USER_FIELD_NOTIFICATION_EMAIL;
+                $permittedFields[] = self::USER_FIELD_MANAGER;
+            } else {
+                // No rights
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        }
+        // Check if permitted to edit this field
+        if (!in_array($key, $permittedFields)) {
+            throw new OCSException('', 113);
+        }
+        // Process the edit
+        switch ($key) {
+            case self::USER_FIELD_DISPLAYNAME:
+            case IAccountManager::PROPERTY_DISPLAYNAME:
+                try {
+                    $targetUser->setDisplayName($value);
+                } catch (InvalidArgumentException $e) {
+                    throw new OCSException($e->getMessage(), 101);
+                }
+                break;
+            case self::USER_FIELD_QUOTA:
+                $quota = $value;
+                if ($quota !== 'none' && $quota !== 'default') {
+                    if (is_numeric($quota)) {
+                        $quota = (float)$quota;
+                    } else {
+                        $quota = Util::computerFileSize($quota);
+                    }
+                    if ($quota === false) {
+                        throw new OCSException($this->l10n->t('Invalid quota value: %1$s', [$value]), 101);
+                    }
+                    if ($quota === -1) {
+                        $quota = 'none';
+                    } else {
+                        $maxQuota = (int)$this->config->getAppValue('files', 'max_quota', '-1');
+                        if ($maxQuota !== -1 && $quota > $maxQuota) {
+                            throw new OCSException($this->l10n->t('Invalid quota value. %1$s is exceeding the maximum quota', [$value]), 101);
+                        }
+                        $quota = Util::humanFileSize($quota);
+                    }
+                }
+                // no else block because quota can be set to 'none' in previous if
+                if ($quota === 'none') {
+                    $allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
+                    if (!$allowUnlimitedQuota) {
+                        throw new OCSException($this->l10n->t('Unlimited quota is forbidden on this instance'), 101);
+                    }
+                }
+                $targetUser->setQuota($quota);
+                break;
+            case self::USER_FIELD_MANAGER:
+                $targetUser->setManagerUids([$value]);
+                break;
+            case self::USER_FIELD_PASSWORD:
+                try {
+                    if (strlen($value) > IUserManager::MAX_PASSWORD_LENGTH) {
+                        throw new OCSException($this->l10n->t('Invalid password value'), 101);
+                    }
+                    if (!$targetUser->canChangePassword()) {
+                        throw new OCSException($this->l10n->t('Setting the password is not supported by the users backend'), 112);
+                    }
+                    $targetUser->setPassword($value);
+                } catch (HintException $e) { // password policy error
+                    throw new OCSException($e->getHint(), 107);
+                }
+                break;
+            case self::USER_FIELD_LANGUAGE:
+                $languagesCodes = $this->l10nFactory->findAvailableLanguages();
+                if (!in_array($value, $languagesCodes, true) && $value !== 'en') {
+                    throw new OCSException($this->l10n->t('Invalid language'), 101);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'lang', $value);
+                break;
+            case self::USER_FIELD_LOCALE:
+                if (!$this->l10nFactory->localeExists($value)) {
+                    throw new OCSException($this->l10n->t('Invalid locale'), 101);
+                }
+                $this->config->setUserValue($targetUser->getUID(), 'core', 'locale', $value);
+                break;
+            case self::USER_FIELD_FIRST_DAY_OF_WEEK:
+                $intValue = (int)$value;
+                if ($intValue < -1 || $intValue > 6) {
+                    throw new OCSException($this->l10n->t('Invalid first day of week'), 101);
+                }
+                if ($intValue === -1) {
+                    $this->config->deleteUserValue($targetUser->getUID(), 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK);
+                } else {
+                    $this->config->setUserValue($targetUser->getUID(), 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK, $value);
+                }
+                break;
+            case self::USER_FIELD_NOTIFICATION_EMAIL:
+                $success = false;
+                if ($value === '' || filter_var($value, FILTER_VALIDATE_EMAIL)) {
+                    try {
+                        $targetUser->setPrimaryEMailAddress($value);
+                        $success = true;
+                    } catch (InvalidArgumentException $e) {
+                        $this->logger->info(
+                            'Cannot set primary email, because provided address is not verified',
+                            [
+                                'app' => 'provisioning_api',
+                                'exception' => $e,
+                            ]
+                        );
+                    }
+                }
+                if (!$success) {
+                    throw new OCSException('', 101);
+                }
+                break;
+            case IAccountManager::PROPERTY_EMAIL:
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
+                    $targetUser->setEMailAddress($value);
+                } else {
+                    throw new OCSException('', 101);
+                }
+                break;
+            case IAccountManager::COLLECTION_EMAIL:
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) && $value !== $targetUser->getSystemEMailAddress()) {
+                    $userAccount = $this->accountManager->getAccount($targetUser);
+                    $mailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+
+                    if ($mailCollection->getPropertyByValue($value)) {
+                        throw new OCSException('', 101);
+                    }
+
+                    $mailCollection->addPropertyWithDefaults($value);
+                    $this->accountManager->updateAccount($userAccount);
+                } else {
+                    throw new OCSException('', 101);
+                }
+                break;
+            case IAccountManager::PROPERTY_PHONE:
+            case IAccountManager::PROPERTY_ADDRESS:
+            case IAccountManager::PROPERTY_WEBSITE:
+            case IAccountManager::PROPERTY_TWITTER:
+            case IAccountManager::PROPERTY_FEDIVERSE:
+            case IAccountManager::PROPERTY_ORGANISATION:
+            case IAccountManager::PROPERTY_ROLE:
+            case IAccountManager::PROPERTY_HEADLINE:
+            case IAccountManager::PROPERTY_BIOGRAPHY:
+            case IAccountManager::PROPERTY_BIRTHDATE:
+            case IAccountManager::PROPERTY_PRONOUNS:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                try {
+                    $userProperty = $userAccount->getProperty($key);
+                    if ($userProperty->getValue() !== $value) {
+                        try {
+                            $userProperty->setValue($value);
+                            if ($userProperty->getName() === IAccountManager::PROPERTY_PHONE) {
+                                $this->knownUserService->deleteByContactUserId($targetUser->getUID());
+                            }
+                        } catch (InvalidArgumentException $e) {
+                            throw new OCSException('Invalid ' . $e->getMessage(), 101);
+                        }
+                    }
+                } catch (PropertyDoesNotExistException $e) {
+                    $userAccount->setProperty($key, $value, IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED);
+                }
+                try {
+                    $this->accountManager->updateAccount($userAccount);
+                } catch (InvalidArgumentException $e) {
+                    throw new OCSException('Invalid ' . $e->getMessage(), 101);
+                }
+                break;
+            case IAccountManager::PROPERTY_PROFILE_ENABLED:
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                try {
+                    $userProperty = $userAccount->getProperty($key);
+                    if ($userProperty->getValue() !== $value) {
+                        $userProperty->setValue($value);
+                    }
+                } catch (PropertyDoesNotExistException $e) {
+                    $userAccount->setProperty($key, $value, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
+                }
+                $this->accountManager->updateAccount($userAccount);
+                break;
+            case IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_PHONE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_ADDRESS . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_WEBSITE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_TWITTER . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_FEDIVERSE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_ORGANISATION . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_ROLE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_HEADLINE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_BIOGRAPHY . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_PROFILE_ENABLED . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_BIRTHDATE . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX:
+            case IAccountManager::PROPERTY_PRONOUNS . self::SCOPE_SUFFIX:
+                $propertyName = substr($key, 0, strlen($key) - strlen(self::SCOPE_SUFFIX));
+                $userAccount = $this->accountManager->getAccount($targetUser);
+                $userProperty = $userAccount->getProperty($propertyName);
+                if ($userProperty->getScope() !== $value) {
+                    try {
+                        $userProperty->setScope($value);
+                        $this->accountManager->updateAccount($userAccount);
+                    } catch (InvalidArgumentException $e) {
+                        throw new OCSException('Invalid ' . $e->getMessage(), 101);
+                    }
+                }
+                break;
+            default:
+                throw new OCSException('', 113);
+        }
+        return new DataResponse();
+    }
+
+    /**
+     * Wipe all devices of a user
+     *
+     * @param string $userId ID of the user
+     *
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     *
+     * @throws OCSException
+     *
+     * 200: Wiped all user devices successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function wipeUserDevices(string $userId): DataResponse {
+        /** @var IUser $currentLoggedInUser */
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+        if (!$isAdmin && !($isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $this->remoteWipe->markAllTokensForWipe($targetUser);
+
+        return new DataResponse();
+    }
+
+    /**
+     * Delete a user
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User deleted successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function deleteUser(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        if ($targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+        if (!$isAdmin && !($isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        // Go ahead with the delete
+        if ($targetUser->delete()) {
+            return new DataResponse();
+        } else {
+            throw new OCSException('', 101);
+        }
+    }
+
+    /**
+     * Disable a user
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User disabled successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function disableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, false);
+    }
+
+    /**
+     * Enable a user
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User enabled successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function enableUser(string $userId): DataResponse {
+        return $this->setEnabled($userId, true);
+    }
+
+    /**
+     * @param string $userId
+     * @param bool $value
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     */
+    private function setEnabled(string $userId, bool $value): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null || $targetUser->getUID() === $currentLoggedInUser->getUID()) {
+            throw new OCSException('', 101);
+        }
+
+        // If not permitted
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+        if (!$isAdmin && !($isDelegatedAdmin && !$this->groupManager->isInGroup($targetUser->getUID(), 'admin')) && !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        // enable/disable the user now
+        $targetUser->setEnabled($value);
+        return new DataResponse();
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get a list of groups the user belongs to
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, array{groups: list<string>}, array{}>
+     * @throws OCSException
+     *
+     * 200: Users groups returned
+     */
+    #[NoAdminRequired]
+    public function getUsersGroups(string $userId): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
+        if ($targetUser->getUID() === $loggedInUser->getUID() || $isAdmin || $isDelegatedAdmin) {
+            // Self lookup or admin lookup
+            return new DataResponse([
+                'groups' => $this->groupManager->getUserGroupIds($targetUser)
+            ]);
+        } else {
+            $subAdminManager = $this->groupManager->getSubAdmin();
+
+            // Looking up someone else
+            if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
+                // Return the group that the method caller is subadmin of for the user in question
+                $groups = array_values(array_intersect(
+                    array_map(static fn (IGroup $group) => $group->getGID(), $subAdminManager->getSubAdminsGroups($loggedInUser)),
+                    $this->groupManager->getUserGroupIds($targetUser)
+                ));
+                return new DataResponse(['groups' => $groups]);
+            } else {
+                // Not permitted
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        }
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get a list of groups with details
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, array{groups: list<Provisioning_APIGroupDetails>}, array{}>
+     * @throws OCSException
+     *
+     * 200: Users groups returned
+     */
+    #[NoAdminRequired]
+    public function getUsersGroupsDetails(string $userId): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
+        if ($targetUser->getUID() === $loggedInUser->getUID() || $isAdmin || $isDelegatedAdmin) {
+            // Self lookup or admin lookup
+            $groups = array_map(
+                function (Group $group) {
+                    return [
+                        'id' => $group->getGID(),
+                        'displayname' => $group->getDisplayName(),
+                        'usercount' => $group->count(),
+                        'disabled' => $group->countDisabled(),
+                        'canAdd' => $group->canAddUser(),
+                        'canRemove' => $group->canRemoveUser(),
+                    ];
+                },
+                array_values($this->groupManager->getUserGroups($targetUser)),
+            );
+            return new DataResponse([
+                'groups' => $groups,
+            ]);
+        } else {
+            $subAdminManager = $this->groupManager->getSubAdmin();
+
+            // Looking up someone else
+            if ($subAdminManager->isUserAccessible($loggedInUser, $targetUser)) {
+                // Return the group that the method caller is subadmin of for the user in question
+                $gids = array_values(array_intersect(
+                    array_map(
+                        static fn (IGroup $group) => $group->getGID(),
+                        $subAdminManager->getSubAdminsGroups($loggedInUser),
+                    ),
+                    $this->groupManager->getUserGroupIds($targetUser)
+                ));
+                $groups = array_map(
+                    function (string $gid) {
+                        $group = $this->groupManager->get($gid);
+                        return [
+                            'id' => $group->getGID(),
+                            'displayname' => $group->getDisplayName(),
+                            'usercount' => $group->count(),
+                            'disabled' => $group->countDisabled(),
+                            'canAdd' => $group->canAddUser(),
+                            'canRemove' => $group->canRemoveUser(),
+                        ];
+                    },
+                    $gids,
+                );
+                return new DataResponse([
+                    'groups' => $groups,
+                ]);
+            } else {
+                // Not permitted
+                throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+            }
+        }
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * Get a list of the groups the user is a subadmin of, with details
+     *
+     * @param string $userId ID of the user
+     * @return DataResponse<Http::STATUS_OK, array{groups: list<Provisioning_APIGroupDetails>}, array{}>
+     * @throws OCSException
+     *
+     * 200: Users subadmin groups returned
+     */
+    #[NoAdminRequired]
+    public function getUserSubAdminGroupsDetails(string $userId): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
+        if ($targetUser->getUID() === $loggedInUser->getUID() || $isAdmin || $isDelegatedAdmin) {
+            $subAdminManager = $this->groupManager->getSubAdmin();
+            $groups = array_map(
+                function (IGroup $group) {
+                    return [
+                        'id' => $group->getGID(),
+                        'displayname' => $group->getDisplayName(),
+                        'usercount' => $group->count(),
+                        'disabled' => $group->countDisabled(),
+                        'canAdd' => $group->canAddUser(),
+                        'canRemove' => $group->canRemoveUser(),
+                    ];
+                },
+                array_values($subAdminManager->getSubAdminsGroups($targetUser)),
+            );
+            return new DataResponse([
+                'groups' => $groups,
+            ]);
+        }
+        throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+    }
+
+    /**
+     * Add a user to a group
+     *
+     * @param string $userId ID of the user
+     * @param string $groupid ID of the group
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User added to group successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function addToGroup(string $userId, string $groupid = ''): DataResponse {
+        if ($groupid === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        $targetUser = $this->userManager->get($userId);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $loggedInUser = $this->userSession->getUser();
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
+        if (!$isAdmin && !($isDelegatedAdmin && $groupid !== 'admin') && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Add user to group
+        $group->addUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * Remove a user from a group
+     *
+     * @param string $userId ID of the user
+     * @param string $groupid ID of the group
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User removed from group successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function removeFromGroup(string $userId, string $groupid): DataResponse {
+        $loggedInUser = $this->userSession->getUser();
+
+        if ($groupid === null || trim($groupid) === '') {
+            throw new OCSException('', 101);
+        }
+
+        $group = $this->groupManager->get($groupid);
+        if ($group === null) {
+            throw new OCSException('', 102);
+        }
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', 103);
+        }
+
+        // If they're not an admin, check they are a subadmin of the group in question
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($loggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($loggedInUser->getUID());
+        if (!$isAdmin && !($isDelegatedAdmin && $groupid !== 'admin') && !$subAdminManager->isSubAdminOfGroup($loggedInUser, $group)) {
+            throw new OCSException('', 104);
+        }
+
+        // Check they aren't removing themselves from 'admin' or their 'subadmin; group
+        if ($targetUser->getUID() === $loggedInUser->getUID()) {
+            if ($isAdmin || $isDelegatedAdmin) {
+                if ($group->getGID() === 'admin') {
+                    throw new OCSException($this->l10n->t('Cannot remove yourself from the admin group'), 105);
+                }
+            } else {
+                // Not an admin, so the user must be a subadmin of this group, but that is not allowed.
+                throw new OCSException($this->l10n->t('Cannot remove yourself from this group as you are a sub-admin'), 105);
+            }
+        } elseif (!($isAdmin || $isDelegatedAdmin)) {
+            /** @var IGroup[] $subAdminGroups */
+            $subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
+            $subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+                return $subAdminGroup->getGID();
+            }, $subAdminGroups);
+            $userGroups = $this->groupManager->getUserGroupIds($targetUser);
+            $userSubAdminGroups = array_intersect($subAdminGroups, $userGroups);
+
+            if (count($userSubAdminGroups) <= 1) {
+                // Subadmin must not be able to remove a user from all their subadmin groups.
+                throw new OCSException($this->l10n->t('Not viable to remove user from the last group you are sub-admin of'), 105);
+            }
+        }
+
+        // Remove user from group
+        $group->removeUser($targetUser);
+        return new DataResponse();
+    }
+
+    /**
+     * Make a user a subadmin of a group
+     *
+     * @param string $userId ID of the user
+     * @param string $groupid ID of the group
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User added as group subadmin successfully
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    #[PasswordConfirmationRequired]
+    public function addSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException($this->l10n->t('User does not exist'), 101);
+        }
+        // Check if group exists
+        if ($group === null) {
+            throw new OCSException($this->l10n->t('Group does not exist'), 102);
+        }
+        // Check if trying to make subadmin of admin group
+        if ($group->getGID() === 'admin') {
+            throw new OCSException($this->l10n->t('Cannot create sub-admins for admin group'), 103);
+        }
+
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // We cannot be subadmin twice
+        if ($subAdminManager->isSubAdminOfGroup($user, $group)) {
+            return new DataResponse();
+        }
+        // Go
+        $subAdminManager->createSubAdmin($user, $group);
+        return new DataResponse();
+    }
+
+    /**
+     * Remove a user from the subadmins of a group
+     *
+     * @param string $userId ID of the user
+     * @param string $groupid ID of the group
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: User removed as group subadmin successfully
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    #[PasswordConfirmationRequired]
+    public function removeSubAdmin(string $userId, string $groupid): DataResponse {
+        $group = $this->groupManager->get($groupid);
+        $user = $this->userManager->get($userId);
+        $subAdminManager = $this->groupManager->getSubAdmin();
+
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSException($this->l10n->t('User does not exist'), 101);
+        }
+        // Check if the group exists
+        if ($group === null) {
+            throw new OCSException($this->l10n->t('Group does not exist'), 101);
+        }
+        // Check if they are a subadmin of this said group
+        if (!$subAdminManager->isSubAdminOfGroup($user, $group)) {
+            throw new OCSException($this->l10n->t('User is not a sub-admin of this group'), 102);
+        }
+
+        // Go
+        $subAdminManager->deleteSubAdmin($user, $group);
+        return new DataResponse();
+    }
+
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId ID if the user
+     * @return DataResponse<Http::STATUS_OK, list<string>, array{}>
+     * @throws OCSException
+     *
+     * 200: User subadmin groups returned
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    public function getUserSubAdminGroups(string $userId): DataResponse {
+        $groups = $this->getUserSubAdminGroupsData($userId);
+        return new DataResponse($groups);
+    }
+
+    /**
+     * Resend the welcome message
+     *
+     * @param string $userId ID if the user
+     * @return DataResponse<Http::STATUS_OK, list<empty>, array{}>
+     * @throws OCSException
+     *
+     * 200: Resent welcome message successfully
+     */
+    #[PasswordConfirmationRequired]
+    #[NoAdminRequired]
+    public function resendWelcomeMessage(string $userId): DataResponse {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $targetUser = $this->userManager->get($userId);
+        if ($targetUser === null) {
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        // Check if admin / subadmin
+        $subAdminManager = $this->groupManager->getSubAdmin();
+        $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+        if (
+            !$subAdminManager->isUserAccessible($currentLoggedInUser, $targetUser)
+            && !($isAdmin || $isDelegatedAdmin)
+        ) {
+            // No rights
+            throw new OCSException('', OCSController::RESPOND_NOT_FOUND);
+        }
+
+        $email = $targetUser->getEMailAddress();
+        if ($email === '' || $email === null) {
+            throw new OCSException($this->l10n->t('Email address not available'), 101);
+        }
+
+        try {
+            if ($this->config->getUserValue($targetUser->getUID(), 'core', 'lostpassword')) {
+                $emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, true);
+            } else {
+                $emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
+            }
+
+            $this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
+        } catch (\Exception $e) {
+            $this->logger->error(
+                "Can't send new user mail to $email",
+                [
+                    'app' => 'settings',
+                    'exception' => $e,
+                ]
+            );
+            throw new OCSException($this->l10n->t('Sending email failed'), 102);
+        }
+
+        return new DataResponse();
+    }
 }

lib/private/App/AppManager.php

Indentation +909 added lines, -909 removed lines

@@ -32,913 +32,913 @@
 use Psr\Log\LoggerInterface;
 
 class AppManager implements IAppManager {
-	/**
-	 * Apps with these types can not be enabled for certain groups only
-	 * @var string[]
-	 */
-	protected $protectedAppTypes = [
-		'filesystem',
-		'prelogin',
-		'authentication',
-		'logging',
-		'prevent_group_restriction',
-	];
-
-	/** @var string[] $appId => $enabled */
-	private array $enabledAppsCache = [];
-
-	/** @var string[]|null */
-	private ?array $shippedApps = null;
-
-	private array $alwaysEnabled = [];
-	private array $defaultEnabled = [];
-
-	/** @var array */
-	private array $appInfos = [];
-
-	/** @var array */
-	private array $appVersions = [];
-
-	/** @var array */
-	private array $autoDisabledApps = [];
-	private array $appTypes = [];
-
-	/** @var array<string, true> */
-	private array $loadedApps = [];
-
-	private ?AppConfig $appConfig = null;
-	private ?IURLGenerator $urlGenerator = null;
-	private ?INavigationManager $navigationManager = null;
-
-	/**
-	 * Be extremely careful when injecting classes here. The AppManager is used by the installer,
-	 * so it needs to work before installation. See how AppConfig and IURLGenerator are injected for reference
-	 */
-	public function __construct(
-		private IUserSession $userSession,
-		private IConfig $config,
-		private IGroupManager $groupManager,
-		private ICacheFactory $memCacheFactory,
-		private IEventDispatcher $dispatcher,
-		private LoggerInterface $logger,
-		private ServerVersion $serverVersion,
-	) {
-	}
-
-	private function getNavigationManager(): INavigationManager {
-		if ($this->navigationManager === null) {
-			$this->navigationManager = \OCP\Server::get(INavigationManager::class);
-		}
-		return $this->navigationManager;
-	}
-
-	public function getAppIcon(string $appId, bool $dark = false): ?string {
-		$possibleIcons = $dark ? [$appId . '-dark.svg', 'app-dark.svg'] : [$appId . '.svg', 'app.svg'];
-		$icon = null;
-		foreach ($possibleIcons as $iconName) {
-			try {
-				$icon = $this->getUrlGenerator()->imagePath($appId, $iconName);
-				break;
-			} catch (\RuntimeException $e) {
-				// ignore
-			}
-		}
-		return $icon;
-	}
-
-	private function getAppConfig(): AppConfig {
-		if ($this->appConfig !== null) {
-			return $this->appConfig;
-		}
-		if (!$this->config->getSystemValueBool('installed', false)) {
-			throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
-		}
-		$this->appConfig = \OCP\Server::get(AppConfig::class);
-		return $this->appConfig;
-	}
-
-	private function getUrlGenerator(): IURLGenerator {
-		if ($this->urlGenerator !== null) {
-			return $this->urlGenerator;
-		}
-		if (!$this->config->getSystemValueBool('installed', false)) {
-			throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
-		}
-		$this->urlGenerator = \OCP\Server::get(IURLGenerator::class);
-		return $this->urlGenerator;
-	}
-
-	/**
-	 * For all enabled apps, return the value of their 'enabled' config key.
-	 *
-	 * @return array<string,string> appId => enabled (may be 'yes', or a json encoded list of group ids)
-	 */
-	private function getEnabledAppsValues(): array {
-		if (!$this->enabledAppsCache) {
-			/** @var array<string,string> */
-			$values = $this->getAppConfig()->searchValues('enabled', false, IAppConfig::VALUE_STRING);
-
-			$alwaysEnabledApps = $this->getAlwaysEnabledApps();
-			foreach ($alwaysEnabledApps as $appId) {
-				$values[$appId] = 'yes';
-			}
-
-			$this->enabledAppsCache = array_filter($values, function ($value) {
-				return $value !== 'no';
-			});
-			ksort($this->enabledAppsCache);
-		}
-		return $this->enabledAppsCache;
-	}
-
-	/**
-	 * Deprecated alias
-	 *
-	 * @return string[]
-	 */
-	public function getInstalledApps() {
-		return $this->getEnabledApps();
-	}
-
-	/**
-	 * List all enabled apps, either for everyone or for some groups
-	 *
-	 * @return list<string>
-	 */
-	public function getEnabledApps(): array {
-		return array_keys($this->getEnabledAppsValues());
-	}
-
-	/**
-	 * Get a list of all apps in the apps folder
-	 *
-	 * @return list<string> an array of app names (string IDs)
-	 */
-	public function getAllAppsInAppsFolders(): array {
-		$apps = [];
-
-		foreach (\OC::$APPSROOTS as $apps_dir) {
-			if (!is_readable($apps_dir['path'])) {
-				$this->logger->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']);
-				continue;
-			}
-			$dh = opendir($apps_dir['path']);
-
-			if (is_resource($dh)) {
-				while (($file = readdir($dh)) !== false) {
-					if (
-						$file[0] != '.' &&
-						is_dir($apps_dir['path'] . '/' . $file) &&
-						is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')
-					) {
-						$apps[] = $file;
-					}
-				}
-			}
-		}
-
-		return array_values(array_unique($apps));
-	}
-
-	/**
-	 * List all apps enabled for a user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return list<string>
-	 */
-	public function getEnabledAppsForUser(IUser $user) {
-		$apps = $this->getEnabledAppsValues();
-		$appsForUser = array_filter($apps, function ($enabled) use ($user) {
-			return $this->checkAppForUser($enabled, $user);
-		});
-		return array_keys($appsForUser);
-	}
-
-	public function getEnabledAppsForGroup(IGroup $group): array {
-		$apps = $this->getEnabledAppsValues();
-		$appsForGroups = array_filter($apps, function ($enabled) use ($group) {
-			return $this->checkAppForGroups($enabled, $group);
-		});
-		return array_keys($appsForGroups);
-	}
-
-	/**
-	 * Loads all apps
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 *
-	 * This function walks through the Nextcloud directory and loads all apps
-	 * it can find. A directory contains an app if the file /appinfo/info.xml
-	 * exists.
-	 *
-	 * if $types is set to non-empty array, only apps of those types will be loaded
-	 */
-	public function loadApps(array $types = []): bool {
-		if ($this->config->getSystemValueBool('maintenance', false)) {
-			return false;
-		}
-		// Load the enabled apps here
-		$apps = \OC_App::getEnabledApps();
-
-		// Add each apps' folder as allowed class path
-		foreach ($apps as $app) {
-			// If the app is already loaded then autoloading it makes no sense
-			if (!$this->isAppLoaded($app)) {
-				$path = \OC_App::getAppPath($app);
-				if ($path !== false) {
-					\OC_App::registerAutoloading($app, $path);
-				}
-			}
-		}
-
-		// prevent app loading from printing output
-		ob_start();
-		foreach ($apps as $app) {
-			if (!$this->isAppLoaded($app) && ($types === [] || $this->isType($app, $types))) {
-				try {
-					$this->loadApp($app);
-				} catch (\Throwable $e) {
-					$this->logger->emergency('Error during app loading: ' . $e->getMessage(), [
-						'exception' => $e,
-						'app' => $app,
-					]);
-				}
-			}
-		}
-		ob_end_clean();
-
-		return true;
-	}
-
-	/**
-	 * check if an app is of a specific type
-	 *
-	 * @param string $app
-	 * @param array $types
-	 * @return bool
-	 */
-	public function isType(string $app, array $types): bool {
-		$appTypes = $this->getAppTypes($app);
-		foreach ($types as $type) {
-			if (in_array($type, $appTypes, true)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * get the types of an app
-	 *
-	 * @param string $app
-	 * @return string[]
-	 */
-	private function getAppTypes(string $app): array {
-		//load the cache
-		if (count($this->appTypes) === 0) {
-			$this->appTypes = $this->getAppConfig()->getValues(false, 'types') ?: [];
-		}
-
-		if (isset($this->appTypes[$app])) {
-			return explode(',', $this->appTypes[$app]);
-		}
-
-		return [];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAutoDisabledApps(): array {
-		return $this->autoDisabledApps;
-	}
-
-	public function getAppRestriction(string $appId): array {
-		$values = $this->getEnabledAppsValues();
-
-		if (!isset($values[$appId])) {
-			return [];
-		}
-
-		if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
-			return [];
-		}
-		return json_decode($values[$appId], true);
-	}
-
-	/**
-	 * Check if an app is enabled for user
-	 *
-	 * @param string $appId
-	 * @param \OCP\IUser|null $user (optional) if not defined, the currently logged in user will be used
-	 * @return bool
-	 */
-	public function isEnabledForUser($appId, $user = null) {
-		if ($this->isAlwaysEnabled($appId)) {
-			return true;
-		}
-		if ($user === null) {
-			$user = $this->userSession->getUser();
-		}
-		$enabledAppsValues = $this->getEnabledAppsValues();
-		if (isset($enabledAppsValues[$appId])) {
-			return $this->checkAppForUser($enabledAppsValues[$appId], $user);
-		} else {
-			return false;
-		}
-	}
-
-	private function checkAppForUser(string $enabled, ?IUser $user): bool {
-		if ($enabled === 'yes') {
-			return true;
-		} elseif ($user === null) {
-			return false;
-		} else {
-			if (empty($enabled)) {
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$jsonErrorMsg = json_last_error_msg();
-				// this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
-				$this->logger->warning('AppManager::checkAppForUser - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
-				return false;
-			}
-
-			$userGroups = $this->groupManager->getUserGroupIds($user);
-			foreach ($userGroups as $groupId) {
-				if (in_array($groupId, $groupIds, true)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	private function checkAppForGroups(string $enabled, IGroup $group): bool {
-		if ($enabled === 'yes') {
-			return true;
-		} else {
-			if (empty($enabled)) {
-				return false;
-			}
-
-			$groupIds = json_decode($enabled);
-
-			if (!is_array($groupIds)) {
-				$jsonError = json_last_error();
-				$jsonErrorMsg = json_last_error_msg();
-				// this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
-				$this->logger->warning('AppManager::checkAppForGroups - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
-				return false;
-			}
-
-			return in_array($group->getGID(), $groupIds);
-		}
-	}
-
-	/**
-	 * Check if an app is enabled in the instance
-	 *
-	 * Notice: This actually checks if the app is enabled and not only if it is installed.
-	 *
-	 * @param string $appId
-	 */
-	public function isInstalled($appId): bool {
-		return $this->isEnabledForAnyone($appId);
-	}
-
-	public function isEnabledForAnyone(string $appId): bool {
-		$enabledAppsValues = $this->getEnabledAppsValues();
-		return isset($enabledAppsValues[$appId]);
-	}
-
-	/**
-	 * Overwrite the `max-version` requirement for this app.
-	 */
-	public function overwriteNextcloudRequirement(string $appId): void {
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		if (!in_array($appId, $ignoreMaxApps, true)) {
-			$ignoreMaxApps[] = $appId;
-		}
-		$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
-	}
-
-	/**
-	 * Remove the `max-version` overwrite for this app.
-	 * This means this app now again can not be enabled if the `max-version` is smaller than the current Nextcloud version.
-	 */
-	public function removeOverwriteNextcloudRequirement(string $appId): void {
-		$ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
-		$ignoreMaxApps = array_filter($ignoreMaxApps, fn (string $id) => $id !== $appId);
-		$this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
-	}
-
-	public function loadApp(string $app): void {
-		if (isset($this->loadedApps[$app])) {
-			return;
-		}
-		$this->loadedApps[$app] = true;
-		$appPath = \OC_App::getAppPath($app);
-		if ($appPath === false) {
-			return;
-		}
-		$eventLogger = \OC::$server->get(IEventLogger::class);
-		$eventLogger->start("bootstrap:load_app:$app", "Load app: $app");
-
-		// in case someone calls loadApp() directly
-		\OC_App::registerAutoloading($app, $appPath);
-
-		if (is_file($appPath . '/appinfo/app.php')) {
-			$this->logger->error('/appinfo/app.php is not supported anymore, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
-				'app' => $app,
-			]);
-		}
-
-		$coordinator = \OCP\Server::get(Coordinator::class);
-		$coordinator->bootApp($app);
-
-		$eventLogger->start("bootstrap:load_app:$app:info", "Load info.xml for $app and register any services defined in it");
-		$info = $this->getAppInfo($app);
-		if (!empty($info['activity'])) {
-			$activityManager = \OC::$server->get(IActivityManager::class);
-			if (!empty($info['activity']['filters'])) {
-				foreach ($info['activity']['filters'] as $filter) {
-					$activityManager->registerFilter($filter);
-				}
-			}
-			if (!empty($info['activity']['settings'])) {
-				foreach ($info['activity']['settings'] as $setting) {
-					$activityManager->registerSetting($setting);
-				}
-			}
-			if (!empty($info['activity']['providers'])) {
-				foreach ($info['activity']['providers'] as $provider) {
-					$activityManager->registerProvider($provider);
-				}
-			}
-		}
-
-		if (!empty($info['settings'])) {
-			$settingsManager = \OC::$server->get(ISettingsManager::class);
-			if (!empty($info['settings']['admin'])) {
-				foreach ($info['settings']['admin'] as $setting) {
-					$settingsManager->registerSetting('admin', $setting);
-				}
-			}
-			if (!empty($info['settings']['admin-section'])) {
-				foreach ($info['settings']['admin-section'] as $section) {
-					$settingsManager->registerSection('admin', $section);
-				}
-			}
-			if (!empty($info['settings']['personal'])) {
-				foreach ($info['settings']['personal'] as $setting) {
-					$settingsManager->registerSetting('personal', $setting);
-				}
-			}
-			if (!empty($info['settings']['personal-section'])) {
-				foreach ($info['settings']['personal-section'] as $section) {
-					$settingsManager->registerSection('personal', $section);
-				}
-			}
-		}
-
-		if (!empty($info['collaboration']['plugins'])) {
-			// deal with one or many plugin entries
-			$plugins = isset($info['collaboration']['plugins']['plugin']['@value']) ?
-				[$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
-			$collaboratorSearch = null;
-			$autoCompleteManager = null;
-			foreach ($plugins as $plugin) {
-				if ($plugin['@attributes']['type'] === 'collaborator-search') {
-					$pluginInfo = [
-						'shareType' => $plugin['@attributes']['share-type'],
-						'class' => $plugin['@value'],
-					];
-					$collaboratorSearch ??= \OC::$server->get(ICollaboratorSearch::class);
-					$collaboratorSearch->registerPlugin($pluginInfo);
-				} elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
-					$autoCompleteManager ??= \OC::$server->get(IAutoCompleteManager::class);
-					$autoCompleteManager->registerSorter($plugin['@value']);
-				}
-			}
-		}
-		$eventLogger->end("bootstrap:load_app:$app:info");
-
-		$eventLogger->end("bootstrap:load_app:$app");
-	}
-
-	/**
-	 * Check if an app is loaded
-	 * @param string $app app id
-	 * @since 26.0.0
-	 */
-	public function isAppLoaded(string $app): bool {
-		return isset($this->loadedApps[$app]);
-	}
-
-	/**
-	 * Enable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $forceEnable
-	 * @throws AppPathNotFoundException
-	 * @throws \InvalidArgumentException if the application is not installed yet
-	 */
-	public function enableApp(string $appId, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
-			throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
-		}
-
-		if ($forceEnable) {
-			$this->overwriteNextcloudRequirement($appId);
-		}
-
-		$this->enabledAppsCache[$appId] = 'yes';
-		$this->getAppConfig()->setValue($appId, 'enabled', 'yes');
-		$this->dispatcher->dispatchTyped(new AppEnableEvent($appId));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE, $appId
-		));
-		$this->clearAppsCache();
-	}
-
-	/**
-	 * Whether a list of types contains a protected app type
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 */
-	public function hasProtectedAppType($types) {
-		if (empty($types)) {
-			return false;
-		}
-
-		$protectedTypes = array_intersect($this->protectedAppTypes, $types);
-		return !empty($protectedTypes);
-	}
-
-	/**
-	 * Enable an app only for specific groups
-	 *
-	 * @param string $appId
-	 * @param IGroup[] $groups
-	 * @param bool $forceEnable
-	 * @throws \InvalidArgumentException if app can't be enabled for groups
-	 * @throws AppPathNotFoundException
-	 */
-	public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
-		// Check if app exists
-		$this->getAppPath($appId);
-
-		$info = $this->getAppInfo($appId);
-		if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
-			throw new \InvalidArgumentException("$appId can't be enabled for groups.");
-		}
-
-		if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
-			throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
-		}
-
-		if ($forceEnable) {
-			$this->overwriteNextcloudRequirement($appId);
-		}
-
-		/** @var string[] $groupIds */
-		$groupIds = array_map(function ($group) {
-			/** @var IGroup $group */
-			return ($group instanceof IGroup)
-				? $group->getGID()
-				: $group;
-		}, $groups);
-
-		$this->enabledAppsCache[$appId] = json_encode($groupIds);
-		$this->getAppConfig()->setValue($appId, 'enabled', json_encode($groupIds));
-		$this->dispatcher->dispatchTyped(new AppEnableEvent($appId, $groupIds));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
-			ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
-		));
-		$this->clearAppsCache();
-	}
-
-	/**
-	 * Disable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $automaticDisabled
-	 * @throws \Exception if app can't be disabled
-	 */
-	public function disableApp($appId, $automaticDisabled = false): void {
-		if ($this->isAlwaysEnabled($appId)) {
-			throw new \Exception("$appId can't be disabled.");
-		}
-
-		if ($automaticDisabled) {
-			$previousSetting = $this->getAppConfig()->getValue($appId, 'enabled', 'yes');
-			if ($previousSetting !== 'yes' && $previousSetting !== 'no') {
-				$previousSetting = json_decode($previousSetting, true);
-			}
-			$this->autoDisabledApps[$appId] = $previousSetting;
-		}
-
-		unset($this->enabledAppsCache[$appId]);
-		$this->getAppConfig()->setValue($appId, 'enabled', 'no');
-
-		// run uninstall steps
-		$appData = $this->getAppInfo($appId);
-		if (!is_null($appData)) {
-			\OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
-		}
-
-		$this->dispatcher->dispatchTyped(new AppDisableEvent($appId));
-		$this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
-			ManagerEvent::EVENT_APP_DISABLE, $appId
-		));
-		$this->clearAppsCache();
-	}
-
-	/**
-	 * Get the directory for the given app.
-	 *
-	 * @throws AppPathNotFoundException if app folder can't be found
-	 */
-	public function getAppPath(string $appId): string {
-		$appPath = \OC_App::getAppPath($appId);
-		if ($appPath === false) {
-			throw new AppPathNotFoundException('Could not find path for ' . $appId);
-		}
-		return $appPath;
-	}
-
-	/**
-	 * Get the web path for the given app.
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws AppPathNotFoundException if app path can't be found
-	 */
-	public function getAppWebPath(string $appId): string {
-		$appWebPath = \OC_App::getAppWebPath($appId);
-		if ($appWebPath === false) {
-			throw new AppPathNotFoundException('Could not find web path for ' . $appId);
-		}
-		return $appWebPath;
-	}
-
-	/**
-	 * Clear the cached list of apps when enabling/disabling an app
-	 */
-	public function clearAppsCache(): void {
-		$this->appInfos = [];
-	}
-
-	/**
-	 * Returns a list of apps that need upgrade
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 * @return array list of app info from apps that need an upgrade
-	 *
-	 * @internal
-	 */
-	public function getAppsNeedingUpgrade($version) {
-		$appsToUpgrade = [];
-		$apps = $this->getEnabledApps();
-		foreach ($apps as $appId) {
-			$appInfo = $this->getAppInfo($appId);
-			$appDbVersion = $this->getAppConfig()->getValue($appId, 'installed_version');
-			if ($appDbVersion
-				&& isset($appInfo['version'])
-				&& version_compare($appInfo['version'], $appDbVersion, '>')
-				&& \OC_App::isAppCompatible($version, $appInfo)
-			) {
-				$appsToUpgrade[] = $appInfo;
-			}
-		}
-
-		return $appsToUpgrade;
-	}
-
-	/**
-	 * Returns the app information from "appinfo/info.xml".
-	 *
-	 * @param string|null $lang
-	 * @return array|null app info
-	 */
-	public function getAppInfo(string $appId, bool $path = false, $lang = null) {
-		if ($path) {
-			throw new \InvalidArgumentException('Calling IAppManager::getAppInfo() with a path is no longer supported. Please call IAppManager::getAppInfoByPath() instead and verify that the path is good before calling.');
-		}
-		if ($lang === null && isset($this->appInfos[$appId])) {
-			return $this->appInfos[$appId];
-		}
-		try {
-			$appPath = $this->getAppPath($appId);
-		} catch (AppPathNotFoundException) {
-			return null;
-		}
-		$file = $appPath . '/appinfo/info.xml';
-
-		$data = $this->getAppInfoByPath($file, $lang);
-
-		if ($lang === null) {
-			$this->appInfos[$appId] = $data;
-		}
-
-		return $data;
-	}
-
-	public function getAppInfoByPath(string $path, ?string $lang = null): ?array {
-		if (!str_ends_with($path, '/appinfo/info.xml')) {
-			return null;
-		}
-
-		$parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
-		$data = $parser->parse($path);
-
-		if (is_array($data)) {
-			$data = \OC_App::parseAppInfo($data, $lang);
-		}
-
-		return $data;
-	}
-
-	public function getAppVersion(string $appId, bool $useCache = true): string {
-		if (!$useCache || !isset($this->appVersions[$appId])) {
-			if ($appId === 'core') {
-				$this->appVersions[$appId] = $this->serverVersion->getVersionString();
-			} else {
-				$appInfo = $this->getAppInfo($appId);
-				$this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
-			}
-		}
-		return $this->appVersions[$appId];
-	}
-
-	/**
-	 * Returns the installed versions of all apps
-	 *
-	 * @return array<string, string>
-	 */
-	public function getAppInstalledVersions(bool $onlyEnabled = false): array {
-		return $this->getAppConfig()->getAppInstalledVersions($onlyEnabled);
-	}
-
-	/**
-	 * Returns a list of apps incompatible with the given version
-	 *
-	 * @param string $version Nextcloud version as array of version components
-	 *
-	 * @return array list of app info from incompatible apps
-	 *
-	 * @internal
-	 */
-	public function getIncompatibleApps(string $version): array {
-		$apps = $this->getEnabledApps();
-		$incompatibleApps = [];
-		foreach ($apps as $appId) {
-			$info = $this->getAppInfo($appId);
-			if ($info === null) {
-				$incompatibleApps[] = ['id' => $appId, 'name' => $appId];
-			} elseif (!\OC_App::isAppCompatible($version, $info)) {
-				$incompatibleApps[] = $info;
-			}
-		}
-		return $incompatibleApps;
-	}
-
-	/**
-	 * @inheritdoc
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
-	 */
-	public function isShipped($appId) {
-		$this->loadShippedJson();
-		return in_array($appId, $this->shippedApps, true);
-	}
-
-	private function isAlwaysEnabled(string $appId): bool {
-		if ($appId === 'core') {
-			return true;
-		}
-
-		$alwaysEnabled = $this->getAlwaysEnabledApps();
-		return in_array($appId, $alwaysEnabled, true);
-	}
-
-	/**
-	 * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
-	 * @throws \Exception
-	 */
-	private function loadShippedJson(): void {
-		if ($this->shippedApps === null) {
-			$shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
-			if (!file_exists($shippedJson)) {
-				throw new \Exception("File not found: $shippedJson");
-			}
-			$content = json_decode(file_get_contents($shippedJson), true);
-			$this->shippedApps = $content['shippedApps'];
-			$this->alwaysEnabled = $content['alwaysEnabled'];
-			$this->defaultEnabled = $content['defaultEnabled'];
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAlwaysEnabledApps() {
-		$this->loadShippedJson();
-		return $this->alwaysEnabled;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function isDefaultEnabled(string $appId): bool {
-		return (in_array($appId, $this->getDefaultEnabledApps()));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultEnabledApps(): array {
-		$this->loadShippedJson();
-
-		return $this->defaultEnabled;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string {
-		$id = $this->getNavigationManager()->getDefaultEntryIdForUser($user, $withFallbacks);
-		$entry = $this->getNavigationManager()->get($id);
-		return (string)$entry['app'];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getDefaultApps(): array {
-		$ids = $this->getNavigationManager()->getDefaultEntryIds();
-
-		return array_values(array_unique(array_map(function (string $id) {
-			$entry = $this->getNavigationManager()->get($id);
-			return (string)$entry['app'];
-		}, $ids)));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setDefaultApps(array $defaultApps): void {
-		$entries = $this->getNavigationManager()->getAll();
-		$ids = [];
-		foreach ($defaultApps as $defaultApp) {
-			foreach ($entries as $entry) {
-				if ((string)$entry['app'] === $defaultApp) {
-					$ids[] = (string)$entry['id'];
-					break;
-				}
-			}
-		}
-		$this->getNavigationManager()->setDefaultEntryIds($ids);
-	}
-
-	public function isBackendRequired(string $backend): bool {
-		foreach ($this->appInfos as $appInfo) {
-			foreach ($appInfo['dependencies']['backend'] as $appBackend) {
-				if ($backend === $appBackend) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Clean the appId from forbidden characters
-	 *
-	 * @psalm-taint-escape callable
-	 * @psalm-taint-escape cookie
-	 * @psalm-taint-escape file
-	 * @psalm-taint-escape has_quotes
-	 * @psalm-taint-escape header
-	 * @psalm-taint-escape html
-	 * @psalm-taint-escape include
-	 * @psalm-taint-escape ldap
-	 * @psalm-taint-escape shell
-	 * @psalm-taint-escape sql
-	 * @psalm-taint-escape unserialize
-	 */
-	public function cleanAppId(string $app): string {
-		/* Only lowercase alphanumeric is allowed */
-		return preg_replace('/(^[0-9_]|[^a-z0-9_]+|_$)/', '', $app);
-	}
+    /**
+     * Apps with these types can not be enabled for certain groups only
+     * @var string[]
+     */
+    protected $protectedAppTypes = [
+        'filesystem',
+        'prelogin',
+        'authentication',
+        'logging',
+        'prevent_group_restriction',
+    ];
+
+    /** @var string[] $appId => $enabled */
+    private array $enabledAppsCache = [];
+
+    /** @var string[]|null */
+    private ?array $shippedApps = null;
+
+    private array $alwaysEnabled = [];
+    private array $defaultEnabled = [];
+
+    /** @var array */
+    private array $appInfos = [];
+
+    /** @var array */
+    private array $appVersions = [];
+
+    /** @var array */
+    private array $autoDisabledApps = [];
+    private array $appTypes = [];
+
+    /** @var array<string, true> */
+    private array $loadedApps = [];
+
+    private ?AppConfig $appConfig = null;
+    private ?IURLGenerator $urlGenerator = null;
+    private ?INavigationManager $navigationManager = null;
+
+    /**
+     * Be extremely careful when injecting classes here. The AppManager is used by the installer,
+     * so it needs to work before installation. See how AppConfig and IURLGenerator are injected for reference
+     */
+    public function __construct(
+        private IUserSession $userSession,
+        private IConfig $config,
+        private IGroupManager $groupManager,
+        private ICacheFactory $memCacheFactory,
+        private IEventDispatcher $dispatcher,
+        private LoggerInterface $logger,
+        private ServerVersion $serverVersion,
+    ) {
+    }
+
+    private function getNavigationManager(): INavigationManager {
+        if ($this->navigationManager === null) {
+            $this->navigationManager = \OCP\Server::get(INavigationManager::class);
+        }
+        return $this->navigationManager;
+    }
+
+    public function getAppIcon(string $appId, bool $dark = false): ?string {
+        $possibleIcons = $dark ? [$appId . '-dark.svg', 'app-dark.svg'] : [$appId . '.svg', 'app.svg'];
+        $icon = null;
+        foreach ($possibleIcons as $iconName) {
+            try {
+                $icon = $this->getUrlGenerator()->imagePath($appId, $iconName);
+                break;
+            } catch (\RuntimeException $e) {
+                // ignore
+            }
+        }
+        return $icon;
+    }
+
+    private function getAppConfig(): AppConfig {
+        if ($this->appConfig !== null) {
+            return $this->appConfig;
+        }
+        if (!$this->config->getSystemValueBool('installed', false)) {
+            throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
+        }
+        $this->appConfig = \OCP\Server::get(AppConfig::class);
+        return $this->appConfig;
+    }
+
+    private function getUrlGenerator(): IURLGenerator {
+        if ($this->urlGenerator !== null) {
+            return $this->urlGenerator;
+        }
+        if (!$this->config->getSystemValueBool('installed', false)) {
+            throw new \Exception('Nextcloud is not installed yet, AppConfig is not available');
+        }
+        $this->urlGenerator = \OCP\Server::get(IURLGenerator::class);
+        return $this->urlGenerator;
+    }
+
+    /**
+     * For all enabled apps, return the value of their 'enabled' config key.
+     *
+     * @return array<string,string> appId => enabled (may be 'yes', or a json encoded list of group ids)
+     */
+    private function getEnabledAppsValues(): array {
+        if (!$this->enabledAppsCache) {
+            /** @var array<string,string> */
+            $values = $this->getAppConfig()->searchValues('enabled', false, IAppConfig::VALUE_STRING);
+
+            $alwaysEnabledApps = $this->getAlwaysEnabledApps();
+            foreach ($alwaysEnabledApps as $appId) {
+                $values[$appId] = 'yes';
+            }
+
+            $this->enabledAppsCache = array_filter($values, function ($value) {
+                return $value !== 'no';
+            });
+            ksort($this->enabledAppsCache);
+        }
+        return $this->enabledAppsCache;
+    }
+
+    /**
+     * Deprecated alias
+     *
+     * @return string[]
+     */
+    public function getInstalledApps() {
+        return $this->getEnabledApps();
+    }
+
+    /**
+     * List all enabled apps, either for everyone or for some groups
+     *
+     * @return list<string>
+     */
+    public function getEnabledApps(): array {
+        return array_keys($this->getEnabledAppsValues());
+    }
+
+    /**
+     * Get a list of all apps in the apps folder
+     *
+     * @return list<string> an array of app names (string IDs)
+     */
+    public function getAllAppsInAppsFolders(): array {
+        $apps = [];
+
+        foreach (\OC::$APPSROOTS as $apps_dir) {
+            if (!is_readable($apps_dir['path'])) {
+                $this->logger->warning('unable to read app folder : ' . $apps_dir['path'], ['app' => 'core']);
+                continue;
+            }
+            $dh = opendir($apps_dir['path']);
+
+            if (is_resource($dh)) {
+                while (($file = readdir($dh)) !== false) {
+                    if (
+                        $file[0] != '.' &&
+                        is_dir($apps_dir['path'] . '/' . $file) &&
+                        is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')
+                    ) {
+                        $apps[] = $file;
+                    }
+                }
+            }
+        }
+
+        return array_values(array_unique($apps));
+    }
+
+    /**
+     * List all apps enabled for a user
+     *
+     * @param \OCP\IUser $user
+     * @return list<string>
+     */
+    public function getEnabledAppsForUser(IUser $user) {
+        $apps = $this->getEnabledAppsValues();
+        $appsForUser = array_filter($apps, function ($enabled) use ($user) {
+            return $this->checkAppForUser($enabled, $user);
+        });
+        return array_keys($appsForUser);
+    }
+
+    public function getEnabledAppsForGroup(IGroup $group): array {
+        $apps = $this->getEnabledAppsValues();
+        $appsForGroups = array_filter($apps, function ($enabled) use ($group) {
+            return $this->checkAppForGroups($enabled, $group);
+        });
+        return array_keys($appsForGroups);
+    }
+
+    /**
+     * Loads all apps
+     *
+     * @param string[] $types
+     * @return bool
+     *
+     * This function walks through the Nextcloud directory and loads all apps
+     * it can find. A directory contains an app if the file /appinfo/info.xml
+     * exists.
+     *
+     * if $types is set to non-empty array, only apps of those types will be loaded
+     */
+    public function loadApps(array $types = []): bool {
+        if ($this->config->getSystemValueBool('maintenance', false)) {
+            return false;
+        }
+        // Load the enabled apps here
+        $apps = \OC_App::getEnabledApps();
+
+        // Add each apps' folder as allowed class path
+        foreach ($apps as $app) {
+            // If the app is already loaded then autoloading it makes no sense
+            if (!$this->isAppLoaded($app)) {
+                $path = \OC_App::getAppPath($app);
+                if ($path !== false) {
+                    \OC_App::registerAutoloading($app, $path);
+                }
+            }
+        }
+
+        // prevent app loading from printing output
+        ob_start();
+        foreach ($apps as $app) {
+            if (!$this->isAppLoaded($app) && ($types === [] || $this->isType($app, $types))) {
+                try {
+                    $this->loadApp($app);
+                } catch (\Throwable $e) {
+                    $this->logger->emergency('Error during app loading: ' . $e->getMessage(), [
+                        'exception' => $e,
+                        'app' => $app,
+                    ]);
+                }
+            }
+        }
+        ob_end_clean();
+
+        return true;
+    }
+
+    /**
+     * check if an app is of a specific type
+     *
+     * @param string $app
+     * @param array $types
+     * @return bool
+     */
+    public function isType(string $app, array $types): bool {
+        $appTypes = $this->getAppTypes($app);
+        foreach ($types as $type) {
+            if (in_array($type, $appTypes, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * get the types of an app
+     *
+     * @param string $app
+     * @return string[]
+     */
+    private function getAppTypes(string $app): array {
+        //load the cache
+        if (count($this->appTypes) === 0) {
+            $this->appTypes = $this->getAppConfig()->getValues(false, 'types') ?: [];
+        }
+
+        if (isset($this->appTypes[$app])) {
+            return explode(',', $this->appTypes[$app]);
+        }
+
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    public function getAutoDisabledApps(): array {
+        return $this->autoDisabledApps;
+    }
+
+    public function getAppRestriction(string $appId): array {
+        $values = $this->getEnabledAppsValues();
+
+        if (!isset($values[$appId])) {
+            return [];
+        }
+
+        if ($values[$appId] === 'yes' || $values[$appId] === 'no') {
+            return [];
+        }
+        return json_decode($values[$appId], true);
+    }
+
+    /**
+     * Check if an app is enabled for user
+     *
+     * @param string $appId
+     * @param \OCP\IUser|null $user (optional) if not defined, the currently logged in user will be used
+     * @return bool
+     */
+    public function isEnabledForUser($appId, $user = null) {
+        if ($this->isAlwaysEnabled($appId)) {
+            return true;
+        }
+        if ($user === null) {
+            $user = $this->userSession->getUser();
+        }
+        $enabledAppsValues = $this->getEnabledAppsValues();
+        if (isset($enabledAppsValues[$appId])) {
+            return $this->checkAppForUser($enabledAppsValues[$appId], $user);
+        } else {
+            return false;
+        }
+    }
+
+    private function checkAppForUser(string $enabled, ?IUser $user): bool {
+        if ($enabled === 'yes') {
+            return true;
+        } elseif ($user === null) {
+            return false;
+        } else {
+            if (empty($enabled)) {
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $jsonErrorMsg = json_last_error_msg();
+                // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
+                $this->logger->warning('AppManager::checkAppForUser - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
+                return false;
+            }
+
+            $userGroups = $this->groupManager->getUserGroupIds($user);
+            foreach ($userGroups as $groupId) {
+                if (in_array($groupId, $groupIds, true)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    private function checkAppForGroups(string $enabled, IGroup $group): bool {
+        if ($enabled === 'yes') {
+            return true;
+        } else {
+            if (empty($enabled)) {
+                return false;
+            }
+
+            $groupIds = json_decode($enabled);
+
+            if (!is_array($groupIds)) {
+                $jsonError = json_last_error();
+                $jsonErrorMsg = json_last_error_msg();
+                // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason)
+                $this->logger->warning('AppManager::checkAppForGroups - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg);
+                return false;
+            }
+
+            return in_array($group->getGID(), $groupIds);
+        }
+    }
+
+    /**
+     * Check if an app is enabled in the instance
+     *
+     * Notice: This actually checks if the app is enabled and not only if it is installed.
+     *
+     * @param string $appId
+     */
+    public function isInstalled($appId): bool {
+        return $this->isEnabledForAnyone($appId);
+    }
+
+    public function isEnabledForAnyone(string $appId): bool {
+        $enabledAppsValues = $this->getEnabledAppsValues();
+        return isset($enabledAppsValues[$appId]);
+    }
+
+    /**
+     * Overwrite the `max-version` requirement for this app.
+     */
+    public function overwriteNextcloudRequirement(string $appId): void {
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        if (!in_array($appId, $ignoreMaxApps, true)) {
+            $ignoreMaxApps[] = $appId;
+        }
+        $this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+    }
+
+    /**
+     * Remove the `max-version` overwrite for this app.
+     * This means this app now again can not be enabled if the `max-version` is smaller than the current Nextcloud version.
+     */
+    public function removeOverwriteNextcloudRequirement(string $appId): void {
+        $ignoreMaxApps = $this->config->getSystemValue('app_install_overwrite', []);
+        $ignoreMaxApps = array_filter($ignoreMaxApps, fn (string $id) => $id !== $appId);
+        $this->config->setSystemValue('app_install_overwrite', $ignoreMaxApps);
+    }
+
+    public function loadApp(string $app): void {
+        if (isset($this->loadedApps[$app])) {
+            return;
+        }
+        $this->loadedApps[$app] = true;
+        $appPath = \OC_App::getAppPath($app);
+        if ($appPath === false) {
+            return;
+        }
+        $eventLogger = \OC::$server->get(IEventLogger::class);
+        $eventLogger->start("bootstrap:load_app:$app", "Load app: $app");
+
+        // in case someone calls loadApp() directly
+        \OC_App::registerAutoloading($app, $appPath);
+
+        if (is_file($appPath . '/appinfo/app.php')) {
+            $this->logger->error('/appinfo/app.php is not supported anymore, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
+                'app' => $app,
+            ]);
+        }
+
+        $coordinator = \OCP\Server::get(Coordinator::class);
+        $coordinator->bootApp($app);
+
+        $eventLogger->start("bootstrap:load_app:$app:info", "Load info.xml for $app and register any services defined in it");
+        $info = $this->getAppInfo($app);
+        if (!empty($info['activity'])) {
+            $activityManager = \OC::$server->get(IActivityManager::class);
+            if (!empty($info['activity']['filters'])) {
+                foreach ($info['activity']['filters'] as $filter) {
+                    $activityManager->registerFilter($filter);
+                }
+            }
+            if (!empty($info['activity']['settings'])) {
+                foreach ($info['activity']['settings'] as $setting) {
+                    $activityManager->registerSetting($setting);
+                }
+            }
+            if (!empty($info['activity']['providers'])) {
+                foreach ($info['activity']['providers'] as $provider) {
+                    $activityManager->registerProvider($provider);
+                }
+            }
+        }
+
+        if (!empty($info['settings'])) {
+            $settingsManager = \OC::$server->get(ISettingsManager::class);
+            if (!empty($info['settings']['admin'])) {
+                foreach ($info['settings']['admin'] as $setting) {
+                    $settingsManager->registerSetting('admin', $setting);
+                }
+            }
+            if (!empty($info['settings']['admin-section'])) {
+                foreach ($info['settings']['admin-section'] as $section) {
+                    $settingsManager->registerSection('admin', $section);
+                }
+            }
+            if (!empty($info['settings']['personal'])) {
+                foreach ($info['settings']['personal'] as $setting) {
+                    $settingsManager->registerSetting('personal', $setting);
+                }
+            }
+            if (!empty($info['settings']['personal-section'])) {
+                foreach ($info['settings']['personal-section'] as $section) {
+                    $settingsManager->registerSection('personal', $section);
+                }
+            }
+        }
+
+        if (!empty($info['collaboration']['plugins'])) {
+            // deal with one or many plugin entries
+            $plugins = isset($info['collaboration']['plugins']['plugin']['@value']) ?
+                [$info['collaboration']['plugins']['plugin']] : $info['collaboration']['plugins']['plugin'];
+            $collaboratorSearch = null;
+            $autoCompleteManager = null;
+            foreach ($plugins as $plugin) {
+                if ($plugin['@attributes']['type'] === 'collaborator-search') {
+                    $pluginInfo = [
+                        'shareType' => $plugin['@attributes']['share-type'],
+                        'class' => $plugin['@value'],
+                    ];
+                    $collaboratorSearch ??= \OC::$server->get(ICollaboratorSearch::class);
+                    $collaboratorSearch->registerPlugin($pluginInfo);
+                } elseif ($plugin['@attributes']['type'] === 'autocomplete-sort') {
+                    $autoCompleteManager ??= \OC::$server->get(IAutoCompleteManager::class);
+                    $autoCompleteManager->registerSorter($plugin['@value']);
+                }
+            }
+        }
+        $eventLogger->end("bootstrap:load_app:$app:info");
+
+        $eventLogger->end("bootstrap:load_app:$app");
+    }
+
+    /**
+     * Check if an app is loaded
+     * @param string $app app id
+     * @since 26.0.0
+     */
+    public function isAppLoaded(string $app): bool {
+        return isset($this->loadedApps[$app]);
+    }
+
+    /**
+     * Enable an app for every user
+     *
+     * @param string $appId
+     * @param bool $forceEnable
+     * @throws AppPathNotFoundException
+     * @throws \InvalidArgumentException if the application is not installed yet
+     */
+    public function enableApp(string $appId, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
+            throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
+        }
+
+        if ($forceEnable) {
+            $this->overwriteNextcloudRequirement($appId);
+        }
+
+        $this->enabledAppsCache[$appId] = 'yes';
+        $this->getAppConfig()->setValue($appId, 'enabled', 'yes');
+        $this->dispatcher->dispatchTyped(new AppEnableEvent($appId));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE, $appId
+        ));
+        $this->clearAppsCache();
+    }
+
+    /**
+     * Whether a list of types contains a protected app type
+     *
+     * @param string[] $types
+     * @return bool
+     */
+    public function hasProtectedAppType($types) {
+        if (empty($types)) {
+            return false;
+        }
+
+        $protectedTypes = array_intersect($this->protectedAppTypes, $types);
+        return !empty($protectedTypes);
+    }
+
+    /**
+     * Enable an app only for specific groups
+     *
+     * @param string $appId
+     * @param IGroup[] $groups
+     * @param bool $forceEnable
+     * @throws \InvalidArgumentException if app can't be enabled for groups
+     * @throws AppPathNotFoundException
+     */
+    public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void {
+        // Check if app exists
+        $this->getAppPath($appId);
+
+        $info = $this->getAppInfo($appId);
+        if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
+            throw new \InvalidArgumentException("$appId can't be enabled for groups.");
+        }
+
+        if ($this->config->getAppValue($appId, 'installed_version', '') === '') {
+            throw new \InvalidArgumentException("$appId is not installed, cannot be enabled.");
+        }
+
+        if ($forceEnable) {
+            $this->overwriteNextcloudRequirement($appId);
+        }
+
+        /** @var string[] $groupIds */
+        $groupIds = array_map(function ($group) {
+            /** @var IGroup $group */
+            return ($group instanceof IGroup)
+                ? $group->getGID()
+                : $group;
+        }, $groups);
+
+        $this->enabledAppsCache[$appId] = json_encode($groupIds);
+        $this->getAppConfig()->setValue($appId, 'enabled', json_encode($groupIds));
+        $this->dispatcher->dispatchTyped(new AppEnableEvent($appId, $groupIds));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, new ManagerEvent(
+            ManagerEvent::EVENT_APP_ENABLE_FOR_GROUPS, $appId, $groups
+        ));
+        $this->clearAppsCache();
+    }
+
+    /**
+     * Disable an app for every user
+     *
+     * @param string $appId
+     * @param bool $automaticDisabled
+     * @throws \Exception if app can't be disabled
+     */
+    public function disableApp($appId, $automaticDisabled = false): void {
+        if ($this->isAlwaysEnabled($appId)) {
+            throw new \Exception("$appId can't be disabled.");
+        }
+
+        if ($automaticDisabled) {
+            $previousSetting = $this->getAppConfig()->getValue($appId, 'enabled', 'yes');
+            if ($previousSetting !== 'yes' && $previousSetting !== 'no') {
+                $previousSetting = json_decode($previousSetting, true);
+            }
+            $this->autoDisabledApps[$appId] = $previousSetting;
+        }
+
+        unset($this->enabledAppsCache[$appId]);
+        $this->getAppConfig()->setValue($appId, 'enabled', 'no');
+
+        // run uninstall steps
+        $appData = $this->getAppInfo($appId);
+        if (!is_null($appData)) {
+            \OC_App::executeRepairSteps($appId, $appData['repair-steps']['uninstall']);
+        }
+
+        $this->dispatcher->dispatchTyped(new AppDisableEvent($appId));
+        $this->dispatcher->dispatch(ManagerEvent::EVENT_APP_DISABLE, new ManagerEvent(
+            ManagerEvent::EVENT_APP_DISABLE, $appId
+        ));
+        $this->clearAppsCache();
+    }
+
+    /**
+     * Get the directory for the given app.
+     *
+     * @throws AppPathNotFoundException if app folder can't be found
+     */
+    public function getAppPath(string $appId): string {
+        $appPath = \OC_App::getAppPath($appId);
+        if ($appPath === false) {
+            throw new AppPathNotFoundException('Could not find path for ' . $appId);
+        }
+        return $appPath;
+    }
+
+    /**
+     * Get the web path for the given app.
+     *
+     * @param string $appId
+     * @return string
+     * @throws AppPathNotFoundException if app path can't be found
+     */
+    public function getAppWebPath(string $appId): string {
+        $appWebPath = \OC_App::getAppWebPath($appId);
+        if ($appWebPath === false) {
+            throw new AppPathNotFoundException('Could not find web path for ' . $appId);
+        }
+        return $appWebPath;
+    }
+
+    /**
+     * Clear the cached list of apps when enabling/disabling an app
+     */
+    public function clearAppsCache(): void {
+        $this->appInfos = [];
+    }
+
+    /**
+     * Returns a list of apps that need upgrade
+     *
+     * @param string $version Nextcloud version as array of version components
+     * @return array list of app info from apps that need an upgrade
+     *
+     * @internal
+     */
+    public function getAppsNeedingUpgrade($version) {
+        $appsToUpgrade = [];
+        $apps = $this->getEnabledApps();
+        foreach ($apps as $appId) {
+            $appInfo = $this->getAppInfo($appId);
+            $appDbVersion = $this->getAppConfig()->getValue($appId, 'installed_version');
+            if ($appDbVersion
+                && isset($appInfo['version'])
+                && version_compare($appInfo['version'], $appDbVersion, '>')
+                && \OC_App::isAppCompatible($version, $appInfo)
+            ) {
+                $appsToUpgrade[] = $appInfo;
+            }
+        }
+
+        return $appsToUpgrade;
+    }
+
+    /**
+     * Returns the app information from "appinfo/info.xml".
+     *
+     * @param string|null $lang
+     * @return array|null app info
+     */
+    public function getAppInfo(string $appId, bool $path = false, $lang = null) {
+        if ($path) {
+            throw new \InvalidArgumentException('Calling IAppManager::getAppInfo() with a path is no longer supported. Please call IAppManager::getAppInfoByPath() instead and verify that the path is good before calling.');
+        }
+        if ($lang === null && isset($this->appInfos[$appId])) {
+            return $this->appInfos[$appId];
+        }
+        try {
+            $appPath = $this->getAppPath($appId);
+        } catch (AppPathNotFoundException) {
+            return null;
+        }
+        $file = $appPath . '/appinfo/info.xml';
+
+        $data = $this->getAppInfoByPath($file, $lang);
+
+        if ($lang === null) {
+            $this->appInfos[$appId] = $data;
+        }
+
+        return $data;
+    }
+
+    public function getAppInfoByPath(string $path, ?string $lang = null): ?array {
+        if (!str_ends_with($path, '/appinfo/info.xml')) {
+            return null;
+        }
+
+        $parser = new InfoParser($this->memCacheFactory->createLocal('core.appinfo'));
+        $data = $parser->parse($path);
+
+        if (is_array($data)) {
+            $data = \OC_App::parseAppInfo($data, $lang);
+        }
+
+        return $data;
+    }
+
+    public function getAppVersion(string $appId, bool $useCache = true): string {
+        if (!$useCache || !isset($this->appVersions[$appId])) {
+            if ($appId === 'core') {
+                $this->appVersions[$appId] = $this->serverVersion->getVersionString();
+            } else {
+                $appInfo = $this->getAppInfo($appId);
+                $this->appVersions[$appId] = ($appInfo !== null && isset($appInfo['version'])) ? $appInfo['version'] : '0';
+            }
+        }
+        return $this->appVersions[$appId];
+    }
+
+    /**
+     * Returns the installed versions of all apps
+     *
+     * @return array<string, string>
+     */
+    public function getAppInstalledVersions(bool $onlyEnabled = false): array {
+        return $this->getAppConfig()->getAppInstalledVersions($onlyEnabled);
+    }
+
+    /**
+     * Returns a list of apps incompatible with the given version
+     *
+     * @param string $version Nextcloud version as array of version components
+     *
+     * @return array list of app info from incompatible apps
+     *
+     * @internal
+     */
+    public function getIncompatibleApps(string $version): array {
+        $apps = $this->getEnabledApps();
+        $incompatibleApps = [];
+        foreach ($apps as $appId) {
+            $info = $this->getAppInfo($appId);
+            if ($info === null) {
+                $incompatibleApps[] = ['id' => $appId, 'name' => $appId];
+            } elseif (!\OC_App::isAppCompatible($version, $info)) {
+                $incompatibleApps[] = $info;
+            }
+        }
+        return $incompatibleApps;
+    }
+
+    /**
+     * @inheritdoc
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::isShipped()
+     */
+    public function isShipped($appId) {
+        $this->loadShippedJson();
+        return in_array($appId, $this->shippedApps, true);
+    }
+
+    private function isAlwaysEnabled(string $appId): bool {
+        if ($appId === 'core') {
+            return true;
+        }
+
+        $alwaysEnabled = $this->getAlwaysEnabledApps();
+        return in_array($appId, $alwaysEnabled, true);
+    }
+
+    /**
+     * In case you change this method, also change \OC\App\CodeChecker\InfoChecker::loadShippedJson()
+     * @throws \Exception
+     */
+    private function loadShippedJson(): void {
+        if ($this->shippedApps === null) {
+            $shippedJson = \OC::$SERVERROOT . '/core/shipped.json';
+            if (!file_exists($shippedJson)) {
+                throw new \Exception("File not found: $shippedJson");
+            }
+            $content = json_decode(file_get_contents($shippedJson), true);
+            $this->shippedApps = $content['shippedApps'];
+            $this->alwaysEnabled = $content['alwaysEnabled'];
+            $this->defaultEnabled = $content['defaultEnabled'];
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAlwaysEnabledApps() {
+        $this->loadShippedJson();
+        return $this->alwaysEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isDefaultEnabled(string $appId): bool {
+        return (in_array($appId, $this->getDefaultEnabledApps()));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultEnabledApps(): array {
+        $this->loadShippedJson();
+
+        return $this->defaultEnabled;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string {
+        $id = $this->getNavigationManager()->getDefaultEntryIdForUser($user, $withFallbacks);
+        $entry = $this->getNavigationManager()->get($id);
+        return (string)$entry['app'];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDefaultApps(): array {
+        $ids = $this->getNavigationManager()->getDefaultEntryIds();
+
+        return array_values(array_unique(array_map(function (string $id) {
+            $entry = $this->getNavigationManager()->get($id);
+            return (string)$entry['app'];
+        }, $ids)));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setDefaultApps(array $defaultApps): void {
+        $entries = $this->getNavigationManager()->getAll();
+        $ids = [];
+        foreach ($defaultApps as $defaultApp) {
+            foreach ($entries as $entry) {
+                if ((string)$entry['app'] === $defaultApp) {
+                    $ids[] = (string)$entry['id'];
+                    break;
+                }
+            }
+        }
+        $this->getNavigationManager()->setDefaultEntryIds($ids);
+    }
+
+    public function isBackendRequired(string $backend): bool {
+        foreach ($this->appInfos as $appInfo) {
+            foreach ($appInfo['dependencies']['backend'] as $appBackend) {
+                if ($backend === $appBackend) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Clean the appId from forbidden characters
+     *
+     * @psalm-taint-escape callable
+     * @psalm-taint-escape cookie
+     * @psalm-taint-escape file
+     * @psalm-taint-escape has_quotes
+     * @psalm-taint-escape header
+     * @psalm-taint-escape html
+     * @psalm-taint-escape include
+     * @psalm-taint-escape ldap
+     * @psalm-taint-escape shell
+     * @psalm-taint-escape sql
+     * @psalm-taint-escape unserialize
+     */
+    public function cleanAppId(string $app): string {
+        /* Only lowercase alphanumeric is allowed */
+        return preg_replace('/(^[0-9_]|[^a-z0-9_]+|_$)/', '', $app);
+    }
 }

lib/public/App/IAppManager.php

Indentation +321 added lines, -321 removed lines

@@ -19,325 +19,325 @@
  * @since 8.0.0
  */
 interface IAppManager {
-	/**
-	 * @since 30.0.0
-	 */
-	public const BACKEND_CALDAV = 'caldav';
-
-	/**
-	 * Returns the app information from "appinfo/info.xml" for an app
-	 *
-	 * @param string|null $lang
-	 * @return array|null
-	 * @since 14.0.0
-	 * @since 31.0.0 Usage of $path is discontinued and throws an \InvalidArgumentException, use {@see self::getAppInfoByPath} instead.
-	 */
-	public function getAppInfo(string $appId, bool $path = false, $lang = null);
-
-	/**
-	 * Returns the app information from a given path ending with "/appinfo/info.xml"
-	 *
-	 * @since 31.0.0
-	 */
-	public function getAppInfoByPath(string $path, ?string $lang = null): ?array;
-
-	/**
-	 * Returns the app information from "appinfo/info.xml".
-	 *
-	 * @param string $appId
-	 * @param bool $useCache
-	 * @return string
-	 * @since 14.0.0
-	 */
-	public function getAppVersion(string $appId, bool $useCache = true): string;
-
-	/**
-	 * Returns the installed version of all apps
-	 *
-	 * @return array<string, string>
-	 * @since 32.0.0
-	 */
-	public function getAppInstalledVersions(bool $onlyEnabled = false): array;
-
-	/**
-	 * Returns the app icon or null if none is found
-	 *
-	 * @param string $appId
-	 * @param bool $dark Enable to request a dark icon variant, default is a white icon
-	 * @return string|null
-	 * @since 29.0.0
-	 */
-	public function getAppIcon(string $appId, bool $dark = false): ?string;
-
-	/**
-	 * Check if an app is enabled for user
-	 *
-	 * @param string $appId
-	 * @param \OCP\IUser|null $user (optional) if not defined, the currently loggedin user will be used
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isEnabledForUser($appId, $user = null);
-
-	/**
-	 * Check if an app is enabled in the instance
-	 *
-	 * Notice: This actually checks if the app is enabled and not only if it is installed.
-	 *
-	 * @param string $appId
-	 * @return bool
-	 * @since 8.0.0
-	 * @deprecated 32.0.0 Use either {@see self::isEnabledForUser} or {@see self::isEnabledForAnyone}
-	 */
-	public function isInstalled($appId);
-
-	/**
-	 * Check if an app is enabled in the instance, either for everyone or for specific groups
-	 *
-	 * @since 32.0.0
-	 */
-	public function isEnabledForAnyone(string $appId): bool;
-
-	/**
-	 * Check if an app should be enabled by default
-	 *
-	 * Notice: This actually checks if the app should be enabled by default
-	 * and not if currently installed/enabled
-	 *
-	 * @param string $appId ID of the app
-	 * @since 25.0.0
-	 */
-	public function isDefaultEnabled(string $appId):bool;
-
-	/**
-	 * Load an app, if not already loaded
-	 * @param string $app app id
-	 * @since 27.0.0
-	 */
-	public function loadApp(string $app): void;
-
-	/**
-	 * Check if an app is loaded
-	 * @param string $app app id
-	 * @since 27.0.0
-	 */
-	public function isAppLoaded(string $app): bool;
-
-	/**
-	 * Enable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $forceEnable
-	 * @throws AppPathNotFoundException
-	 * @since 8.0.0
-	 */
-	public function enableApp(string $appId, bool $forceEnable = false): void;
-
-	/**
-	 * Whether a list of types contains a protected app type
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 * @since 12.0.0
-	 */
-	public function hasProtectedAppType($types);
-
-	/**
-	 * Enable an app only for specific groups
-	 *
-	 * @param string $appId
-	 * @param \OCP\IGroup[] $groups
-	 * @param bool $forceEnable
-	 * @throws \Exception
-	 * @since 8.0.0
-	 */
-	public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void;
-
-	/**
-	 * Disable an app for every user
-	 *
-	 * @param string $appId
-	 * @param bool $automaticDisabled
-	 * @since 8.0.0
-	 */
-	public function disableApp($appId, $automaticDisabled = false): void;
-
-	/**
-	 * Get the directory for the given app.
-	 *
-	 * @since 11.0.0
-	 * @throws AppPathNotFoundException
-	 */
-	public function getAppPath(string $appId): string;
-
-	/**
-	 * Get the web path for the given app.
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @since 18.0.0
-	 * @throws AppPathNotFoundException
-	 */
-	public function getAppWebPath(string $appId): string;
-
-	/**
-	 * List all apps enabled for a user
-	 *
-	 * @param \OCP\IUser $user
-	 * @return list<string>
-	 * @since 8.1.0
-	 */
-	public function getEnabledAppsForUser(IUser $user);
-
-	/**
-	 * List all installed apps
-	 *
-	 * @return string[]
-	 * @since 8.1.0
-	 * @deprecated 32.0.0 Use either {@see self::getEnabledApps} or {@see self::getEnabledAppsForUser}
-	 */
-	public function getInstalledApps();
-
-	/**
-	 * List all apps enabled, either for everyone or for specific groups only
-	 *
-	 * @return list<string>
-	 * @since 32.0.0
-	 */
-	public function getEnabledApps(): array;
-
-	/**
-	 * Clear the cached list of apps when enabling/disabling an app
-	 * @since 8.1.0
-	 */
-	public function clearAppsCache(): void;
-
-	/**
-	 * @param string $appId
-	 * @return boolean
-	 * @since 9.0.0
-	 */
-	public function isShipped($appId);
-
-	/**
-	 * Loads all apps
-	 *
-	 * @param string[] $types
-	 * @return bool
-	 *
-	 * This function walks through the Nextcloud directory and loads all apps
-	 * it can find. A directory contains an app if the file `/appinfo/info.xml`
-	 * exists.
-	 *
-	 * if $types is set to non-empty array, only apps of those types will be loaded
-	 * @since 27.0.0
-	 */
-	public function loadApps(array $types = []): bool;
-
-	/**
-	 * Check if an app is of a specific type
-	 * @since 27.0.0
-	 */
-	public function isType(string $app, array $types): bool;
-
-	/**
-	 * @return string[]
-	 * @since 9.0.0
-	 */
-	public function getAlwaysEnabledApps();
-
-	/**
-	 * @return string[] app IDs
-	 * @since 25.0.0
-	 */
-	public function getDefaultEnabledApps(): array;
-
-	/**
-	 * @param \OCP\IGroup $group
-	 * @return String[]
-	 * @since 17.0.0
-	 */
-	public function getEnabledAppsForGroup(IGroup $group): array;
-
-	/**
-	 * @param String $appId
-	 * @return string[]
-	 * @since 17.0.0
-	 */
-	public function getAppRestriction(string $appId): array;
-
-	/**
-	 * Returns the id of the user's default app
-	 *
-	 * If `user` is not passed, the currently logged in user will be used
-	 *
-	 * @param ?IUser $user User to query default app for
-	 * @param bool $withFallbacks Include fallback values if no default app was configured manually
-	 *                            Before falling back to predefined default apps,
-	 *                            the user defined app order is considered and the first app would be used as the fallback.
-	 *
-	 * @since 25.0.6
-	 * @since 28.0.0 Added optional $withFallbacks parameter
-	 * @deprecated 31.0.0
-	 * Use @see \OCP\INavigationManager::getDefaultEntryIdForUser() instead
-	 */
-	public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string;
-
-	/**
-	 * Get the global default apps with fallbacks
-	 *
-	 * @return string[] The default applications
-	 * @since 28.0.0
-	 * @deprecated 31.0.0
-	 * Use @see \OCP\INavigationManager::getDefaultEntryIds() instead
-	 */
-	public function getDefaultApps(): array;
-
-	/**
-	 * Set the global default apps with fallbacks
-	 *
-	 * @param string[] $defaultApps
-	 * @throws \InvalidArgumentException If any of the apps is not installed
-	 * @since 28.0.0
-	 * @deprecated 31.0.0
-	 * Use @see \OCP\INavigationManager::setDefaultEntryIds() instead
-	 */
-	public function setDefaultApps(array $defaultApps): void;
-
-	/**
-	 * Check whether the given backend is required by at least one app.
-	 *
-	 * @param self::BACKEND_* $backend Name of the backend, one of `self::BACKEND_*`
-	 * @return bool True if at least one app requires the backend
-	 *
-	 * @since 30.0.0
-	 */
-	public function isBackendRequired(string $backend): bool;
-
-	/**
-	 * Clean the appId from forbidden characters
-	 *
-	 * @psalm-taint-escape callable
-	 * @psalm-taint-escape cookie
-	 * @psalm-taint-escape file
-	 * @psalm-taint-escape has_quotes
-	 * @psalm-taint-escape header
-	 * @psalm-taint-escape html
-	 * @psalm-taint-escape include
-	 * @psalm-taint-escape ldap
-	 * @psalm-taint-escape shell
-	 * @psalm-taint-escape sql
-	 * @psalm-taint-escape unserialize
-	 *
-	 * @since 31.0.0
-	 */
-	public function cleanAppId(string $app): string;
-
-	/**
-	 * Get a list of all apps in the apps folder
-	 *
-	 * @return list<string> an array of app names (string IDs)
-	 * @since 31.0.0
-	 */
-	public function getAllAppsInAppsFolders(): array;
+    /**
+     * @since 30.0.0
+     */
+    public const BACKEND_CALDAV = 'caldav';
+
+    /**
+     * Returns the app information from "appinfo/info.xml" for an app
+     *
+     * @param string|null $lang
+     * @return array|null
+     * @since 14.0.0
+     * @since 31.0.0 Usage of $path is discontinued and throws an \InvalidArgumentException, use {@see self::getAppInfoByPath} instead.
+     */
+    public function getAppInfo(string $appId, bool $path = false, $lang = null);
+
+    /**
+     * Returns the app information from a given path ending with "/appinfo/info.xml"
+     *
+     * @since 31.0.0
+     */
+    public function getAppInfoByPath(string $path, ?string $lang = null): ?array;
+
+    /**
+     * Returns the app information from "appinfo/info.xml".
+     *
+     * @param string $appId
+     * @param bool $useCache
+     * @return string
+     * @since 14.0.0
+     */
+    public function getAppVersion(string $appId, bool $useCache = true): string;
+
+    /**
+     * Returns the installed version of all apps
+     *
+     * @return array<string, string>
+     * @since 32.0.0
+     */
+    public function getAppInstalledVersions(bool $onlyEnabled = false): array;
+
+    /**
+     * Returns the app icon or null if none is found
+     *
+     * @param string $appId
+     * @param bool $dark Enable to request a dark icon variant, default is a white icon
+     * @return string|null
+     * @since 29.0.0
+     */
+    public function getAppIcon(string $appId, bool $dark = false): ?string;
+
+    /**
+     * Check if an app is enabled for user
+     *
+     * @param string $appId
+     * @param \OCP\IUser|null $user (optional) if not defined, the currently loggedin user will be used
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isEnabledForUser($appId, $user = null);
+
+    /**
+     * Check if an app is enabled in the instance
+     *
+     * Notice: This actually checks if the app is enabled and not only if it is installed.
+     *
+     * @param string $appId
+     * @return bool
+     * @since 8.0.0
+     * @deprecated 32.0.0 Use either {@see self::isEnabledForUser} or {@see self::isEnabledForAnyone}
+     */
+    public function isInstalled($appId);
+
+    /**
+     * Check if an app is enabled in the instance, either for everyone or for specific groups
+     *
+     * @since 32.0.0
+     */
+    public function isEnabledForAnyone(string $appId): bool;
+
+    /**
+     * Check if an app should be enabled by default
+     *
+     * Notice: This actually checks if the app should be enabled by default
+     * and not if currently installed/enabled
+     *
+     * @param string $appId ID of the app
+     * @since 25.0.0
+     */
+    public function isDefaultEnabled(string $appId):bool;
+
+    /**
+     * Load an app, if not already loaded
+     * @param string $app app id
+     * @since 27.0.0
+     */
+    public function loadApp(string $app): void;
+
+    /**
+     * Check if an app is loaded
+     * @param string $app app id
+     * @since 27.0.0
+     */
+    public function isAppLoaded(string $app): bool;
+
+    /**
+     * Enable an app for every user
+     *
+     * @param string $appId
+     * @param bool $forceEnable
+     * @throws AppPathNotFoundException
+     * @since 8.0.0
+     */
+    public function enableApp(string $appId, bool $forceEnable = false): void;
+
+    /**
+     * Whether a list of types contains a protected app type
+     *
+     * @param string[] $types
+     * @return bool
+     * @since 12.0.0
+     */
+    public function hasProtectedAppType($types);
+
+    /**
+     * Enable an app only for specific groups
+     *
+     * @param string $appId
+     * @param \OCP\IGroup[] $groups
+     * @param bool $forceEnable
+     * @throws \Exception
+     * @since 8.0.0
+     */
+    public function enableAppForGroups(string $appId, array $groups, bool $forceEnable = false): void;
+
+    /**
+     * Disable an app for every user
+     *
+     * @param string $appId
+     * @param bool $automaticDisabled
+     * @since 8.0.0
+     */
+    public function disableApp($appId, $automaticDisabled = false): void;
+
+    /**
+     * Get the directory for the given app.
+     *
+     * @since 11.0.0
+     * @throws AppPathNotFoundException
+     */
+    public function getAppPath(string $appId): string;
+
+    /**
+     * Get the web path for the given app.
+     *
+     * @param string $appId
+     * @return string
+     * @since 18.0.0
+     * @throws AppPathNotFoundException
+     */
+    public function getAppWebPath(string $appId): string;
+
+    /**
+     * List all apps enabled for a user
+     *
+     * @param \OCP\IUser $user
+     * @return list<string>
+     * @since 8.1.0
+     */
+    public function getEnabledAppsForUser(IUser $user);
+
+    /**
+     * List all installed apps
+     *
+     * @return string[]
+     * @since 8.1.0
+     * @deprecated 32.0.0 Use either {@see self::getEnabledApps} or {@see self::getEnabledAppsForUser}
+     */
+    public function getInstalledApps();
+
+    /**
+     * List all apps enabled, either for everyone or for specific groups only
+     *
+     * @return list<string>
+     * @since 32.0.0
+     */
+    public function getEnabledApps(): array;
+
+    /**
+     * Clear the cached list of apps when enabling/disabling an app
+     * @since 8.1.0
+     */
+    public function clearAppsCache(): void;
+
+    /**
+     * @param string $appId
+     * @return boolean
+     * @since 9.0.0
+     */
+    public function isShipped($appId);
+
+    /**
+     * Loads all apps
+     *
+     * @param string[] $types
+     * @return bool
+     *
+     * This function walks through the Nextcloud directory and loads all apps
+     * it can find. A directory contains an app if the file `/appinfo/info.xml`
+     * exists.
+     *
+     * if $types is set to non-empty array, only apps of those types will be loaded
+     * @since 27.0.0
+     */
+    public function loadApps(array $types = []): bool;
+
+    /**
+     * Check if an app is of a specific type
+     * @since 27.0.0
+     */
+    public function isType(string $app, array $types): bool;
+
+    /**
+     * @return string[]
+     * @since 9.0.0
+     */
+    public function getAlwaysEnabledApps();
+
+    /**
+     * @return string[] app IDs
+     * @since 25.0.0
+     */
+    public function getDefaultEnabledApps(): array;
+
+    /**
+     * @param \OCP\IGroup $group
+     * @return String[]
+     * @since 17.0.0
+     */
+    public function getEnabledAppsForGroup(IGroup $group): array;
+
+    /**
+     * @param String $appId
+     * @return string[]
+     * @since 17.0.0
+     */
+    public function getAppRestriction(string $appId): array;
+
+    /**
+     * Returns the id of the user's default app
+     *
+     * If `user` is not passed, the currently logged in user will be used
+     *
+     * @param ?IUser $user User to query default app for
+     * @param bool $withFallbacks Include fallback values if no default app was configured manually
+     *                            Before falling back to predefined default apps,
+     *                            the user defined app order is considered and the first app would be used as the fallback.
+     *
+     * @since 25.0.6
+     * @since 28.0.0 Added optional $withFallbacks parameter
+     * @deprecated 31.0.0
+     * Use @see \OCP\INavigationManager::getDefaultEntryIdForUser() instead
+     */
+    public function getDefaultAppForUser(?IUser $user = null, bool $withFallbacks = true): string;
+
+    /**
+     * Get the global default apps with fallbacks
+     *
+     * @return string[] The default applications
+     * @since 28.0.0
+     * @deprecated 31.0.0
+     * Use @see \OCP\INavigationManager::getDefaultEntryIds() instead
+     */
+    public function getDefaultApps(): array;
+
+    /**
+     * Set the global default apps with fallbacks
+     *
+     * @param string[] $defaultApps
+     * @throws \InvalidArgumentException If any of the apps is not installed
+     * @since 28.0.0
+     * @deprecated 31.0.0
+     * Use @see \OCP\INavigationManager::setDefaultEntryIds() instead
+     */
+    public function setDefaultApps(array $defaultApps): void;
+
+    /**
+     * Check whether the given backend is required by at least one app.
+     *
+     * @param self::BACKEND_* $backend Name of the backend, one of `self::BACKEND_*`
+     * @return bool True if at least one app requires the backend
+     *
+     * @since 30.0.0
+     */
+    public function isBackendRequired(string $backend): bool;
+
+    /**
+     * Clean the appId from forbidden characters
+     *
+     * @psalm-taint-escape callable
+     * @psalm-taint-escape cookie
+     * @psalm-taint-escape file
+     * @psalm-taint-escape has_quotes
+     * @psalm-taint-escape header
+     * @psalm-taint-escape html
+     * @psalm-taint-escape include
+     * @psalm-taint-escape ldap
+     * @psalm-taint-escape shell
+     * @psalm-taint-escape sql
+     * @psalm-taint-escape unserialize
+     *
+     * @since 31.0.0
+     */
+    public function cleanAppId(string $app): string;
+
+    /**
+     * Get a list of all apps in the apps folder
+     *
+     * @return list<string> an array of app names (string IDs)
+     * @since 31.0.0
+     */
+    public function getAllAppsInAppsFolders(): array;
 }