nextcloud / server

tests/lib/Accounts/AccountTest.php

Indentation +132 added lines, -132 removed lines

@@ -20,136 +20,136 @@
  * @package Test\Accounts
  */
 class AccountTest extends TestCase {
-	public function testConstructor(): void {
-		$user = $this->createMock(IUser::class);
-		$account = new Account($user);
-		$this->assertEquals($user, $account->getUser());
-	}
-
-	public function testSetProperty(): void {
-		$user = $this->createMock(IUser::class);
-		$property = new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, '');
-		$account = new Account($user);
-		$account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
-		$this->assertEquals($property, $account->getProperty(IAccountManager::PROPERTY_WEBSITE));
-	}
-
-	public function testGetAndGetAllProperties(): void {
-		$user = $this->createMock(IUser::class);
-		$properties = [
-			IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, '')
-		];
-		$account = new Account($user);
-		$account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
-		$account->setProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
-
-		$col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-		$additionalProperty = new AccountProperty($col->getName(), 'second@example.org', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, '');
-		$col->addProperty($additionalProperty);
-		$account->setPropertyCollection($col);
-
-		$this->assertEquals($properties, $account->getProperties());
-		$properties[] = $additionalProperty;
-		$this->assertEquals(array_values($properties), \iterator_to_array($account->getAllProperties()));
-	}
-
-	public function testSetAllPropertiesFromJson(): void {
-		$user = $this->createMock(IUser::class);
-		$properties = [
-			IAccountManager::PROPERTY_DISPLAYNAME => new AccountProperty(IAccountManager::PROPERTY_DISPLAYNAME, 'Steve', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_ADDRESS => new AccountProperty(IAccountManager::PROPERTY_ADDRESS, '123 Acorn Avenue', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://www.example.org', IAccountManager::SCOPE_FEDERATED, IAccountManager::VERIFIED, ''),
-			IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'steve@earth.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
-			IAccountManager::PROPERTY_AVATAR => new AccountProperty(IAccountManager::PROPERTY_AVATAR, '', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_PHONE => new AccountProperty(IAccountManager::PROPERTY_PHONE, '+358407991028', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_TWITTER => new AccountProperty(IAccountManager::PROPERTY_TWITTER, 'therealsteve', IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_BLUESKY => new AccountProperty(IAccountManager::PROPERTY_BLUESKY, 'therealsteve.bsky.social', IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_ORGANISATION => new AccountProperty(IAccountManager::PROPERTY_ORGANISATION, 'Steve Incorporated', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_ROLE => new AccountProperty(IAccountManager::PROPERTY_ROLE, 'Founder', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_HEADLINE => new AccountProperty(IAccountManager::PROPERTY_HEADLINE, 'I am Steve', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_BIOGRAPHY => new AccountProperty(IAccountManager::PROPERTY_BIOGRAPHY, 'Steve is the best', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_PROFILE_ENABLED => new AccountProperty(IAccountManager::PROPERTY_PROFILE_ENABLED, '1', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::COLLECTION_EMAIL => [
-				new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'steve@mars.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
-				new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'steve@neptune.com', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
-			],
-		];
-		$account = new Account($user);
-		$account->setAllPropertiesFromJson(json_decode(json_encode($properties), true));
-		$this->assertEquals($properties, $account->jsonSerialize());
-	}
-
-	public function testGetFilteredProperties(): void {
-		$user = $this->createMock(IUser::class);
-		$properties = [
-			IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, ''),
-			IAccountManager::PROPERTY_PHONE => new AccountProperty(IAccountManager::PROPERTY_PHONE, '123456', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
-		];
-		$account = new Account($user);
-		$account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
-		$account->setProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
-		$account->setProperty(IAccountManager::PROPERTY_PHONE, '123456', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED);
-
-		$col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-		$additionalProperty1 = new AccountProperty($col->getName(), 'second@example.org', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, '');
-		$additionalProperty2 = new AccountProperty($col->getName(), 'third@example.org', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, '');
-		$col->addProperty($additionalProperty1);
-		$col->addProperty($additionalProperty2);
-		$account->setPropertyCollection($col);
-
-
-		$this->assertEquals(
-			[
-				IAccountManager::PROPERTY_WEBSITE => $properties[IAccountManager::PROPERTY_WEBSITE],
-				IAccountManager::PROPERTY_PHONE => $properties[IAccountManager::PROPERTY_PHONE],
-				IAccountManager::COLLECTION_EMAIL . '#0' => $additionalProperty1,
-				IAccountManager::COLLECTION_EMAIL . '#1' => $additionalProperty2,
-			],
-			$account->getFilteredProperties(IAccountManager::SCOPE_PUBLISHED)
-		);
-		$this->assertEquals(
-			[
-				IAccountManager::PROPERTY_EMAIL => $properties[IAccountManager::PROPERTY_EMAIL],
-				IAccountManager::PROPERTY_PHONE => $properties[IAccountManager::PROPERTY_PHONE],
-				IAccountManager::COLLECTION_EMAIL . '#0' => $additionalProperty2,
-			],
-			$account->getFilteredProperties(null, IAccountManager::VERIFIED)
-		);
-		$this->assertEquals(
-			[
-				IAccountManager::PROPERTY_PHONE => $properties[IAccountManager::PROPERTY_PHONE],
-				IAccountManager::COLLECTION_EMAIL . '#0' => $additionalProperty2,
-			],
-			$account->getFilteredProperties(IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED),
-		);
-	}
-
-	public function testJsonSerialize(): void {
-		$user = $this->createMock(IUser::class);
-		$properties = [
-			IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
-			IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, ''),
-			IAccountManager::COLLECTION_EMAIL => [
-				new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'apple@orange.com', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
-				new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'banana@orange.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
-				new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'kiwi@watermelon.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
-			],
-		];
-
-		$account = new Account($user);
-		$account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
-		$account->setProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
-
-		$col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-		$col->setProperties([
-			new AccountProperty($col->getName(), 'apple@orange.com', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
-			new AccountProperty($col->getName(), 'banana@orange.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
-			new AccountProperty($col->getName(), 'kiwi@watermelon.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
-		]);
-		$account->setPropertyCollection($col);
-
-		$this->assertEquals($properties, $account->jsonSerialize());
-	}
+    public function testConstructor(): void {
+        $user = $this->createMock(IUser::class);
+        $account = new Account($user);
+        $this->assertEquals($user, $account->getUser());
+    }
+
+    public function testSetProperty(): void {
+        $user = $this->createMock(IUser::class);
+        $property = new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, '');
+        $account = new Account($user);
+        $account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
+        $this->assertEquals($property, $account->getProperty(IAccountManager::PROPERTY_WEBSITE));
+    }
+
+    public function testGetAndGetAllProperties(): void {
+        $user = $this->createMock(IUser::class);
+        $properties = [
+            IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, '')
+        ];
+        $account = new Account($user);
+        $account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
+        $account->setProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
+
+        $col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+        $additionalProperty = new AccountProperty($col->getName(), 'second@example.org', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, '');
+        $col->addProperty($additionalProperty);
+        $account->setPropertyCollection($col);
+
+        $this->assertEquals($properties, $account->getProperties());
+        $properties[] = $additionalProperty;
+        $this->assertEquals(array_values($properties), \iterator_to_array($account->getAllProperties()));
+    }
+
+    public function testSetAllPropertiesFromJson(): void {
+        $user = $this->createMock(IUser::class);
+        $properties = [
+            IAccountManager::PROPERTY_DISPLAYNAME => new AccountProperty(IAccountManager::PROPERTY_DISPLAYNAME, 'Steve', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_ADDRESS => new AccountProperty(IAccountManager::PROPERTY_ADDRESS, '123 Acorn Avenue', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://www.example.org', IAccountManager::SCOPE_FEDERATED, IAccountManager::VERIFIED, ''),
+            IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'steve@earth.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
+            IAccountManager::PROPERTY_AVATAR => new AccountProperty(IAccountManager::PROPERTY_AVATAR, '', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_PHONE => new AccountProperty(IAccountManager::PROPERTY_PHONE, '+358407991028', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_TWITTER => new AccountProperty(IAccountManager::PROPERTY_TWITTER, 'therealsteve', IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_BLUESKY => new AccountProperty(IAccountManager::PROPERTY_BLUESKY, 'therealsteve.bsky.social', IAccountManager::SCOPE_PRIVATE, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_ORGANISATION => new AccountProperty(IAccountManager::PROPERTY_ORGANISATION, 'Steve Incorporated', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_ROLE => new AccountProperty(IAccountManager::PROPERTY_ROLE, 'Founder', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_HEADLINE => new AccountProperty(IAccountManager::PROPERTY_HEADLINE, 'I am Steve', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_BIOGRAPHY => new AccountProperty(IAccountManager::PROPERTY_BIOGRAPHY, 'Steve is the best', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_PROFILE_ENABLED => new AccountProperty(IAccountManager::PROPERTY_PROFILE_ENABLED, '1', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::COLLECTION_EMAIL => [
+                new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'steve@mars.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
+                new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'steve@neptune.com', IAccountManager::SCOPE_FEDERATED, IAccountManager::NOT_VERIFIED, ''),
+            ],
+        ];
+        $account = new Account($user);
+        $account->setAllPropertiesFromJson(json_decode(json_encode($properties), true));
+        $this->assertEquals($properties, $account->jsonSerialize());
+    }
+
+    public function testGetFilteredProperties(): void {
+        $user = $this->createMock(IUser::class);
+        $properties = [
+            IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, ''),
+            IAccountManager::PROPERTY_PHONE => new AccountProperty(IAccountManager::PROPERTY_PHONE, '123456', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
+        ];
+        $account = new Account($user);
+        $account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
+        $account->setProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
+        $account->setProperty(IAccountManager::PROPERTY_PHONE, '123456', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED);
+
+        $col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+        $additionalProperty1 = new AccountProperty($col->getName(), 'second@example.org', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, '');
+        $additionalProperty2 = new AccountProperty($col->getName(), 'third@example.org', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, '');
+        $col->addProperty($additionalProperty1);
+        $col->addProperty($additionalProperty2);
+        $account->setPropertyCollection($col);
+
+
+        $this->assertEquals(
+            [
+                IAccountManager::PROPERTY_WEBSITE => $properties[IAccountManager::PROPERTY_WEBSITE],
+                IAccountManager::PROPERTY_PHONE => $properties[IAccountManager::PROPERTY_PHONE],
+                IAccountManager::COLLECTION_EMAIL . '#0' => $additionalProperty1,
+                IAccountManager::COLLECTION_EMAIL . '#1' => $additionalProperty2,
+            ],
+            $account->getFilteredProperties(IAccountManager::SCOPE_PUBLISHED)
+        );
+        $this->assertEquals(
+            [
+                IAccountManager::PROPERTY_EMAIL => $properties[IAccountManager::PROPERTY_EMAIL],
+                IAccountManager::PROPERTY_PHONE => $properties[IAccountManager::PROPERTY_PHONE],
+                IAccountManager::COLLECTION_EMAIL . '#0' => $additionalProperty2,
+            ],
+            $account->getFilteredProperties(null, IAccountManager::VERIFIED)
+        );
+        $this->assertEquals(
+            [
+                IAccountManager::PROPERTY_PHONE => $properties[IAccountManager::PROPERTY_PHONE],
+                IAccountManager::COLLECTION_EMAIL . '#0' => $additionalProperty2,
+            ],
+            $account->getFilteredProperties(IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED),
+        );
+    }
+
+    public function testJsonSerialize(): void {
+        $user = $this->createMock(IUser::class);
+        $properties = [
+            IAccountManager::PROPERTY_WEBSITE => new AccountProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED, ''),
+            IAccountManager::PROPERTY_EMAIL => new AccountProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED, ''),
+            IAccountManager::COLLECTION_EMAIL => [
+                new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'apple@orange.com', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+                new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'banana@orange.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
+                new AccountProperty(IAccountManager::COLLECTION_EMAIL, 'kiwi@watermelon.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
+            ],
+        ];
+
+        $account = new Account($user);
+        $account->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::NOT_VERIFIED);
+        $account->setProperty(IAccountManager::PROPERTY_EMAIL, 'user@example.com', IAccountManager::SCOPE_LOCAL, IAccountManager::VERIFIED);
+
+        $col = new AccountPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+        $col->setProperties([
+            new AccountProperty($col->getName(), 'apple@orange.com', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED, ''),
+            new AccountProperty($col->getName(), 'banana@orange.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS, ''),
+            new AccountProperty($col->getName(), 'kiwi@watermelon.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFIED, ''),
+        ]);
+        $account->setPropertyCollection($col);
+
+        $this->assertEquals($properties, $account->jsonSerialize());
+    }
 }

tests/lib/Accounts/AccountManagerTest.php

Indentation +1014 added lines, -1014 removed lines

@@ -42,1020 +42,1020 @@
  */
 class AccountManagerTest extends TestCase {
 
-	/** accounts table name */
-	private string $table = 'accounts';
-	private AccountManager $accountManager;
-	private IDBConnection $connection;
-	private IPhoneNumberUtil $phoneNumberUtil;
-
-	protected IVerificationToken&MockObject $verificationToken;
-	protected IMailer&MockObject $mailer;
-	protected ICrypto&MockObject $crypto;
-	protected IURLGenerator&MockObject $urlGenerator;
-	protected Defaults&MockObject $defaults;
-	protected IFactory&MockObject $l10nFactory;
-	protected IConfig&MockObject $config;
-	protected IEventDispatcher&MockObject $eventDispatcher;
-	protected IJobList&MockObject $jobList;
-	private LoggerInterface&MockObject $logger;
-	private IClientService&MockObject $clientService;
-
-	protected function setUp(): void {
-		parent::setUp();
-		$this->connection = Server::get(IDBConnection::class);
-		$this->phoneNumberUtil = new PhoneNumberUtil();
-
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->jobList = $this->createMock(IJobList::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->verificationToken = $this->createMock(IVerificationToken::class);
-		$this->mailer = $this->createMock(IMailer::class);
-		$this->defaults = $this->createMock(Defaults::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->urlGenerator = $this->createMock(IURLGenerator::class);
-		$this->crypto = $this->createMock(ICrypto::class);
-		$this->clientService = $this->createMock(IClientService::class);
-
-		$this->accountManager = new AccountManager(
-			$this->connection,
-			$this->config,
-			$this->eventDispatcher,
-			$this->jobList,
-			$this->logger,
-			$this->verificationToken,
-			$this->mailer,
-			$this->defaults,
-			$this->l10nFactory,
-			$this->urlGenerator,
-			$this->crypto,
-			$this->phoneNumberUtil,
-			$this->clientService,
-		);
-	}
-
-	protected function tearDown(): void {
-		parent::tearDown();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->table)->executeStatement();
-	}
-
-	protected function makeUser(string $uid, string $name, ?string $email = null): IUser {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->any())
-			->method('getUid')
-			->willReturn($uid);
-		$user->expects($this->any())
-			->method('getDisplayName')
-			->willReturn($name);
-		if ($email !== null) {
-			$user->expects($this->any())
-				->method('getEMailAddress')
-				->willReturn($email);
-		}
-
-		return $user;
-	}
-
-	protected function populateOrUpdate(): void {
-		$users = [
-			[
-				'user' => $this->makeUser('j.doe', 'Jane Doe', 'jane.doe@acme.com'),
-				'data' => [
-					[
-						'name' => IAccountManager::PROPERTY_DISPLAYNAME,
-						'value' => 'Jane Doe',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_EMAIL,
-						'value' => 'jane.doe@acme.com',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_TWITTER,
-						'value' => '@sometwitter',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_FEDIVERSE,
-						'value' => '@someMastodon@mastodon.social',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_PHONE,
-						'value' => '+491601231212',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ADDRESS,
-						'value' => 'some street',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_WEBSITE,
-						'value' => 'https://acme.com',
-						'scope' => IAccountManager::SCOPE_PRIVATE
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ORGANISATION,
-						'value' => 'Some organisation',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ROLE,
-						'value' => 'Human',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_HEADLINE,
-						'value' => 'Hi',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_BIOGRAPHY,
-						'value' => 'Biography',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-				],
-			],
-			[
-				'user' => $this->makeUser('a.allison', 'Alice Allison', 'a.allison@example.org'),
-				'data' => [
-					[
-						'name' => IAccountManager::PROPERTY_DISPLAYNAME,
-						'value' => 'Alice Allison',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_EMAIL,
-						'value' => 'a.allison@example.org',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_TWITTER,
-						'value' => '@a_alice',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_FEDIVERSE,
-						'value' => '@a_alice@cool.social',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_PHONE,
-						'value' => '+491602312121',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ADDRESS,
-						'value' => 'Dundee Road 45',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_WEBSITE,
-						'value' => 'https://example.org',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ORGANISATION,
-						'value' => 'Another organisation',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ROLE,
-						'value' => 'Alien',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_HEADLINE,
-						'value' => 'Hello',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_BIOGRAPHY,
-						'value' => 'Different biography',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-				],
-			],
-			[
-				'user' => $this->makeUser('b32c5a5b-1084-4380-8856-e5223b16de9f', 'Armel Oliseh', 'oliseh@example.com'),
-				'data' => [
-					[
-						'name' => IAccountManager::PROPERTY_DISPLAYNAME,
-						'value' => 'Armel Oliseh',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_EMAIL,
-						'value' => 'oliseh@example.com',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_TWITTER,
-						'value' => '',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_FEDIVERSE,
-						'value' => '',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_PHONE,
-						'value' => '+491603121212',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ADDRESS,
-						'value' => 'Sunflower Blvd. 77',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_WEBSITE,
-						'value' => 'https://example.com',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ORGANISATION,
-						'value' => 'Yet another organisation',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ROLE,
-						'value' => 'Being',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_HEADLINE,
-						'value' => 'This is a headline',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_BIOGRAPHY,
-						'value' => 'Some long biography',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-				],
-			],
-			[
-				'user' => $this->makeUser('31b5316a-9b57-4b17-970a-315a4cbe73eb', 'K. Cheng', 'cheng@emca.com'),
-				'data' => [
-					[
-						'name' => IAccountManager::PROPERTY_DISPLAYNAME,
-						'value' => 'K. Cheng',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_EMAIL,
-						'value' => 'cheng@emca.com',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_TWITTER,
-						'value' => '', '
+    /** accounts table name */
+    private string $table = 'accounts';
+    private AccountManager $accountManager;
+    private IDBConnection $connection;
+    private IPhoneNumberUtil $phoneNumberUtil;
+
+    protected IVerificationToken&MockObject $verificationToken;
+    protected IMailer&MockObject $mailer;
+    protected ICrypto&MockObject $crypto;
+    protected IURLGenerator&MockObject $urlGenerator;
+    protected Defaults&MockObject $defaults;
+    protected IFactory&MockObject $l10nFactory;
+    protected IConfig&MockObject $config;
+    protected IEventDispatcher&MockObject $eventDispatcher;
+    protected IJobList&MockObject $jobList;
+    private LoggerInterface&MockObject $logger;
+    private IClientService&MockObject $clientService;
+
+    protected function setUp(): void {
+        parent::setUp();
+        $this->connection = Server::get(IDBConnection::class);
+        $this->phoneNumberUtil = new PhoneNumberUtil();
+
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->jobList = $this->createMock(IJobList::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->verificationToken = $this->createMock(IVerificationToken::class);
+        $this->mailer = $this->createMock(IMailer::class);
+        $this->defaults = $this->createMock(Defaults::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->urlGenerator = $this->createMock(IURLGenerator::class);
+        $this->crypto = $this->createMock(ICrypto::class);
+        $this->clientService = $this->createMock(IClientService::class);
+
+        $this->accountManager = new AccountManager(
+            $this->connection,
+            $this->config,
+            $this->eventDispatcher,
+            $this->jobList,
+            $this->logger,
+            $this->verificationToken,
+            $this->mailer,
+            $this->defaults,
+            $this->l10nFactory,
+            $this->urlGenerator,
+            $this->crypto,
+            $this->phoneNumberUtil,
+            $this->clientService,
+        );
+    }
+
+    protected function tearDown(): void {
+        parent::tearDown();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->table)->executeStatement();
+    }
+
+    protected function makeUser(string $uid, string $name, ?string $email = null): IUser {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->any())
+            ->method('getUid')
+            ->willReturn($uid);
+        $user->expects($this->any())
+            ->method('getDisplayName')
+            ->willReturn($name);
+        if ($email !== null) {
+            $user->expects($this->any())
+                ->method('getEMailAddress')
+                ->willReturn($email);
+        }
+
+        return $user;
+    }
+
+    protected function populateOrUpdate(): void {
+        $users = [
+            [
+                'user' => $this->makeUser('j.doe', 'Jane Doe', 'jane.doe@acme.com'),
+                'data' => [
+                    [
+                        'name' => IAccountManager::PROPERTY_DISPLAYNAME,
+                        'value' => 'Jane Doe',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_EMAIL,
+                        'value' => 'jane.doe@acme.com',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_TWITTER,
+                        'value' => '@sometwitter',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_FEDIVERSE,
+                        'value' => '@someMastodon@mastodon.social',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_PHONE,
+                        'value' => '+491601231212',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ADDRESS,
+                        'value' => 'some street',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_WEBSITE,
+                        'value' => 'https://acme.com',
+                        'scope' => IAccountManager::SCOPE_PRIVATE
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ORGANISATION,
+                        'value' => 'Some organisation',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ROLE,
+                        'value' => 'Human',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_HEADLINE,
+                        'value' => 'Hi',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_BIOGRAPHY,
+                        'value' => 'Biography',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                ],
+            ],
+            [
+                'user' => $this->makeUser('a.allison', 'Alice Allison', 'a.allison@example.org'),
+                'data' => [
+                    [
+                        'name' => IAccountManager::PROPERTY_DISPLAYNAME,
+                        'value' => 'Alice Allison',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_EMAIL,
+                        'value' => 'a.allison@example.org',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_TWITTER,
+                        'value' => '@a_alice',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_FEDIVERSE,
+                        'value' => '@a_alice@cool.social',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_PHONE,
+                        'value' => '+491602312121',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ADDRESS,
+                        'value' => 'Dundee Road 45',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_WEBSITE,
+                        'value' => 'https://example.org',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ORGANISATION,
+                        'value' => 'Another organisation',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ROLE,
+                        'value' => 'Alien',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_HEADLINE,
+                        'value' => 'Hello',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_BIOGRAPHY,
+                        'value' => 'Different biography',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                ],
+            ],
+            [
+                'user' => $this->makeUser('b32c5a5b-1084-4380-8856-e5223b16de9f', 'Armel Oliseh', 'oliseh@example.com'),
+                'data' => [
+                    [
+                        'name' => IAccountManager::PROPERTY_DISPLAYNAME,
+                        'value' => 'Armel Oliseh',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_EMAIL,
+                        'value' => 'oliseh@example.com',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_TWITTER,
+                        'value' => '',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_FEDIVERSE,
+                        'value' => '',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_PHONE,
+                        'value' => '+491603121212',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ADDRESS,
+                        'value' => 'Sunflower Blvd. 77',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_WEBSITE,
+                        'value' => 'https://example.com',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ORGANISATION,
+                        'value' => 'Yet another organisation',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ROLE,
+                        'value' => 'Being',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_HEADLINE,
+                        'value' => 'This is a headline',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_BIOGRAPHY,
+                        'value' => 'Some long biography',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                ],
+            ],
+            [
+                'user' => $this->makeUser('31b5316a-9b57-4b17-970a-315a4cbe73eb', 'K. Cheng', 'cheng@emca.com'),
+                'data' => [
+                    [
+                        'name' => IAccountManager::PROPERTY_DISPLAYNAME,
+                        'value' => 'K. Cheng',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_EMAIL,
+                        'value' => 'cheng@emca.com',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_TWITTER,
+                        'value' => '', '
 						scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_FEDIVERSE,
-						'value' => '', '
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_FEDIVERSE,
+                        'value' => '', '
 						scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_PHONE,
-						'value' => '+71601212123',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ADDRESS,
-						'value' => 'Pinapple Street 22',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_WEBSITE,
-						'value' => 'https://emca.com',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ORGANISATION,
-						'value' => 'Organisation A',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ROLE,
-						'value' => 'Animal',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_HEADLINE,
-						'value' => 'My headline',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_BIOGRAPHY,
-						'value' => 'Short biography',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::COLLECTION_EMAIL,
-						'value' => 'k.cheng@emca.com',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::COLLECTION_EMAIL,
-						'value' => 'kai.cheng@emca.com',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-				],
-			],
-			[
-				'user' => $this->makeUser('goodpal@elpmaxe.org', 'Goodpal, Kim', 'goodpal@elpmaxe.org'),
-				'data' => [
-					[
-						'name' => IAccountManager::PROPERTY_DISPLAYNAME,
-						'value' => 'Goodpal, Kim',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_EMAIL,
-						'value' => 'goodpal@elpmaxe.org',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_TWITTER,
-						'value' => '',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_FEDIVERSE,
-						'value' => '',
-						'scope' => IAccountManager::SCOPE_LOCAL
-					],
-					[
-						'name' => IAccountManager::PROPERTY_PHONE,
-						'value' => '+71602121231',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ADDRESS,
-						'value' => 'Octopus Ave 17',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_WEBSITE,
-						'value' => 'https://elpmaxe.org',
-						'scope' => IAccountManager::SCOPE_PUBLISHED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ORGANISATION,
-						'value' => 'Organisation B',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_ROLE,
-						'value' => 'Organism',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_HEADLINE,
-						'value' => 'Best headline',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-					[
-						'name' => IAccountManager::PROPERTY_BIOGRAPHY,
-						'value' => 'Autobiography',
-						'scope' => IAccountManager::SCOPE_FEDERATED
-					],
-				],
-			],
-		];
-		$this->config->expects($this->exactly(count($users)))->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn([]);
-		foreach ($users as $userInfo) {
-			$this->invokePrivate($this->accountManager, 'updateUser', [$userInfo['user'], $userInfo['data'], null, false]);
-		}
-	}
-
-	/**
-	 * get a instance of the accountManager
-	 *
-	 * @return MockObject | AccountManager
-	 */
-	public function getInstance(?array $mockedMethods = null) {
-		return $this->getMockBuilder(AccountManager::class)
-			->setConstructorArgs([
-				$this->connection,
-				$this->config,
-				$this->eventDispatcher,
-				$this->jobList,
-				$this->logger,
-				$this->verificationToken,
-				$this->mailer,
-				$this->defaults,
-				$this->l10nFactory,
-				$this->urlGenerator,
-				$this->crypto,
-				$this->phoneNumberUtil,
-				$this->clientService,
-			])
-			->onlyMethods($mockedMethods)
-			->getMock();
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTrueFalse')]
-	public function testUpdateUser(array $newData, array $oldData, bool $insertNew, bool $updateExisting): void {
-		$accountManager = $this->getInstance(['getUser', 'insertNewUser', 'updateExistingUser']);
-		/** @var IUser $user */
-		$user = $this->createMock(IUser::class);
-
-		if ($updateExisting) {
-			$accountManager->expects($this->once())->method('updateExistingUser')
-				->with($user, $newData);
-			$accountManager->expects($this->never())->method('insertNewUser');
-		}
-		if ($insertNew) {
-			$accountManager->expects($this->once())->method('insertNewUser')
-				->with($user, $newData);
-			$accountManager->expects($this->never())->method('updateExistingUser');
-		}
-
-		if (!$insertNew && !$updateExisting) {
-			$accountManager->expects($this->never())->method('updateExistingUser');
-			$accountManager->expects($this->never())->method('insertNewUser');
-			$this->eventDispatcher->expects($this->never())->method('dispatchTyped');
-		} else {
-			$this->eventDispatcher->expects($this->once())->method('dispatchTyped')
-				->willReturnCallback(
-					function ($event) use ($user, $newData): void {
-						$this->assertInstanceOf(UserUpdatedEvent::class, $event);
-						$this->assertSame($user, $event->getUser());
-						$this->assertSame($newData, $event->getData());
-					}
-				);
-		}
-
-		$this->invokePrivate($accountManager, 'updateUser', [$user, $newData, $oldData]);
-	}
-
-	public static function dataTrueFalse(): array {
-		return [
-			#$newData | $oldData | $insertNew | $updateExisting
-			[['myProperty' => ['value' => 'newData']], ['myProperty' => ['value' => 'oldData']], false, true],
-			[['myProperty' => ['value' => 'oldData']], ['myProperty' => ['value' => 'oldData']], false, false]
-		];
-	}
-
-	public function testAddMissingDefaults(): void {
-		$user = $this->createMock(IUser::class);
-
-		$this->config
-			->expects($this->once())
-			->method('getAppValue')
-			->with('settings', 'profile_enabled_by_default', '1')
-			->willReturn('1');
-
-		$input = [
-			[
-				'name' => IAccountManager::PROPERTY_DISPLAYNAME,
-				'value' => 'bob',
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-			[
-				'name' => IAccountManager::PROPERTY_EMAIL,
-				'value' => 'bob@bob.bob',
-			],
-		];
-
-		$expected = [
-			[
-				'name' => IAccountManager::PROPERTY_DISPLAYNAME,
-				'value' => 'bob',
-				'scope' => IAccountManager::SCOPE_FEDERATED,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_EMAIL,
-				'value' => 'bob@bob.bob',
-				'scope' => IAccountManager::SCOPE_FEDERATED,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_ADDRESS,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_WEBSITE,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_AVATAR,
-				'scope' => IAccountManager::SCOPE_FEDERATED
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_PHONE,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_TWITTER,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_BLUESKY,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_FEDIVERSE,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_ORGANISATION,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_ROLE,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_HEADLINE,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_BIOGRAPHY,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_BIRTHDATE,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_PROFILE_ENABLED,
-				'value' => '1',
-			],
-
-			[
-				'name' => IAccountManager::PROPERTY_PRONOUNS,
-				'value' => '',
-				'scope' => IAccountManager::SCOPE_FEDERATED,
-			],
-		];
-		$this->config->expects($this->once())->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn([]);
-
-		$defaultUserRecord = $this->invokePrivate($this->accountManager, 'buildDefaultUserRecord', [$user]);
-		$result = $this->invokePrivate($this->accountManager, 'addMissingDefaultValues', [$input, $defaultUserRecord]);
-
-		$this->assertSame($expected, $result);
-	}
-
-	public function testGetAccount(): void {
-		$accountManager = $this->getInstance(['getUser']);
-		/** @var IUser $user */
-		$user = $this->createMock(IUser::class);
-
-		$data = [
-			[
-				'value' => '@twitterhandle',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-				'name' => IAccountManager::PROPERTY_TWITTER,
-			],
-			[
-				'value' => '@mastohandle@mastodon.social',
-				'scope' => IAccountManager::SCOPE_LOCAL,
-				'verified' => IAccountManager::NOT_VERIFIED,
-				'name' => IAccountManager::PROPERTY_FEDIVERSE,
-			],
-			[
-				'value' => 'test@example.com',
-				'scope' => IAccountManager::SCOPE_PUBLISHED,
-				'verified' => IAccountManager::VERIFICATION_IN_PROGRESS,
-				'name' => IAccountManager::PROPERTY_EMAIL,
-			],
-			[
-				'value' => 'https://example.com',
-				'scope' => IAccountManager::SCOPE_FEDERATED,
-				'verified' => IAccountManager::VERIFIED,
-				'name' => IAccountManager::PROPERTY_WEBSITE,
-			],
-		];
-		$expected = new Account($user);
-		$expected->setProperty(IAccountManager::PROPERTY_TWITTER, '@twitterhandle', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
-		$expected->setProperty(IAccountManager::PROPERTY_FEDIVERSE, '@mastohandle@mastodon.social', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
-		$expected->setProperty(IAccountManager::PROPERTY_EMAIL, 'test@example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS);
-		$expected->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_FEDERATED, IAccountManager::VERIFIED);
-
-		$accountManager->expects($this->once())
-			->method('getUser')
-			->willReturn($data);
-		$this->assertEquals($expected, $accountManager->getAccount($user));
-	}
-
-	public static function dataParsePhoneNumber(): array {
-		return [
-			['0711 / 25 24 28-90', 'DE', '+4971125242890'],
-			['0711 / 25 24 28-90', '', null],
-			['+49 711 / 25 24 28-90', '', '+4971125242890'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataParsePhoneNumber')]
-	public function testSanitizePhoneNumberOnUpdateAccount(string $phoneInput, string $defaultRegion, ?string $phoneNumber): void {
-		$this->config->method('getSystemValueString')
-			->willReturn($defaultRegion);
-
-		$user = $this->createMock(IUser::class);
-		$account = new Account($user);
-		$account->setProperty(IAccountManager::PROPERTY_PHONE, $phoneInput, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
-		$manager = $this->getInstance(['getUser', 'updateUser']);
-		$manager->method('getUser')
-			->with($user, false)
-			->willReturn([]);
-		$manager->expects($phoneNumber === null ? self::never() : self::once())
-			->method('updateUser');
-
-		if ($phoneNumber === null) {
-			$this->expectException(\InvalidArgumentException::class);
-		}
-
-		$manager->updateAccount($account);
-
-		if ($phoneNumber !== null) {
-			self::assertEquals($phoneNumber, $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue());
-		}
-	}
-
-	public static function dataSanitizeOnUpdate(): array {
-		return [
-			[IAccountManager::PROPERTY_WEBSITE, 'https://nextcloud.com', 'https://nextcloud.com'],
-			[IAccountManager::PROPERTY_WEBSITE, 'http://nextcloud.com', 'http://nextcloud.com'],
-			[IAccountManager::PROPERTY_WEBSITE, 'ftp://nextcloud.com', null],
-			[IAccountManager::PROPERTY_WEBSITE, '//nextcloud.com/', null],
-			[IAccountManager::PROPERTY_WEBSITE, 'https:///?query', null],
-
-			[IAccountManager::PROPERTY_TWITTER, '@nextcloud', 'nextcloud'],
-			[IAccountManager::PROPERTY_TWITTER, '_nextcloud', '_nextcloud'],
-			[IAccountManager::PROPERTY_TWITTER, 'FooB4r', 'FooB4r'],
-			[IAccountManager::PROPERTY_TWITTER, 'X', null],
-			[IAccountManager::PROPERTY_TWITTER, 'next.cloud', null],
-			[IAccountManager::PROPERTY_TWITTER, 'ab/cd.zip', null],
-			[IAccountManager::PROPERTY_TWITTER, 'tooLongForTwitterAndX', null],
-
-			[IAccountManager::PROPERTY_FEDIVERSE, 'nextcloud@mastodon.social', 'nextcloud@mastodon.social'],
-			[IAccountManager::PROPERTY_FEDIVERSE, '@nextcloud@mastodon.xyz', 'nextcloud@mastodon.xyz'],
-			[IAccountManager::PROPERTY_FEDIVERSE, 'l33t.h4x0r@sub.localhost.local', 'l33t.h4x0r@sub.localhost.local'],
-			[IAccountManager::PROPERTY_FEDIVERSE, 'invalid/name@mastodon.social', null],
-			[IAccountManager::PROPERTY_FEDIVERSE, 'name@evil.host/malware.exe', null],
-			[IAccountManager::PROPERTY_FEDIVERSE, '@is-it-a-host-or-name', null],
-			[IAccountManager::PROPERTY_FEDIVERSE, 'only-a-name', null],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSanitizeOnUpdate')]
-	public function testSanitizingOnUpdateAccount(string $property, string $input, ?string $output): void {
-
-		if ($property === IAccountManager::PROPERTY_FEDIVERSE) {
-			// We do not test the server response here we do this in the `testSanitizingFediverseServer`
-			$this->config
-				->method('getSystemValueBool')
-				->with('has_internet_connection', true)
-				->willReturn(false);
-		}
-
-		$user = $this->createMock(IUser::class);
-
-		$account = new Account($user);
-		$account->setProperty($property, $input, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
-
-		$manager = $this->getInstance(['getUser', 'updateUser']);
-		$manager->method('getUser')
-			->with($user, false)
-			->willReturn([]);
-		$manager->expects($output === null ? self::never() : self::once())
-			->method('updateUser');
-
-		if ($output === null) {
-			$this->expectException(\InvalidArgumentException::class);
-			$this->expectExceptionMessage($property);
-		}
-
-		$manager->updateAccount($account);
-
-		if ($output !== null) {
-			self::assertEquals($output, $account->getProperty($property)->getValue());
-		}
-	}
-
-	public static function dataSanitizeFediverseServer(): array {
-		return [
-			'no internet' => [
-				'@foo@example.com',
-				'foo@example.com',
-				false,
-				null,
-			],
-			'no internet - no at' => [
-				'foo@example.com',
-				'foo@example.com',
-				false,
-				null,
-			],
-			'valid response' => [
-				'@foo@example.com',
-				'foo@example.com',
-				true,
-				json_encode([
-					'subject' => 'acct:foo@example.com',
-					'links' => [
-						[
-							'rel' => 'self',
-							'type' => 'application/activity+json',
-							'href' => 'https://example.com/users/foo',
-						],
-					],
-				]),
-			],
-			'valid response - no at' => [
-				'foo@example.com',
-				'foo@example.com',
-				true,
-				json_encode([
-					'subject' => 'acct:foo@example.com',
-					'links' => [
-						[
-							'rel' => 'self',
-							'type' => 'application/activity+json',
-							'href' => 'https://example.com/users/foo',
-						],
-					],
-				]),
-			],
-			// failures
-			'invalid response' => [
-				'@foo@example.com',
-				null,
-				true,
-				json_encode([
-					'subject' => 'acct:foo@example.com',
-					'links' => [],
-				]),
-			],
-			'no response' => [
-				'@foo@example.com',
-				null,
-				true,
-				null,
-			],
-			'wrong user' => [
-				'@foo@example.com',
-				null,
-				true,
-				json_encode([
-					'links' => [],
-				]),
-			],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSanitizeFediverseServer')]
-	public function testSanitizingFediverseServer(string $input, ?string $output, bool $hasInternet, ?string $serverResponse): void {
-		$this->config->expects(self::once())
-			->method('getSystemValueBool')
-			->with('has_internet_connection', true)
-			->willReturn($hasInternet);
-
-		if ($hasInternet) {
-			$client = $this->createMock(IClient::class);
-			if ($serverResponse !== null) {
-				$response = $this->createMock(IResponse::class);
-				$response->method('getBody')
-					->willReturn($serverResponse);
-				$client->expects(self::once())
-					->method('get')
-					->with('https://example.com/.well-known/webfinger?resource=acct:foo@example.com')
-					->willReturn($response);
-			} else {
-				$client->expects(self::once())
-					->method('get')
-					->with('https://example.com/.well-known/webfinger?resource=acct:foo@example.com')
-					->willThrowException(new \Exception('404'));
-			}
-
-			$this->clientService
-				->expects(self::once())
-				->method('newClient')
-				->willReturn($client);
-		} else {
-			$this->clientService
-				->expects(self::never())
-				->method('newClient');
-		}
-
-		$user = $this->createMock(IUser::class);
-		$account = new Account($user);
-		$account->setProperty(IAccountManager::PROPERTY_FEDIVERSE, $input, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
-
-		$manager = $this->getInstance(['getUser', 'updateUser']);
-		$manager->method('getUser')
-			->with($user, false)
-			->willReturn([]);
-		$manager->expects($output === null ? self::never() : self::once())
-			->method('updateUser');
-
-		if ($output === null) {
-			$this->expectException(\InvalidArgumentException::class);
-			$this->expectExceptionMessage(IAccountManager::PROPERTY_FEDIVERSE);
-		}
-
-		$manager->updateAccount($account);
-
-		if ($output !== null) {
-			self::assertEquals($output, $account->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getValue());
-		}
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('searchDataProvider')]
-	public function testSearchUsers(string $property, array $values, array $expected): void {
-		$this->populateOrUpdate();
-
-		$matchedUsers = $this->accountManager->searchUsers($property, $values);
-		foreach ($expected as $expectedEntry) {
-			$this->assertContains($expectedEntry, $matchedUsers);
-		}
-		if (empty($expected)) {
-			$this->assertEmpty($matchedUsers);
-		}
-	}
-
-	public static function searchDataProvider(): array {
-		return [
-			[ #0 Search for an existing name
-				IAccountManager::PROPERTY_DISPLAYNAME,
-				['Jane Doe'],
-				['Jane Doe' => 'j.doe']
-			],
-			[ #1 Search for part of a name (no result)
-				IAccountManager::PROPERTY_DISPLAYNAME,
-				['Jane'],
-				[]
-			],
-			[ #2 Search for part of a name (no result, test wildcard)
-				IAccountManager::PROPERTY_DISPLAYNAME,
-				['Jane%'],
-				[]
-			],
-			[ #3 Search for phone
-				IAccountManager::PROPERTY_PHONE,
-				['+491603121212'],
-				['+491603121212' => 'b32c5a5b-1084-4380-8856-e5223b16de9f'],
-			],
-			[ #4 Search for twitter handles
-				IAccountManager::PROPERTY_TWITTER,
-				['@sometwitter', '@a_alice', '@unseen'],
-				['@sometwitter' => 'j.doe', '@a_alice' => 'a.allison'],
-			],
-			[ #5 Search for email
-				IAccountManager::PROPERTY_EMAIL,
-				['cheng@emca.com'],
-				['cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb'],
-			],
-			[ #6 Search for email by additional email
-				IAccountManager::PROPERTY_EMAIL,
-				['kai.cheng@emca.com'],
-				['kai.cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb'],
-			],
-			[ #7 Search for additional email
-				IAccountManager::COLLECTION_EMAIL,
-				['kai.cheng@emca.com', 'cheng@emca.com'],
-				['kai.cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb'],
-			],
-			[ #8 Search for email by additional email (two valid search values, but the same user)
-				IAccountManager::PROPERTY_EMAIL,
-				['kai.cheng@emca.com', 'cheng@emca.com'],
-				[
-					'kai.cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb',
-				],
-			],
-		];
-	}
-
-	public static function dataCheckEmailVerification(): array {
-		return [
-			[['steve', 'Steve Smith', 'steve@steve.steve'], null],
-			[['emma', 'Emma Morales', 'emma@emma.com'], 'emma@morales.com'],
-			[['sarah@web.org', 'Sarah Foster', 'sarah@web.org'], null],
-			[['cole@web.org', 'Cole Harrison', 'cole@web.org'], 'cole@example.com'],
-			[['8d29e358-cf69-4849-bbf9-28076c0b908b', 'Alice McPherson', 'alice@example.com'], 'alice@mcpherson.com'],
-			[['11da2744-3f4d-4c17-8c13-4c057a379237', 'James Loranger', 'james@example.com'], ''],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataCheckEmailVerification')]
-	public function testCheckEmailVerification(array $userData, ?string $newEmail): void {
-		$user = $this->makeUser(...$userData);
-		// Once because of getAccount, once because of getUser
-		$this->config->expects($this->exactly(2))->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn([]);
-		$account = $this->accountManager->getAccount($user);
-		$emailUpdated = false;
-
-		if (!empty($newEmail)) {
-			$account->getProperty(IAccountManager::PROPERTY_EMAIL)->setValue($newEmail);
-			$emailUpdated = true;
-		}
-
-		if ($emailUpdated) {
-			$this->jobList->expects($this->once())
-				->method('add')
-				->with(VerifyUserData::class);
-		} else {
-			$this->jobList->expects($this->never())
-				->method('add')
-				->with(VerifyUserData::class);
-		}
-
-		/** @var array $oldData */
-		$oldData = $this->invokePrivate($this->accountManager, 'getUser', [$user, false]);
-		$this->invokePrivate($this->accountManager, 'checkEmailVerification', [$account, $oldData]);
-	}
-
-	public static function dataSetDefaultPropertyScopes(): array {
-		return [
-			[
-				[],
-				[
-					IAccountManager::PROPERTY_DISPLAYNAME => IAccountManager::SCOPE_FEDERATED,
-					IAccountManager::PROPERTY_ADDRESS => IAccountManager::SCOPE_LOCAL,
-					IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_FEDERATED,
-					IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_LOCAL,
-				]
-			],
-			[
-				[
-					IAccountManager::PROPERTY_DISPLAYNAME => IAccountManager::SCOPE_FEDERATED,
-					IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_LOCAL,
-					IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
-				], [
-					IAccountManager::PROPERTY_DISPLAYNAME => IAccountManager::SCOPE_FEDERATED,
-					IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_LOCAL,
-					IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
-				]
-			],
-			[
-				[
-					IAccountManager::PROPERTY_ADDRESS => 'invalid scope',
-					'invalid property' => IAccountManager::SCOPE_LOCAL,
-					IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
-				],
-				[
-					IAccountManager::PROPERTY_ADDRESS => IAccountManager::SCOPE_LOCAL,
-					IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_FEDERATED,
-					IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
-				]
-			],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSetDefaultPropertyScopes')]
-	public function testSetDefaultPropertyScopes(array $propertyScopes, array $expectedResultScopes): void {
-		$user = $this->makeUser('steve', 'Steve Smith', 'steve@steve.steve');
-		$this->config->expects($this->once())->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn($propertyScopes);
-
-		$result = $this->invokePrivate($this->accountManager, 'buildDefaultUserRecord', [$user]);
-		$resultProperties = array_column($result, 'name');
-
-		$this->assertEmpty(array_diff($resultProperties, IAccountManager::ALLOWED_PROPERTIES), 'Building default user record returned non-allowed properties');
-		foreach ($expectedResultScopes as $expectedResultScopeKey => $expectedResultScopeValue) {
-			$resultScope = $result[array_search($expectedResultScopeKey, $resultProperties)]['scope'];
-			$this->assertEquals($expectedResultScopeValue, $resultScope, "The result scope doesn't follow the value set into the config or defaults correctly.");
-		}
-	}
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_PHONE,
+                        'value' => '+71601212123',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ADDRESS,
+                        'value' => 'Pinapple Street 22',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_WEBSITE,
+                        'value' => 'https://emca.com',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ORGANISATION,
+                        'value' => 'Organisation A',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ROLE,
+                        'value' => 'Animal',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_HEADLINE,
+                        'value' => 'My headline',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_BIOGRAPHY,
+                        'value' => 'Short biography',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::COLLECTION_EMAIL,
+                        'value' => 'k.cheng@emca.com',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::COLLECTION_EMAIL,
+                        'value' => 'kai.cheng@emca.com',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                ],
+            ],
+            [
+                'user' => $this->makeUser('goodpal@elpmaxe.org', 'Goodpal, Kim', 'goodpal@elpmaxe.org'),
+                'data' => [
+                    [
+                        'name' => IAccountManager::PROPERTY_DISPLAYNAME,
+                        'value' => 'Goodpal, Kim',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_EMAIL,
+                        'value' => 'goodpal@elpmaxe.org',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_TWITTER,
+                        'value' => '',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_FEDIVERSE,
+                        'value' => '',
+                        'scope' => IAccountManager::SCOPE_LOCAL
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_PHONE,
+                        'value' => '+71602121231',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ADDRESS,
+                        'value' => 'Octopus Ave 17',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_WEBSITE,
+                        'value' => 'https://elpmaxe.org',
+                        'scope' => IAccountManager::SCOPE_PUBLISHED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ORGANISATION,
+                        'value' => 'Organisation B',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_ROLE,
+                        'value' => 'Organism',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_HEADLINE,
+                        'value' => 'Best headline',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                    [
+                        'name' => IAccountManager::PROPERTY_BIOGRAPHY,
+                        'value' => 'Autobiography',
+                        'scope' => IAccountManager::SCOPE_FEDERATED
+                    ],
+                ],
+            ],
+        ];
+        $this->config->expects($this->exactly(count($users)))->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn([]);
+        foreach ($users as $userInfo) {
+            $this->invokePrivate($this->accountManager, 'updateUser', [$userInfo['user'], $userInfo['data'], null, false]);
+        }
+    }
+
+    /**
+     * get a instance of the accountManager
+     *
+     * @return MockObject | AccountManager
+     */
+    public function getInstance(?array $mockedMethods = null) {
+        return $this->getMockBuilder(AccountManager::class)
+            ->setConstructorArgs([
+                $this->connection,
+                $this->config,
+                $this->eventDispatcher,
+                $this->jobList,
+                $this->logger,
+                $this->verificationToken,
+                $this->mailer,
+                $this->defaults,
+                $this->l10nFactory,
+                $this->urlGenerator,
+                $this->crypto,
+                $this->phoneNumberUtil,
+                $this->clientService,
+            ])
+            ->onlyMethods($mockedMethods)
+            ->getMock();
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTrueFalse')]
+    public function testUpdateUser(array $newData, array $oldData, bool $insertNew, bool $updateExisting): void {
+        $accountManager = $this->getInstance(['getUser', 'insertNewUser', 'updateExistingUser']);
+        /** @var IUser $user */
+        $user = $this->createMock(IUser::class);
+
+        if ($updateExisting) {
+            $accountManager->expects($this->once())->method('updateExistingUser')
+                ->with($user, $newData);
+            $accountManager->expects($this->never())->method('insertNewUser');
+        }
+        if ($insertNew) {
+            $accountManager->expects($this->once())->method('insertNewUser')
+                ->with($user, $newData);
+            $accountManager->expects($this->never())->method('updateExistingUser');
+        }
+
+        if (!$insertNew && !$updateExisting) {
+            $accountManager->expects($this->never())->method('updateExistingUser');
+            $accountManager->expects($this->never())->method('insertNewUser');
+            $this->eventDispatcher->expects($this->never())->method('dispatchTyped');
+        } else {
+            $this->eventDispatcher->expects($this->once())->method('dispatchTyped')
+                ->willReturnCallback(
+                    function ($event) use ($user, $newData): void {
+                        $this->assertInstanceOf(UserUpdatedEvent::class, $event);
+                        $this->assertSame($user, $event->getUser());
+                        $this->assertSame($newData, $event->getData());
+                    }
+                );
+        }
+
+        $this->invokePrivate($accountManager, 'updateUser', [$user, $newData, $oldData]);
+    }
+
+    public static function dataTrueFalse(): array {
+        return [
+            #$newData | $oldData | $insertNew | $updateExisting
+            [['myProperty' => ['value' => 'newData']], ['myProperty' => ['value' => 'oldData']], false, true],
+            [['myProperty' => ['value' => 'oldData']], ['myProperty' => ['value' => 'oldData']], false, false]
+        ];
+    }
+
+    public function testAddMissingDefaults(): void {
+        $user = $this->createMock(IUser::class);
+
+        $this->config
+            ->expects($this->once())
+            ->method('getAppValue')
+            ->with('settings', 'profile_enabled_by_default', '1')
+            ->willReturn('1');
+
+        $input = [
+            [
+                'name' => IAccountManager::PROPERTY_DISPLAYNAME,
+                'value' => 'bob',
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+            [
+                'name' => IAccountManager::PROPERTY_EMAIL,
+                'value' => 'bob@bob.bob',
+            ],
+        ];
+
+        $expected = [
+            [
+                'name' => IAccountManager::PROPERTY_DISPLAYNAME,
+                'value' => 'bob',
+                'scope' => IAccountManager::SCOPE_FEDERATED,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_EMAIL,
+                'value' => 'bob@bob.bob',
+                'scope' => IAccountManager::SCOPE_FEDERATED,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_ADDRESS,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_WEBSITE,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_AVATAR,
+                'scope' => IAccountManager::SCOPE_FEDERATED
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_PHONE,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_TWITTER,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_BLUESKY,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_FEDIVERSE,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_ORGANISATION,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_ROLE,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_HEADLINE,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_BIOGRAPHY,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_BIRTHDATE,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_PROFILE_ENABLED,
+                'value' => '1',
+            ],
+
+            [
+                'name' => IAccountManager::PROPERTY_PRONOUNS,
+                'value' => '',
+                'scope' => IAccountManager::SCOPE_FEDERATED,
+            ],
+        ];
+        $this->config->expects($this->once())->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn([]);
+
+        $defaultUserRecord = $this->invokePrivate($this->accountManager, 'buildDefaultUserRecord', [$user]);
+        $result = $this->invokePrivate($this->accountManager, 'addMissingDefaultValues', [$input, $defaultUserRecord]);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testGetAccount(): void {
+        $accountManager = $this->getInstance(['getUser']);
+        /** @var IUser $user */
+        $user = $this->createMock(IUser::class);
+
+        $data = [
+            [
+                'value' => '@twitterhandle',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+                'name' => IAccountManager::PROPERTY_TWITTER,
+            ],
+            [
+                'value' => '@mastohandle@mastodon.social',
+                'scope' => IAccountManager::SCOPE_LOCAL,
+                'verified' => IAccountManager::NOT_VERIFIED,
+                'name' => IAccountManager::PROPERTY_FEDIVERSE,
+            ],
+            [
+                'value' => 'test@example.com',
+                'scope' => IAccountManager::SCOPE_PUBLISHED,
+                'verified' => IAccountManager::VERIFICATION_IN_PROGRESS,
+                'name' => IAccountManager::PROPERTY_EMAIL,
+            ],
+            [
+                'value' => 'https://example.com',
+                'scope' => IAccountManager::SCOPE_FEDERATED,
+                'verified' => IAccountManager::VERIFIED,
+                'name' => IAccountManager::PROPERTY_WEBSITE,
+            ],
+        ];
+        $expected = new Account($user);
+        $expected->setProperty(IAccountManager::PROPERTY_TWITTER, '@twitterhandle', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
+        $expected->setProperty(IAccountManager::PROPERTY_FEDIVERSE, '@mastohandle@mastodon.social', IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
+        $expected->setProperty(IAccountManager::PROPERTY_EMAIL, 'test@example.com', IAccountManager::SCOPE_PUBLISHED, IAccountManager::VERIFICATION_IN_PROGRESS);
+        $expected->setProperty(IAccountManager::PROPERTY_WEBSITE, 'https://example.com', IAccountManager::SCOPE_FEDERATED, IAccountManager::VERIFIED);
+
+        $accountManager->expects($this->once())
+            ->method('getUser')
+            ->willReturn($data);
+        $this->assertEquals($expected, $accountManager->getAccount($user));
+    }
+
+    public static function dataParsePhoneNumber(): array {
+        return [
+            ['0711 / 25 24 28-90', 'DE', '+4971125242890'],
+            ['0711 / 25 24 28-90', '', null],
+            ['+49 711 / 25 24 28-90', '', '+4971125242890'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataParsePhoneNumber')]
+    public function testSanitizePhoneNumberOnUpdateAccount(string $phoneInput, string $defaultRegion, ?string $phoneNumber): void {
+        $this->config->method('getSystemValueString')
+            ->willReturn($defaultRegion);
+
+        $user = $this->createMock(IUser::class);
+        $account = new Account($user);
+        $account->setProperty(IAccountManager::PROPERTY_PHONE, $phoneInput, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
+        $manager = $this->getInstance(['getUser', 'updateUser']);
+        $manager->method('getUser')
+            ->with($user, false)
+            ->willReturn([]);
+        $manager->expects($phoneNumber === null ? self::never() : self::once())
+            ->method('updateUser');
+
+        if ($phoneNumber === null) {
+            $this->expectException(\InvalidArgumentException::class);
+        }
+
+        $manager->updateAccount($account);
+
+        if ($phoneNumber !== null) {
+            self::assertEquals($phoneNumber, $account->getProperty(IAccountManager::PROPERTY_PHONE)->getValue());
+        }
+    }
+
+    public static function dataSanitizeOnUpdate(): array {
+        return [
+            [IAccountManager::PROPERTY_WEBSITE, 'https://nextcloud.com', 'https://nextcloud.com'],
+            [IAccountManager::PROPERTY_WEBSITE, 'http://nextcloud.com', 'http://nextcloud.com'],
+            [IAccountManager::PROPERTY_WEBSITE, 'ftp://nextcloud.com', null],
+            [IAccountManager::PROPERTY_WEBSITE, '//nextcloud.com/', null],
+            [IAccountManager::PROPERTY_WEBSITE, 'https:///?query', null],
+
+            [IAccountManager::PROPERTY_TWITTER, '@nextcloud', 'nextcloud'],
+            [IAccountManager::PROPERTY_TWITTER, '_nextcloud', '_nextcloud'],
+            [IAccountManager::PROPERTY_TWITTER, 'FooB4r', 'FooB4r'],
+            [IAccountManager::PROPERTY_TWITTER, 'X', null],
+            [IAccountManager::PROPERTY_TWITTER, 'next.cloud', null],
+            [IAccountManager::PROPERTY_TWITTER, 'ab/cd.zip', null],
+            [IAccountManager::PROPERTY_TWITTER, 'tooLongForTwitterAndX', null],
+
+            [IAccountManager::PROPERTY_FEDIVERSE, 'nextcloud@mastodon.social', 'nextcloud@mastodon.social'],
+            [IAccountManager::PROPERTY_FEDIVERSE, '@nextcloud@mastodon.xyz', 'nextcloud@mastodon.xyz'],
+            [IAccountManager::PROPERTY_FEDIVERSE, 'l33t.h4x0r@sub.localhost.local', 'l33t.h4x0r@sub.localhost.local'],
+            [IAccountManager::PROPERTY_FEDIVERSE, 'invalid/name@mastodon.social', null],
+            [IAccountManager::PROPERTY_FEDIVERSE, 'name@evil.host/malware.exe', null],
+            [IAccountManager::PROPERTY_FEDIVERSE, '@is-it-a-host-or-name', null],
+            [IAccountManager::PROPERTY_FEDIVERSE, 'only-a-name', null],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSanitizeOnUpdate')]
+    public function testSanitizingOnUpdateAccount(string $property, string $input, ?string $output): void {
+
+        if ($property === IAccountManager::PROPERTY_FEDIVERSE) {
+            // We do not test the server response here we do this in the `testSanitizingFediverseServer`
+            $this->config
+                ->method('getSystemValueBool')
+                ->with('has_internet_connection', true)
+                ->willReturn(false);
+        }
+
+        $user = $this->createMock(IUser::class);
+
+        $account = new Account($user);
+        $account->setProperty($property, $input, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
+
+        $manager = $this->getInstance(['getUser', 'updateUser']);
+        $manager->method('getUser')
+            ->with($user, false)
+            ->willReturn([]);
+        $manager->expects($output === null ? self::never() : self::once())
+            ->method('updateUser');
+
+        if ($output === null) {
+            $this->expectException(\InvalidArgumentException::class);
+            $this->expectExceptionMessage($property);
+        }
+
+        $manager->updateAccount($account);
+
+        if ($output !== null) {
+            self::assertEquals($output, $account->getProperty($property)->getValue());
+        }
+    }
+
+    public static function dataSanitizeFediverseServer(): array {
+        return [
+            'no internet' => [
+                '@foo@example.com',
+                'foo@example.com',
+                false,
+                null,
+            ],
+            'no internet - no at' => [
+                'foo@example.com',
+                'foo@example.com',
+                false,
+                null,
+            ],
+            'valid response' => [
+                '@foo@example.com',
+                'foo@example.com',
+                true,
+                json_encode([
+                    'subject' => 'acct:foo@example.com',
+                    'links' => [
+                        [
+                            'rel' => 'self',
+                            'type' => 'application/activity+json',
+                            'href' => 'https://example.com/users/foo',
+                        ],
+                    ],
+                ]),
+            ],
+            'valid response - no at' => [
+                'foo@example.com',
+                'foo@example.com',
+                true,
+                json_encode([
+                    'subject' => 'acct:foo@example.com',
+                    'links' => [
+                        [
+                            'rel' => 'self',
+                            'type' => 'application/activity+json',
+                            'href' => 'https://example.com/users/foo',
+                        ],
+                    ],
+                ]),
+            ],
+            // failures
+            'invalid response' => [
+                '@foo@example.com',
+                null,
+                true,
+                json_encode([
+                    'subject' => 'acct:foo@example.com',
+                    'links' => [],
+                ]),
+            ],
+            'no response' => [
+                '@foo@example.com',
+                null,
+                true,
+                null,
+            ],
+            'wrong user' => [
+                '@foo@example.com',
+                null,
+                true,
+                json_encode([
+                    'links' => [],
+                ]),
+            ],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSanitizeFediverseServer')]
+    public function testSanitizingFediverseServer(string $input, ?string $output, bool $hasInternet, ?string $serverResponse): void {
+        $this->config->expects(self::once())
+            ->method('getSystemValueBool')
+            ->with('has_internet_connection', true)
+            ->willReturn($hasInternet);
+
+        if ($hasInternet) {
+            $client = $this->createMock(IClient::class);
+            if ($serverResponse !== null) {
+                $response = $this->createMock(IResponse::class);
+                $response->method('getBody')
+                    ->willReturn($serverResponse);
+                $client->expects(self::once())
+                    ->method('get')
+                    ->with('https://example.com/.well-known/webfinger?resource=acct:foo@example.com')
+                    ->willReturn($response);
+            } else {
+                $client->expects(self::once())
+                    ->method('get')
+                    ->with('https://example.com/.well-known/webfinger?resource=acct:foo@example.com')
+                    ->willThrowException(new \Exception('404'));
+            }
+
+            $this->clientService
+                ->expects(self::once())
+                ->method('newClient')
+                ->willReturn($client);
+        } else {
+            $this->clientService
+                ->expects(self::never())
+                ->method('newClient');
+        }
+
+        $user = $this->createMock(IUser::class);
+        $account = new Account($user);
+        $account->setProperty(IAccountManager::PROPERTY_FEDIVERSE, $input, IAccountManager::SCOPE_LOCAL, IAccountManager::NOT_VERIFIED);
+
+        $manager = $this->getInstance(['getUser', 'updateUser']);
+        $manager->method('getUser')
+            ->with($user, false)
+            ->willReturn([]);
+        $manager->expects($output === null ? self::never() : self::once())
+            ->method('updateUser');
+
+        if ($output === null) {
+            $this->expectException(\InvalidArgumentException::class);
+            $this->expectExceptionMessage(IAccountManager::PROPERTY_FEDIVERSE);
+        }
+
+        $manager->updateAccount($account);
+
+        if ($output !== null) {
+            self::assertEquals($output, $account->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getValue());
+        }
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('searchDataProvider')]
+    public function testSearchUsers(string $property, array $values, array $expected): void {
+        $this->populateOrUpdate();
+
+        $matchedUsers = $this->accountManager->searchUsers($property, $values);
+        foreach ($expected as $expectedEntry) {
+            $this->assertContains($expectedEntry, $matchedUsers);
+        }
+        if (empty($expected)) {
+            $this->assertEmpty($matchedUsers);
+        }
+    }
+
+    public static function searchDataProvider(): array {
+        return [
+            [ #0 Search for an existing name
+                IAccountManager::PROPERTY_DISPLAYNAME,
+                ['Jane Doe'],
+                ['Jane Doe' => 'j.doe']
+            ],
+            [ #1 Search for part of a name (no result)
+                IAccountManager::PROPERTY_DISPLAYNAME,
+                ['Jane'],
+                []
+            ],
+            [ #2 Search for part of a name (no result, test wildcard)
+                IAccountManager::PROPERTY_DISPLAYNAME,
+                ['Jane%'],
+                []
+            ],
+            [ #3 Search for phone
+                IAccountManager::PROPERTY_PHONE,
+                ['+491603121212'],
+                ['+491603121212' => 'b32c5a5b-1084-4380-8856-e5223b16de9f'],
+            ],
+            [ #4 Search for twitter handles
+                IAccountManager::PROPERTY_TWITTER,
+                ['@sometwitter', '@a_alice', '@unseen'],
+                ['@sometwitter' => 'j.doe', '@a_alice' => 'a.allison'],
+            ],
+            [ #5 Search for email
+                IAccountManager::PROPERTY_EMAIL,
+                ['cheng@emca.com'],
+                ['cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb'],
+            ],
+            [ #6 Search for email by additional email
+                IAccountManager::PROPERTY_EMAIL,
+                ['kai.cheng@emca.com'],
+                ['kai.cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb'],
+            ],
+            [ #7 Search for additional email
+                IAccountManager::COLLECTION_EMAIL,
+                ['kai.cheng@emca.com', 'cheng@emca.com'],
+                ['kai.cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb'],
+            ],
+            [ #8 Search for email by additional email (two valid search values, but the same user)
+                IAccountManager::PROPERTY_EMAIL,
+                ['kai.cheng@emca.com', 'cheng@emca.com'],
+                [
+                    'kai.cheng@emca.com' => '31b5316a-9b57-4b17-970a-315a4cbe73eb',
+                ],
+            ],
+        ];
+    }
+
+    public static function dataCheckEmailVerification(): array {
+        return [
+            [['steve', 'Steve Smith', 'steve@steve.steve'], null],
+            [['emma', 'Emma Morales', 'emma@emma.com'], 'emma@morales.com'],
+            [['sarah@web.org', 'Sarah Foster', 'sarah@web.org'], null],
+            [['cole@web.org', 'Cole Harrison', 'cole@web.org'], 'cole@example.com'],
+            [['8d29e358-cf69-4849-bbf9-28076c0b908b', 'Alice McPherson', 'alice@example.com'], 'alice@mcpherson.com'],
+            [['11da2744-3f4d-4c17-8c13-4c057a379237', 'James Loranger', 'james@example.com'], ''],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataCheckEmailVerification')]
+    public function testCheckEmailVerification(array $userData, ?string $newEmail): void {
+        $user = $this->makeUser(...$userData);
+        // Once because of getAccount, once because of getUser
+        $this->config->expects($this->exactly(2))->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn([]);
+        $account = $this->accountManager->getAccount($user);
+        $emailUpdated = false;
+
+        if (!empty($newEmail)) {
+            $account->getProperty(IAccountManager::PROPERTY_EMAIL)->setValue($newEmail);
+            $emailUpdated = true;
+        }
+
+        if ($emailUpdated) {
+            $this->jobList->expects($this->once())
+                ->method('add')
+                ->with(VerifyUserData::class);
+        } else {
+            $this->jobList->expects($this->never())
+                ->method('add')
+                ->with(VerifyUserData::class);
+        }
+
+        /** @var array $oldData */
+        $oldData = $this->invokePrivate($this->accountManager, 'getUser', [$user, false]);
+        $this->invokePrivate($this->accountManager, 'checkEmailVerification', [$account, $oldData]);
+    }
+
+    public static function dataSetDefaultPropertyScopes(): array {
+        return [
+            [
+                [],
+                [
+                    IAccountManager::PROPERTY_DISPLAYNAME => IAccountManager::SCOPE_FEDERATED,
+                    IAccountManager::PROPERTY_ADDRESS => IAccountManager::SCOPE_LOCAL,
+                    IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_FEDERATED,
+                    IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_LOCAL,
+                ]
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_DISPLAYNAME => IAccountManager::SCOPE_FEDERATED,
+                    IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_LOCAL,
+                    IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
+                ], [
+                    IAccountManager::PROPERTY_DISPLAYNAME => IAccountManager::SCOPE_FEDERATED,
+                    IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_LOCAL,
+                    IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
+                ]
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_ADDRESS => 'invalid scope',
+                    'invalid property' => IAccountManager::SCOPE_LOCAL,
+                    IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
+                ],
+                [
+                    IAccountManager::PROPERTY_ADDRESS => IAccountManager::SCOPE_LOCAL,
+                    IAccountManager::PROPERTY_EMAIL => IAccountManager::SCOPE_FEDERATED,
+                    IAccountManager::PROPERTY_ROLE => IAccountManager::SCOPE_PRIVATE,
+                ]
+            ],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSetDefaultPropertyScopes')]
+    public function testSetDefaultPropertyScopes(array $propertyScopes, array $expectedResultScopes): void {
+        $user = $this->makeUser('steve', 'Steve Smith', 'steve@steve.steve');
+        $this->config->expects($this->once())->method('getSystemValue')->with('account_manager.default_property_scope', [])->willReturn($propertyScopes);
+
+        $result = $this->invokePrivate($this->accountManager, 'buildDefaultUserRecord', [$user]);
+        $resultProperties = array_column($result, 'name');
+
+        $this->assertEmpty(array_diff($resultProperties, IAccountManager::ALLOWED_PROPERTIES), 'Building default user record returned non-allowed properties');
+        foreach ($expectedResultScopes as $expectedResultScopeKey => $expectedResultScopeValue) {
+            $resultScope = $result[array_search($expectedResultScopeKey, $resultProperties)]['scope'];
+            $this->assertEquals($expectedResultScopeValue, $resultScope, "The result scope doesn't follow the value set into the config or defaults correctly.");
+        }
+    }
 }

apps/settings/tests/Controller/UsersControllerTest.php

Indentation +951 added lines, -951 removed lines

@@ -42,955 +42,955 @@
  * @package Tests\Settings\Controller
  */
 class UsersControllerTest extends \Test\TestCase {
-	private IGroupManager&MockObject $groupManager;
-	private UserManager&MockObject $userManager;
-	private IUserSession&MockObject $userSession;
-	private IConfig&MockObject $config;
-	private IMailer&MockObject $mailer;
-	private IFactory&MockObject $l10nFactory;
-	private IAppManager&MockObject $appManager;
-	private IL10N&MockObject $l;
-	private AccountManager&MockObject $accountManager;
-	private IJobList&MockObject $jobList;
-	private \OC\Security\IdentityProof\Manager&MockObject $securityManager;
-	private IManager&MockObject $encryptionManager;
-	private KnownUserService&MockObject $knownUserService;
-	private IEncryptionModule&MockObject $encryptionModule;
-	private IEventDispatcher&MockObject $dispatcher;
-	private IInitialState&MockObject $initialState;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->userManager = $this->createMock(UserManager::class);
-		$this->groupManager = $this->createMock(Manager::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->l = $this->createMock(IL10N::class);
-		$this->mailer = $this->createMock(IMailer::class);
-		$this->l10nFactory = $this->createMock(IFactory::class);
-		$this->appManager = $this->createMock(IAppManager::class);
-		$this->accountManager = $this->createMock(AccountManager::class);
-		$this->securityManager = $this->createMock(\OC\Security\IdentityProof\Manager::class);
-		$this->jobList = $this->createMock(IJobList::class);
-		$this->encryptionManager = $this->createMock(IManager::class);
-		$this->knownUserService = $this->createMock(KnownUserService::class);
-		$this->dispatcher = $this->createMock(IEventDispatcher::class);
-		$this->initialState = $this->createMock(IInitialState::class);
-
-		$this->l->method('t')
-			->willReturnCallback(function ($text, $parameters = []) {
-				return vsprintf($text, $parameters);
-			});
-
-		$this->encryptionModule = $this->createMock(IEncryptionModule::class);
-		$this->encryptionManager->expects($this->any())->method('getEncryptionModules')
-			->willReturn(['encryptionModule' => ['callback' => function () {
-				return $this->encryptionModule;
-			}]]);
-	}
-
-	/**
-	 * @param bool $isAdmin
-	 * @return UsersController|MockObject
-	 */
-	protected function getController(bool $isAdmin = false, array $mockedMethods = []) {
-		$this->groupManager->expects($this->any())
-			->method('isAdmin')
-			->willReturn($isAdmin);
-
-		if (empty($mockedMethods)) {
-			return new UsersController(
-				'settings',
-				$this->createMock(IRequest::class),
-				$this->userManager,
-				$this->groupManager,
-				$this->userSession,
-				$this->config,
-				$this->l,
-				$this->mailer,
-				$this->l10nFactory,
-				$this->appManager,
-				$this->accountManager,
-				$this->securityManager,
-				$this->jobList,
-				$this->encryptionManager,
-				$this->knownUserService,
-				$this->dispatcher,
-				$this->initialState,
-			);
-		} else {
-			return $this->getMockBuilder(UsersController::class)
-				->setConstructorArgs(
-					[
-						'settings',
-						$this->createMock(IRequest::class),
-						$this->userManager,
-						$this->groupManager,
-						$this->userSession,
-						$this->config,
-						$this->l,
-						$this->mailer,
-						$this->l10nFactory,
-						$this->appManager,
-						$this->accountManager,
-						$this->securityManager,
-						$this->jobList,
-						$this->encryptionManager,
-						$this->knownUserService,
-						$this->dispatcher,
-						$this->initialState,
-					]
-				)
-				->onlyMethods($mockedMethods)
-				->getMock();
-		}
-	}
-
-	protected function buildPropertyMock(string $name, string $value, string $scope, string $verified = IAccountManager::VERIFIED): MockObject {
-		$property = $this->createMock(IAccountProperty::class);
-		$property->expects($this->any())
-			->method('getName')
-			->willReturn($name);
-		$property->expects($this->any())
-			->method('getValue')
-			->willReturn($value);
-		$property->expects($this->any())
-			->method('getScope')
-			->willReturn($scope);
-		$property->expects($this->any())
-			->method('getVerified')
-			->willReturn($verified);
-
-		return $property;
-	}
-
-	protected function getDefaultAccountMock(): MockObject {
-		$propertyMocks = [
-			IAccountManager::PROPERTY_DISPLAYNAME => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_DISPLAYNAME,
-				'Default display name',
-				IAccountManager::SCOPE_FEDERATED,
-			),
-			IAccountManager::PROPERTY_ADDRESS => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_ADDRESS,
-				'Default address',
-				IAccountManager::SCOPE_LOCAL,
-			),
-			IAccountManager::PROPERTY_WEBSITE => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_WEBSITE,
-				'Default website',
-				IAccountManager::SCOPE_LOCAL,
-			),
-			IAccountManager::PROPERTY_EMAIL => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_EMAIL,
-				'Default email',
-				IAccountManager::SCOPE_FEDERATED,
-			),
-			IAccountManager::PROPERTY_AVATAR => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_AVATAR,
-				'',
-				IAccountManager::SCOPE_FEDERATED,
-			),
-			IAccountManager::PROPERTY_PHONE => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_PHONE,
-				'Default phone',
-				IAccountManager::SCOPE_LOCAL,
-			),
-			IAccountManager::PROPERTY_TWITTER => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_TWITTER,
-				'Default twitter',
-				IAccountManager::SCOPE_LOCAL,
-			),
-			IAccountManager::PROPERTY_BLUESKY => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_BLUESKY,
-				'Default bluesky',
-				IAccountManager::SCOPE_LOCAL,
-			),
-			IAccountManager::PROPERTY_FEDIVERSE => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_FEDIVERSE,
-				'Default fediverse',
-				IAccountManager::SCOPE_LOCAL,
-			),
-			IAccountManager::PROPERTY_BIRTHDATE => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_BIRTHDATE,
-				'Default birthdate',
-				IAccountManager::SCOPE_LOCAL,
-			),
-			IAccountManager::PROPERTY_PRONOUNS => $this->buildPropertyMock(
-				IAccountManager::PROPERTY_PRONOUNS,
-				'Default pronouns',
-				IAccountManager::SCOPE_LOCAL,
-			),
-		];
-
-		$account = $this->createMock(IAccount::class);
-		$account->expects($this->any())
-			->method('getProperty')
-			->willReturnCallback(function (string $propertyName) use ($propertyMocks) {
-				if (isset($propertyMocks[$propertyName])) {
-					return $propertyMocks[$propertyName];
-				}
-				throw new PropertyDoesNotExistException($propertyName);
-			});
-		$account->expects($this->any())
-			->method('getProperties')
-			->willReturn($propertyMocks);
-
-		return $account;
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetUserSettings')]
-	public function testSetUserSettings(string $email, bool $validEmail, int $expectedStatus): void {
-		$controller = $this->getController(false, ['saveUserSettings']);
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('johndoe');
-
-		$this->userSession->method('getUser')->willReturn($user);
-
-		if (!empty($email) && $validEmail) {
-			$this->mailer->expects($this->once())->method('validateMailAddress')
-				->willReturn($validEmail);
-		}
-
-		$saveData = (!empty($email) && $validEmail) || empty($email);
-
-		if ($saveData) {
-			$this->accountManager->expects($this->once())
-				->method('getAccount')
-				->with($user)
-				->willReturn($this->getDefaultAccountMock());
-
-			$controller->expects($this->once())
-				->method('saveUserSettings');
-		} else {
-			$controller->expects($this->never())->method('saveUserSettings');
-		}
-
-		$result = $controller->setUserSettings(
-			AccountManager::SCOPE_FEDERATED,
-			'displayName',
-			AccountManager::SCOPE_FEDERATED,
-			'47658468',
-			AccountManager::SCOPE_FEDERATED,
-			$email,
-			AccountManager::SCOPE_FEDERATED,
-			'nextcloud.com',
-			AccountManager::SCOPE_FEDERATED,
-			'street and city',
-			AccountManager::SCOPE_FEDERATED,
-			'@nextclouders',
-			AccountManager::SCOPE_FEDERATED,
-			'@nextclouders',
-			AccountManager::SCOPE_FEDERATED,
-			'2020-01-01',
-			AccountManager::SCOPE_FEDERATED,
-			'they/them',
-			AccountManager::SCOPE_FEDERATED,
-		);
-
-		$this->assertSame($expectedStatus, $result->getStatus());
-	}
-
-	public static function dataTestSetUserSettings(): array {
-		return [
-			['', true, Http::STATUS_OK],
-			['', false, Http::STATUS_OK],
-			['example.com', false, Http::STATUS_UNPROCESSABLE_ENTITY],
-			['john@example.com', true, Http::STATUS_OK],
-		];
-	}
-
-	public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed(): void {
-		$controller = $this->getController(false, ['saveUserSettings']);
-
-		$avatarScope = IAccountManager::SCOPE_PUBLISHED;
-		$displayName = 'Display name';
-		$displayNameScope = IAccountManager::SCOPE_PUBLISHED;
-		$phone = '47658468';
-		$phoneScope = IAccountManager::SCOPE_PUBLISHED;
-		$email = 'john@example.com';
-		$emailScope = IAccountManager::SCOPE_PUBLISHED;
-		$website = 'nextcloud.com';
-		$websiteScope = IAccountManager::SCOPE_PUBLISHED;
-		$address = 'street and city';
-		$addressScope = IAccountManager::SCOPE_PUBLISHED;
-		$twitter = '@nextclouders';
-		$twitterScope = IAccountManager::SCOPE_PUBLISHED;
-		$fediverse = '@nextclouders@floss.social';
-		$fediverseScope = IAccountManager::SCOPE_PUBLISHED;
-		$birtdate = '2020-01-01';
-		$birthdateScope = IAccountManager::SCOPE_PUBLISHED;
-		$pronouns = 'she/her';
-		$pronounsScope = IAccountManager::SCOPE_PUBLISHED;
-
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('johndoe');
-
-		$this->userSession->method('getUser')->willReturn($user);
-
-		/** @var MockObject|IAccount $userAccount */
-		$userAccount = $this->getDefaultAccountMock();
-		$this->accountManager->expects($this->once())
-			->method('getAccount')
-			->with($user)
-			->willReturn($userAccount);
-
-		/** @var MockObject|IAccountProperty $avatarProperty */
-		$avatarProperty = $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR);
-		$avatarProperty->expects($this->atLeastOnce())
-			->method('setScope')
-			->with($avatarScope)
-			->willReturnSelf();
-
-		/** @var MockObject|IAccountProperty $avatarProperty */
-		$avatarProperty = $userAccount->getProperty(IAccountManager::PROPERTY_ADDRESS);
-		$avatarProperty->expects($this->atLeastOnce())
-			->method('setScope')
-			->with($addressScope)
-			->willReturnSelf();
-		$avatarProperty->expects($this->atLeastOnce())
-			->method('setValue')
-			->with($address)
-			->willReturnSelf();
-
-		/** @var MockObject|IAccountProperty $emailProperty */
-		$emailProperty = $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL);
-		$emailProperty->expects($this->never())
-			->method('setValue');
-		$emailProperty->expects($this->never())
-			->method('setScope');
-
-		/** @var MockObject|IAccountProperty $emailProperty */
-		$emailProperty = $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME);
-		$emailProperty->expects($this->never())
-			->method('setValue');
-		$emailProperty->expects($this->never())
-			->method('setScope');
-
-		$this->config->expects($this->once())
-			->method('getSystemValueBool')
-			->with('allow_user_to_change_display_name')
-			->willReturn(false);
-
-		$this->appManager->expects($this->any())
-			->method('isEnabledForUser')
-			->with('federatedfilesharing')
-			->willReturn(true);
-
-		$this->mailer->expects($this->once())->method('validateMailAddress')
-			->willReturn(true);
-
-		$controller->expects($this->once())
-			->method('saveUserSettings');
-
-		$controller->setUserSettings(
-			$avatarScope,
-			$displayName,
-			$displayNameScope,
-			$phone,
-			$phoneScope,
-			$email,
-			$emailScope,
-			$website,
-			$websiteScope,
-			$address,
-			$addressScope,
-			$twitter,
-			$twitterScope,
-			$fediverse,
-			$fediverseScope,
-			$birtdate,
-			$birthdateScope,
-			$pronouns,
-			$pronounsScope,
-		);
-	}
-
-	public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void {
-		$controller = $this->getController(false, ['saveUserSettings']);
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('johndoe');
-
-		$this->userSession->method('getUser')->willReturn($user);
-
-		$defaultProperties = []; //$this->getDefaultAccountMock();
-
-		$userAccount = $this->getDefaultAccountMock();
-		$this->accountManager->expects($this->once())
-			->method('getAccount')
-			->with($user)
-			->willReturn($userAccount);
-
-		$this->appManager->expects($this->any())
-			->method('isEnabledForUser')
-			->with('federatedfilesharing')
-			->willReturn(false);
-
-		$avatarScope = IAccountManager::SCOPE_PUBLISHED;
-		$displayName = 'Display name';
-		$displayNameScope = IAccountManager::SCOPE_PUBLISHED;
-		$phone = '47658468';
-		$phoneScope = IAccountManager::SCOPE_PUBLISHED;
-		$email = 'john@example.com';
-		$emailScope = IAccountManager::SCOPE_PUBLISHED;
-		$website = 'nextcloud.com';
-		$websiteScope = IAccountManager::SCOPE_PUBLISHED;
-		$address = 'street and city';
-		$addressScope = IAccountManager::SCOPE_PUBLISHED;
-		$twitter = '@nextclouders';
-		$twitterScope = IAccountManager::SCOPE_PUBLISHED;
-		$bluesky = 'nextclouders.net';
-		$blueskyScope = IAccountManager::SCOPE_PUBLISHED;
-		$fediverse = '@nextclouders@floss.social';
-		$fediverseScope = IAccountManager::SCOPE_PUBLISHED;
-		$birthdate = '2020-01-01';
-		$birthdateScope = IAccountManager::SCOPE_PUBLISHED;
-		$pronouns = 'she/her';
-		$pronounsScope = IAccountManager::SCOPE_PUBLISHED;
-
-		// All settings are changed (in the past phone, website, address and
-		// twitter were not changed).
-		$expectedProperties = $defaultProperties;
-		$expectedProperties[IAccountManager::PROPERTY_AVATAR]['scope'] = $avatarScope;
-		$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayName;
-		$expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['scope'] = $displayNameScope;
-		$expectedProperties[IAccountManager::PROPERTY_EMAIL]['value'] = $email;
-		$expectedProperties[IAccountManager::PROPERTY_EMAIL]['scope'] = $emailScope;
-		$expectedProperties[IAccountManager::PROPERTY_PHONE]['value'] = $phone;
-		$expectedProperties[IAccountManager::PROPERTY_PHONE]['scope'] = $phoneScope;
-		$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['value'] = $website;
-		$expectedProperties[IAccountManager::PROPERTY_WEBSITE]['scope'] = $websiteScope;
-		$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['value'] = $address;
-		$expectedProperties[IAccountManager::PROPERTY_ADDRESS]['scope'] = $addressScope;
-		$expectedProperties[IAccountManager::PROPERTY_TWITTER]['value'] = $twitter;
-		$expectedProperties[IAccountManager::PROPERTY_TWITTER]['scope'] = $twitterScope;
-		$expectedProperties[IAccountManager::PROPERTY_BLUESKY]['value'] = $bluesky;
-		$expectedProperties[IAccountManager::PROPERTY_BLUESKY]['scope'] = $blueskyScope;
-		$expectedProperties[IAccountManager::PROPERTY_FEDIVERSE]['value'] = $fediverse;
-		$expectedProperties[IAccountManager::PROPERTY_FEDIVERSE]['scope'] = $fediverseScope;
-		$expectedProperties[IAccountManager::PROPERTY_BIRTHDATE]['value'] = $birthdate;
-		$expectedProperties[IAccountManager::PROPERTY_BIRTHDATE]['scope'] = $birthdateScope;
-		$expectedProperties[IAccountManager::PROPERTY_PRONOUNS]['value'] = $pronouns;
-		$expectedProperties[IAccountManager::PROPERTY_PRONOUNS]['scope'] = $pronounsScope;
-
-		$this->mailer->expects($this->once())->method('validateMailAddress')
-			->willReturn(true);
-
-		$controller->expects($this->once())
-			->method('saveUserSettings')
-			->with($userAccount);
-
-		$controller->setUserSettings(
-			$avatarScope,
-			$displayName,
-			$displayNameScope,
-			$phone,
-			$phoneScope,
-			$email,
-			$emailScope,
-			$website,
-			$websiteScope,
-			$address,
-			$addressScope,
-			$twitter,
-			$twitterScope,
-			$bluesky,
-			$blueskyScope,
-			$fediverse,
-			$fediverseScope,
-			$birthdate,
-			$birthdateScope,
-			$pronouns,
-			$pronounsScope,
-		);
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetUserSettingsSubset')]
-	public function testSetUserSettingsSubset(string $property, string $propertyValue): void {
-		$controller = $this->getController(false, ['saveUserSettings']);
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')->willReturn('johndoe');
-
-		$this->userSession->method('getUser')->willReturn($user);
-
-		/** @var IAccount&MockObject $userAccount */
-		$userAccount = $this->getDefaultAccountMock();
-
-		$this->accountManager->expects($this->once())
-			->method('getAccount')
-			->with($user)
-			->willReturn($userAccount);
-
-		$avatarScope = ($property === 'avatarScope') ? $propertyValue : null;
-		$displayName = ($property === 'displayName') ? $propertyValue : null;
-		$displayNameScope = ($property === 'displayNameScope') ? $propertyValue : null;
-		$phone = ($property === 'phone') ? $propertyValue : null;
-		$phoneScope = ($property === 'phoneScope') ? $propertyValue : null;
-		$email = ($property === 'email') ? $propertyValue : null;
-		$emailScope = ($property === 'emailScope') ? $propertyValue : null;
-		$website = ($property === 'website') ? $propertyValue : null;
-		$websiteScope = ($property === 'websiteScope') ? $propertyValue : null;
-		$address = ($property === 'address') ? $propertyValue : null;
-		$addressScope = ($property === 'addressScope') ? $propertyValue : null;
-		$twitter = ($property === 'twitter') ? $propertyValue : null;
-		$twitterScope = ($property === 'twitterScope') ? $propertyValue : null;
-		$bluesky = ($property === 'bluesky') ? $propertyValue : null;
-		$blueskyScope = ($property === 'blueskyScope') ? $propertyValue : null;
-		$fediverse = ($property === 'fediverse') ? $propertyValue : null;
-		$fediverseScope = ($property === 'fediverseScope') ? $propertyValue : null;
-		$birthdate = ($property === 'birthdate') ? $propertyValue : null;
-		$birthdateScope = ($property === 'birthdateScope') ? $propertyValue : null;
-		$pronouns = ($property === 'pronouns') ? $propertyValue : null;
-		$pronounsScope = ($property === 'pronounsScope') ? $propertyValue : null;
-
-		/** @var IAccountProperty[]&MockObject[] $expectedProperties */
-		$expectedProperties = $userAccount->getProperties();
-		$isScope = strrpos($property, 'Scope') === strlen($property) - strlen('5');
-		switch ($property) {
-			case 'avatarScope':
-				$propertyId = IAccountManager::PROPERTY_AVATAR;
-				break;
-			case 'displayName':
-			case 'displayNameScope':
-				$propertyId = IAccountManager::PROPERTY_DISPLAYNAME;
-				break;
-			case 'phone':
-			case 'phoneScope':
-				$propertyId = IAccountManager::PROPERTY_PHONE;
-				break;
-			case 'email':
-			case 'emailScope':
-				$propertyId = IAccountManager::PROPERTY_EMAIL;
-				break;
-			case 'website':
-			case 'websiteScope':
-				$propertyId = IAccountManager::PROPERTY_WEBSITE;
-				break;
-			case 'address':
-			case 'addressScope':
-				$propertyId = IAccountManager::PROPERTY_ADDRESS;
-				break;
-			case 'twitter':
-			case 'twitterScope':
-				$propertyId = IAccountManager::PROPERTY_TWITTER;
-				break;
-			case 'bluesky':
-			case 'blueskyScope':
-				$propertyId = IAccountManager::PROPERTY_BLUESKY;
-				break;
-			case 'fediverse':
-			case 'fediverseScope':
-				$propertyId = IAccountManager::PROPERTY_FEDIVERSE;
-				break;
-			case 'birthdate':
-			case 'birthdateScope':
-				$propertyId = IAccountManager::PROPERTY_BIRTHDATE;
-				break;
-			case 'pronouns':
-			case 'pronounsScope':
-				$propertyId = IAccountManager::PROPERTY_PRONOUNS;
-				break;
-			default:
-				$propertyId = '404';
-		}
-		$expectedProperties[$propertyId]->expects($this->any())
-			->method($isScope ? 'getScope' : 'getValue')
-			->willReturn($propertyValue);
-
-		if (!empty($email)) {
-			$this->mailer->expects($this->once())->method('validateMailAddress')
-				->willReturn(true);
-		}
-
-		$controller->expects($this->once())
-			->method('saveUserSettings')
-			->with($userAccount);
-
-		$controller->setUserSettings(
-			$avatarScope,
-			$displayName,
-			$displayNameScope,
-			$phone,
-			$phoneScope,
-			$email,
-			$emailScope,
-			$website,
-			$websiteScope,
-			$address,
-			$addressScope,
-			$twitter,
-			$twitterScope,
-			$bluesky,
-			$blueskyScope,
-			$fediverse,
-			$fediverseScope,
-			$birthdate,
-			$birthdateScope,
-			$pronouns,
-			$pronounsScope,
-		);
-	}
-
-	public static function dataTestSetUserSettingsSubset(): array {
-		return [
-			['avatarScope', IAccountManager::SCOPE_PUBLISHED],
-			['displayName', 'Display name'],
-			['displayNameScope', IAccountManager::SCOPE_PUBLISHED],
-			['phone', '47658468'],
-			['phoneScope', IAccountManager::SCOPE_PUBLISHED],
-			['email', 'john@example.com'],
-			['emailScope', IAccountManager::SCOPE_PUBLISHED],
-			['website', 'nextcloud.com'],
-			['websiteScope', IAccountManager::SCOPE_PUBLISHED],
-			['address', 'street and city'],
-			['addressScope', IAccountManager::SCOPE_PUBLISHED],
-			['twitter', '@nextclouders'],
-			['twitterScope', IAccountManager::SCOPE_PUBLISHED],
-			['bluesky', 'nextclouders.net'],
-			['blueskyScope', IAccountManager::SCOPE_PUBLISHED],
-			['fediverse', '@nextclouders@floss.social'],
-			['fediverseScope', IAccountManager::SCOPE_PUBLISHED],
-			['birthdate', '2020-01-01'],
-			['birthdateScope', IAccountManager::SCOPE_PUBLISHED],
-			['pronouns', 'he/him'],
-			['pronounsScope', IAccountManager::SCOPE_PUBLISHED],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestSaveUserSettings')]
-	public function testSaveUserSettings(array $data, ?string $oldEmailAddress, ?string $oldDisplayName): void {
-		$controller = $this->getController();
-		$user = $this->createMock(IUser::class);
-
-		$user->method('getDisplayName')->willReturn($oldDisplayName);
-		$user->method('getSystemEMailAddress')->willReturn($oldEmailAddress);
-		$user->method('canChangeDisplayName')->willReturn(true);
-
-		if (strtolower($data[IAccountManager::PROPERTY_EMAIL]['value']) === strtolower($oldEmailAddress ?? '')) {
-			$user->expects($this->never())->method('setSystemEMailAddress');
-		} else {
-			$user->expects($this->once())->method('setSystemEMailAddress')
-				->with($data[IAccountManager::PROPERTY_EMAIL]['value']);
-		}
-
-		if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] === $oldDisplayName ?? '') {
-			$user->expects($this->never())->method('setDisplayName');
-		} else {
-			$user->expects($this->once())->method('setDisplayName')
-				->with($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'])
-				->willReturn(true);
-		}
-
-		$properties = [];
-		foreach ($data as $propertyName => $propertyData) {
-			$properties[$propertyName] = $this->createMock(IAccountProperty::class);
-			$properties[$propertyName]->expects($this->any())
-				->method('getValue')
-				->willReturn($propertyData['value']);
-		}
-
-		$account = $this->createMock(IAccount::class);
-		$account->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$account->expects($this->any())
-			->method('getProperty')
-			->willReturnCallback(function (string $propertyName) use ($properties) {
-				return $properties[$propertyName];
-			});
-
-		$this->accountManager->expects($this->any())
-			->method('getAccount')
-			->willReturn($account);
-
-		$this->accountManager->expects($this->once())
-			->method('updateAccount')
-			->with($account);
-
-		$this->invokePrivate($controller, 'saveUserSettings', [$account]);
-	}
-
-	public static function dataTestSaveUserSettings(): array {
-		return [
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'john@example.com',
-				'john doe'
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'johnNew@example.com',
-				'john New doe'
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'johnNew@example.com',
-				'john doe'
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'john@example.com',
-				'john New doe'
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => ''],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				null,
-				'john New doe'
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'john@example.com',
-				null
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'JOHN@example.com',
-				null
-			],
-
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestSaveUserSettingsException')]
-	public function testSaveUserSettingsException(
-		array $data,
-		string $oldEmailAddress,
-		string $oldDisplayName,
-		bool $setDisplayNameResult,
-		bool $canChangeEmail,
-	): void {
-		$this->expectException(ForbiddenException::class);
-
-		$controller = $this->getController();
-		$user = $this->createMock(IUser::class);
-
-		$user->method('getDisplayName')->willReturn($oldDisplayName);
-		$user->method('getEMailAddress')->willReturn($oldEmailAddress);
-
-		/** @var MockObject|IAccount $userAccount */
-		$userAccount = $this->createMock(IAccount::class);
-		$userAccount->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$propertyMocks = [];
-		foreach ($data as $propertyName => $propertyData) {
-			/** @var MockObject|IAccountProperty $property */
-			$propertyMocks[$propertyName] = $this->buildPropertyMock($propertyName, $propertyData['value'], '');
-		}
-		$userAccount->expects($this->any())
-			->method('getProperty')
-			->willReturnCallback(function (string $propertyName) use ($propertyMocks) {
-				return $propertyMocks[$propertyName];
-			});
-
-		if ($data[IAccountManager::PROPERTY_EMAIL]['value'] !== $oldEmailAddress) {
-			$user->method('canChangeDisplayName')
-				->willReturn($canChangeEmail);
-		}
-
-		if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] !== $oldDisplayName) {
-			$user->method('setDisplayName')
-				->with($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'])
-				->willReturn($setDisplayNameResult);
-		}
-
-		$this->invokePrivate($controller, 'saveUserSettings', [$userAccount]);
-	}
-
-
-	public static function dataTestSaveUserSettingsException(): array {
-		return [
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'johnNew@example.com',
-				'john New doe',
-				true,
-				false
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'johnNew@example.com',
-				'john New doe',
-				false,
-				true
-			],
-			[
-				[
-					IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
-					IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
-				],
-				'johnNew@example.com',
-				'john New doe',
-				false,
-				false
-			],
-
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetVerificationCode')]
-	public function testGetVerificationCode(string $account, string $type, array $dataBefore, array $expectedData, bool $onlyVerificationCode): void {
-		$message = 'Use my Federated Cloud ID to share with me: user@nextcloud.com';
-		$signature = 'theSignature';
-
-		$code = $message . ' ' . $signature;
-		if ($type === IAccountManager::PROPERTY_TWITTER || $type === IAccountManager::PROPERTY_FEDIVERSE) {
-			$code = $message . ' ' . md5($signature);
-		}
-
-		$controller = $this->getController(false, ['signMessage', 'getCurrentTime']);
-
-		$user = $this->createMock(IUser::class);
-
-		$property = $this->buildPropertyMock($type, $dataBefore[$type]['value'], '', IAccountManager::NOT_VERIFIED);
-		$property->expects($this->atLeastOnce())
-			->method('setVerified')
-			->with(IAccountManager::VERIFICATION_IN_PROGRESS)
-			->willReturnSelf();
-		$property->expects($this->atLeastOnce())
-			->method('setVerificationData')
-			->with($signature)
-			->willReturnSelf();
-
-		$userAccount = $this->createMock(IAccount::class);
-		$userAccount->expects($this->any())
-			->method('getUser')
-			->willReturn($user);
-		$userAccount->expects($this->any())
-			->method('getProperty')
-			->willReturn($property);
-
-		$this->userSession->expects($this->once())->method('getUser')->willReturn($user);
-		$this->accountManager->expects($this->once())->method('getAccount')->with($user)->willReturn($userAccount);
-		$user->expects($this->any())->method('getCloudId')->willReturn('user@nextcloud.com');
-		$user->expects($this->any())->method('getUID')->willReturn('uid');
-		$controller->expects($this->once())->method('signMessage')->with($user, $message)->willReturn($signature);
-		$controller->expects($this->any())->method('getCurrentTime')->willReturn(1234567);
-
-		if ($onlyVerificationCode === false) {
-			$this->accountManager->expects($this->once())->method('updateAccount')->with($userAccount)->willReturnArgument(1);
-			$this->jobList->expects($this->once())->method('add')
-				->with('OCA\Settings\BackgroundJobs\VerifyUserData',
-					[
-						'verificationCode' => $code,
-						'data' => $dataBefore[$type]['value'],
-						'type' => $type,
-						'uid' => 'uid',
-						'try' => 0,
-						'lastRun' => 1234567
-					]);
-		}
-
-		$result = $controller->getVerificationCode($account, $onlyVerificationCode);
-
-		$data = $result->getData();
-		$this->assertSame(Http::STATUS_OK, $result->getStatus());
-		$this->assertSame($code, $data['code']);
-	}
-
-	public static function dataTestGetVerificationCode(): array {
-		$accountDataBefore = [
-			IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::NOT_VERIFIED],
-			IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
-		];
-
-		$accountDataAfterWebsite = [
-			IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
-			IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
-		];
-
-		$accountDataAfterTwitter = [
-			IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::NOT_VERIFIED],
-			IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
-		];
-
-		return [
-			['verify-twitter', IAccountManager::PROPERTY_TWITTER, $accountDataBefore, $accountDataAfterTwitter, false],
-			['verify-website', IAccountManager::PROPERTY_WEBSITE, $accountDataBefore, $accountDataAfterWebsite, false],
-			['verify-twitter', IAccountManager::PROPERTY_TWITTER, $accountDataBefore, $accountDataAfterTwitter, true],
-			['verify-website', IAccountManager::PROPERTY_WEBSITE, $accountDataBefore, $accountDataAfterWebsite, true],
-		];
-	}
-
-	/**
-	 * test get verification code in case no valid user was given
-	 */
-	public function testGetVerificationCodeInvalidUser(): void {
-		$controller = $this->getController();
-		$this->userSession->expects($this->once())->method('getUser')->willReturn(null);
-		$result = $controller->getVerificationCode('account', false);
-
-		$this->assertSame(Http::STATUS_BAD_REQUEST, $result->getStatus());
-	}
-
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataTestCanAdminChangeUserPasswords')]
-	public function testCanAdminChangeUserPasswords(
-		bool $encryptionEnabled,
-		bool $encryptionModuleLoaded,
-		bool $masterKeyEnabled,
-		bool $expected,
-	): void {
-		$controller = $this->getController();
-
-		$this->encryptionManager->expects($this->any())
-			->method('isEnabled')
-			->willReturn($encryptionEnabled);
-		$this->encryptionManager->expects($this->any())
-			->method('getEncryptionModule')
-			->willReturnCallback(function () use ($encryptionModuleLoaded) {
-				if ($encryptionModuleLoaded) {
-					return $this->encryptionModule;
-				} else {
-					throw new ModuleDoesNotExistsException();
-				}
-			});
-		$this->encryptionModule->expects($this->any())
-			->method('needDetailedAccessList')
-			->willReturn(!$masterKeyEnabled);
-
-		$result = $this->invokePrivate($controller, 'canAdminChangeUserPasswords', []);
-		$this->assertSame($expected, $result);
-	}
-
-	public static function dataTestCanAdminChangeUserPasswords(): array {
-		return [
-			// encryptionEnabled, encryptionModuleLoaded, masterKeyEnabled, expectedResult
-			[true, true, true, true],
-			[false, true, true, true],
-			[true, false, true, false],
-			[false, false, true, true],
-			[true, true, false, false],
-			[false, true, false, false],
-			[true, false, false, false],
-			[false, false, false, true],
-		];
-	}
+    private IGroupManager&MockObject $groupManager;
+    private UserManager&MockObject $userManager;
+    private IUserSession&MockObject $userSession;
+    private IConfig&MockObject $config;
+    private IMailer&MockObject $mailer;
+    private IFactory&MockObject $l10nFactory;
+    private IAppManager&MockObject $appManager;
+    private IL10N&MockObject $l;
+    private AccountManager&MockObject $accountManager;
+    private IJobList&MockObject $jobList;
+    private \OC\Security\IdentityProof\Manager&MockObject $securityManager;
+    private IManager&MockObject $encryptionManager;
+    private KnownUserService&MockObject $knownUserService;
+    private IEncryptionModule&MockObject $encryptionModule;
+    private IEventDispatcher&MockObject $dispatcher;
+    private IInitialState&MockObject $initialState;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->userManager = $this->createMock(UserManager::class);
+        $this->groupManager = $this->createMock(Manager::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->l = $this->createMock(IL10N::class);
+        $this->mailer = $this->createMock(IMailer::class);
+        $this->l10nFactory = $this->createMock(IFactory::class);
+        $this->appManager = $this->createMock(IAppManager::class);
+        $this->accountManager = $this->createMock(AccountManager::class);
+        $this->securityManager = $this->createMock(\OC\Security\IdentityProof\Manager::class);
+        $this->jobList = $this->createMock(IJobList::class);
+        $this->encryptionManager = $this->createMock(IManager::class);
+        $this->knownUserService = $this->createMock(KnownUserService::class);
+        $this->dispatcher = $this->createMock(IEventDispatcher::class);
+        $this->initialState = $this->createMock(IInitialState::class);
+
+        $this->l->method('t')
+            ->willReturnCallback(function ($text, $parameters = []) {
+                return vsprintf($text, $parameters);
+            });
+
+        $this->encryptionModule = $this->createMock(IEncryptionModule::class);
+        $this->encryptionManager->expects($this->any())->method('getEncryptionModules')
+            ->willReturn(['encryptionModule' => ['callback' => function () {
+                return $this->encryptionModule;
+            }]]);
+    }
+
+    /**
+     * @param bool $isAdmin
+     * @return UsersController|MockObject
+     */
+    protected function getController(bool $isAdmin = false, array $mockedMethods = []) {
+        $this->groupManager->expects($this->any())
+            ->method('isAdmin')
+            ->willReturn($isAdmin);
+
+        if (empty($mockedMethods)) {
+            return new UsersController(
+                'settings',
+                $this->createMock(IRequest::class),
+                $this->userManager,
+                $this->groupManager,
+                $this->userSession,
+                $this->config,
+                $this->l,
+                $this->mailer,
+                $this->l10nFactory,
+                $this->appManager,
+                $this->accountManager,
+                $this->securityManager,
+                $this->jobList,
+                $this->encryptionManager,
+                $this->knownUserService,
+                $this->dispatcher,
+                $this->initialState,
+            );
+        } else {
+            return $this->getMockBuilder(UsersController::class)
+                ->setConstructorArgs(
+                    [
+                        'settings',
+                        $this->createMock(IRequest::class),
+                        $this->userManager,
+                        $this->groupManager,
+                        $this->userSession,
+                        $this->config,
+                        $this->l,
+                        $this->mailer,
+                        $this->l10nFactory,
+                        $this->appManager,
+                        $this->accountManager,
+                        $this->securityManager,
+                        $this->jobList,
+                        $this->encryptionManager,
+                        $this->knownUserService,
+                        $this->dispatcher,
+                        $this->initialState,
+                    ]
+                )
+                ->onlyMethods($mockedMethods)
+                ->getMock();
+        }
+    }
+
+    protected function buildPropertyMock(string $name, string $value, string $scope, string $verified = IAccountManager::VERIFIED): MockObject {
+        $property = $this->createMock(IAccountProperty::class);
+        $property->expects($this->any())
+            ->method('getName')
+            ->willReturn($name);
+        $property->expects($this->any())
+            ->method('getValue')
+            ->willReturn($value);
+        $property->expects($this->any())
+            ->method('getScope')
+            ->willReturn($scope);
+        $property->expects($this->any())
+            ->method('getVerified')
+            ->willReturn($verified);
+
+        return $property;
+    }
+
+    protected function getDefaultAccountMock(): MockObject {
+        $propertyMocks = [
+            IAccountManager::PROPERTY_DISPLAYNAME => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_DISPLAYNAME,
+                'Default display name',
+                IAccountManager::SCOPE_FEDERATED,
+            ),
+            IAccountManager::PROPERTY_ADDRESS => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_ADDRESS,
+                'Default address',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+            IAccountManager::PROPERTY_WEBSITE => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_WEBSITE,
+                'Default website',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+            IAccountManager::PROPERTY_EMAIL => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_EMAIL,
+                'Default email',
+                IAccountManager::SCOPE_FEDERATED,
+            ),
+            IAccountManager::PROPERTY_AVATAR => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_AVATAR,
+                '',
+                IAccountManager::SCOPE_FEDERATED,
+            ),
+            IAccountManager::PROPERTY_PHONE => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_PHONE,
+                'Default phone',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+            IAccountManager::PROPERTY_TWITTER => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_TWITTER,
+                'Default twitter',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+            IAccountManager::PROPERTY_BLUESKY => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_BLUESKY,
+                'Default bluesky',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+            IAccountManager::PROPERTY_FEDIVERSE => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_FEDIVERSE,
+                'Default fediverse',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+            IAccountManager::PROPERTY_BIRTHDATE => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_BIRTHDATE,
+                'Default birthdate',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+            IAccountManager::PROPERTY_PRONOUNS => $this->buildPropertyMock(
+                IAccountManager::PROPERTY_PRONOUNS,
+                'Default pronouns',
+                IAccountManager::SCOPE_LOCAL,
+            ),
+        ];
+
+        $account = $this->createMock(IAccount::class);
+        $account->expects($this->any())
+            ->method('getProperty')
+            ->willReturnCallback(function (string $propertyName) use ($propertyMocks) {
+                if (isset($propertyMocks[$propertyName])) {
+                    return $propertyMocks[$propertyName];
+                }
+                throw new PropertyDoesNotExistException($propertyName);
+            });
+        $account->expects($this->any())
+            ->method('getProperties')
+            ->willReturn($propertyMocks);
+
+        return $account;
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetUserSettings')]
+    public function testSetUserSettings(string $email, bool $validEmail, int $expectedStatus): void {
+        $controller = $this->getController(false, ['saveUserSettings']);
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('johndoe');
+
+        $this->userSession->method('getUser')->willReturn($user);
+
+        if (!empty($email) && $validEmail) {
+            $this->mailer->expects($this->once())->method('validateMailAddress')
+                ->willReturn($validEmail);
+        }
+
+        $saveData = (!empty($email) && $validEmail) || empty($email);
+
+        if ($saveData) {
+            $this->accountManager->expects($this->once())
+                ->method('getAccount')
+                ->with($user)
+                ->willReturn($this->getDefaultAccountMock());
+
+            $controller->expects($this->once())
+                ->method('saveUserSettings');
+        } else {
+            $controller->expects($this->never())->method('saveUserSettings');
+        }
+
+        $result = $controller->setUserSettings(
+            AccountManager::SCOPE_FEDERATED,
+            'displayName',
+            AccountManager::SCOPE_FEDERATED,
+            '47658468',
+            AccountManager::SCOPE_FEDERATED,
+            $email,
+            AccountManager::SCOPE_FEDERATED,
+            'nextcloud.com',
+            AccountManager::SCOPE_FEDERATED,
+            'street and city',
+            AccountManager::SCOPE_FEDERATED,
+            '@nextclouders',
+            AccountManager::SCOPE_FEDERATED,
+            '@nextclouders',
+            AccountManager::SCOPE_FEDERATED,
+            '2020-01-01',
+            AccountManager::SCOPE_FEDERATED,
+            'they/them',
+            AccountManager::SCOPE_FEDERATED,
+        );
+
+        $this->assertSame($expectedStatus, $result->getStatus());
+    }
+
+    public static function dataTestSetUserSettings(): array {
+        return [
+            ['', true, Http::STATUS_OK],
+            ['', false, Http::STATUS_OK],
+            ['example.com', false, Http::STATUS_UNPROCESSABLE_ENTITY],
+            ['john@example.com', true, Http::STATUS_OK],
+        ];
+    }
+
+    public function testSetUserSettingsWhenUserDisplayNameChangeNotAllowed(): void {
+        $controller = $this->getController(false, ['saveUserSettings']);
+
+        $avatarScope = IAccountManager::SCOPE_PUBLISHED;
+        $displayName = 'Display name';
+        $displayNameScope = IAccountManager::SCOPE_PUBLISHED;
+        $phone = '47658468';
+        $phoneScope = IAccountManager::SCOPE_PUBLISHED;
+        $email = 'john@example.com';
+        $emailScope = IAccountManager::SCOPE_PUBLISHED;
+        $website = 'nextcloud.com';
+        $websiteScope = IAccountManager::SCOPE_PUBLISHED;
+        $address = 'street and city';
+        $addressScope = IAccountManager::SCOPE_PUBLISHED;
+        $twitter = '@nextclouders';
+        $twitterScope = IAccountManager::SCOPE_PUBLISHED;
+        $fediverse = '@nextclouders@floss.social';
+        $fediverseScope = IAccountManager::SCOPE_PUBLISHED;
+        $birtdate = '2020-01-01';
+        $birthdateScope = IAccountManager::SCOPE_PUBLISHED;
+        $pronouns = 'she/her';
+        $pronounsScope = IAccountManager::SCOPE_PUBLISHED;
+
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('johndoe');
+
+        $this->userSession->method('getUser')->willReturn($user);
+
+        /** @var MockObject|IAccount $userAccount */
+        $userAccount = $this->getDefaultAccountMock();
+        $this->accountManager->expects($this->once())
+            ->method('getAccount')
+            ->with($user)
+            ->willReturn($userAccount);
+
+        /** @var MockObject|IAccountProperty $avatarProperty */
+        $avatarProperty = $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR);
+        $avatarProperty->expects($this->atLeastOnce())
+            ->method('setScope')
+            ->with($avatarScope)
+            ->willReturnSelf();
+
+        /** @var MockObject|IAccountProperty $avatarProperty */
+        $avatarProperty = $userAccount->getProperty(IAccountManager::PROPERTY_ADDRESS);
+        $avatarProperty->expects($this->atLeastOnce())
+            ->method('setScope')
+            ->with($addressScope)
+            ->willReturnSelf();
+        $avatarProperty->expects($this->atLeastOnce())
+            ->method('setValue')
+            ->with($address)
+            ->willReturnSelf();
+
+        /** @var MockObject|IAccountProperty $emailProperty */
+        $emailProperty = $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL);
+        $emailProperty->expects($this->never())
+            ->method('setValue');
+        $emailProperty->expects($this->never())
+            ->method('setScope');
+
+        /** @var MockObject|IAccountProperty $emailProperty */
+        $emailProperty = $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME);
+        $emailProperty->expects($this->never())
+            ->method('setValue');
+        $emailProperty->expects($this->never())
+            ->method('setScope');
+
+        $this->config->expects($this->once())
+            ->method('getSystemValueBool')
+            ->with('allow_user_to_change_display_name')
+            ->willReturn(false);
+
+        $this->appManager->expects($this->any())
+            ->method('isEnabledForUser')
+            ->with('federatedfilesharing')
+            ->willReturn(true);
+
+        $this->mailer->expects($this->once())->method('validateMailAddress')
+            ->willReturn(true);
+
+        $controller->expects($this->once())
+            ->method('saveUserSettings');
+
+        $controller->setUserSettings(
+            $avatarScope,
+            $displayName,
+            $displayNameScope,
+            $phone,
+            $phoneScope,
+            $email,
+            $emailScope,
+            $website,
+            $websiteScope,
+            $address,
+            $addressScope,
+            $twitter,
+            $twitterScope,
+            $fediverse,
+            $fediverseScope,
+            $birtdate,
+            $birthdateScope,
+            $pronouns,
+            $pronounsScope,
+        );
+    }
+
+    public function testSetUserSettingsWhenFederatedFilesharingNotEnabled(): void {
+        $controller = $this->getController(false, ['saveUserSettings']);
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('johndoe');
+
+        $this->userSession->method('getUser')->willReturn($user);
+
+        $defaultProperties = []; //$this->getDefaultAccountMock();
+
+        $userAccount = $this->getDefaultAccountMock();
+        $this->accountManager->expects($this->once())
+            ->method('getAccount')
+            ->with($user)
+            ->willReturn($userAccount);
+
+        $this->appManager->expects($this->any())
+            ->method('isEnabledForUser')
+            ->with('federatedfilesharing')
+            ->willReturn(false);
+
+        $avatarScope = IAccountManager::SCOPE_PUBLISHED;
+        $displayName = 'Display name';
+        $displayNameScope = IAccountManager::SCOPE_PUBLISHED;
+        $phone = '47658468';
+        $phoneScope = IAccountManager::SCOPE_PUBLISHED;
+        $email = 'john@example.com';
+        $emailScope = IAccountManager::SCOPE_PUBLISHED;
+        $website = 'nextcloud.com';
+        $websiteScope = IAccountManager::SCOPE_PUBLISHED;
+        $address = 'street and city';
+        $addressScope = IAccountManager::SCOPE_PUBLISHED;
+        $twitter = '@nextclouders';
+        $twitterScope = IAccountManager::SCOPE_PUBLISHED;
+        $bluesky = 'nextclouders.net';
+        $blueskyScope = IAccountManager::SCOPE_PUBLISHED;
+        $fediverse = '@nextclouders@floss.social';
+        $fediverseScope = IAccountManager::SCOPE_PUBLISHED;
+        $birthdate = '2020-01-01';
+        $birthdateScope = IAccountManager::SCOPE_PUBLISHED;
+        $pronouns = 'she/her';
+        $pronounsScope = IAccountManager::SCOPE_PUBLISHED;
+
+        // All settings are changed (in the past phone, website, address and
+        // twitter were not changed).
+        $expectedProperties = $defaultProperties;
+        $expectedProperties[IAccountManager::PROPERTY_AVATAR]['scope'] = $avatarScope;
+        $expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['value'] = $displayName;
+        $expectedProperties[IAccountManager::PROPERTY_DISPLAYNAME]['scope'] = $displayNameScope;
+        $expectedProperties[IAccountManager::PROPERTY_EMAIL]['value'] = $email;
+        $expectedProperties[IAccountManager::PROPERTY_EMAIL]['scope'] = $emailScope;
+        $expectedProperties[IAccountManager::PROPERTY_PHONE]['value'] = $phone;
+        $expectedProperties[IAccountManager::PROPERTY_PHONE]['scope'] = $phoneScope;
+        $expectedProperties[IAccountManager::PROPERTY_WEBSITE]['value'] = $website;
+        $expectedProperties[IAccountManager::PROPERTY_WEBSITE]['scope'] = $websiteScope;
+        $expectedProperties[IAccountManager::PROPERTY_ADDRESS]['value'] = $address;
+        $expectedProperties[IAccountManager::PROPERTY_ADDRESS]['scope'] = $addressScope;
+        $expectedProperties[IAccountManager::PROPERTY_TWITTER]['value'] = $twitter;
+        $expectedProperties[IAccountManager::PROPERTY_TWITTER]['scope'] = $twitterScope;
+        $expectedProperties[IAccountManager::PROPERTY_BLUESKY]['value'] = $bluesky;
+        $expectedProperties[IAccountManager::PROPERTY_BLUESKY]['scope'] = $blueskyScope;
+        $expectedProperties[IAccountManager::PROPERTY_FEDIVERSE]['value'] = $fediverse;
+        $expectedProperties[IAccountManager::PROPERTY_FEDIVERSE]['scope'] = $fediverseScope;
+        $expectedProperties[IAccountManager::PROPERTY_BIRTHDATE]['value'] = $birthdate;
+        $expectedProperties[IAccountManager::PROPERTY_BIRTHDATE]['scope'] = $birthdateScope;
+        $expectedProperties[IAccountManager::PROPERTY_PRONOUNS]['value'] = $pronouns;
+        $expectedProperties[IAccountManager::PROPERTY_PRONOUNS]['scope'] = $pronounsScope;
+
+        $this->mailer->expects($this->once())->method('validateMailAddress')
+            ->willReturn(true);
+
+        $controller->expects($this->once())
+            ->method('saveUserSettings')
+            ->with($userAccount);
+
+        $controller->setUserSettings(
+            $avatarScope,
+            $displayName,
+            $displayNameScope,
+            $phone,
+            $phoneScope,
+            $email,
+            $emailScope,
+            $website,
+            $websiteScope,
+            $address,
+            $addressScope,
+            $twitter,
+            $twitterScope,
+            $bluesky,
+            $blueskyScope,
+            $fediverse,
+            $fediverseScope,
+            $birthdate,
+            $birthdateScope,
+            $pronouns,
+            $pronounsScope,
+        );
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSetUserSettingsSubset')]
+    public function testSetUserSettingsSubset(string $property, string $propertyValue): void {
+        $controller = $this->getController(false, ['saveUserSettings']);
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')->willReturn('johndoe');
+
+        $this->userSession->method('getUser')->willReturn($user);
+
+        /** @var IAccount&MockObject $userAccount */
+        $userAccount = $this->getDefaultAccountMock();
+
+        $this->accountManager->expects($this->once())
+            ->method('getAccount')
+            ->with($user)
+            ->willReturn($userAccount);
+
+        $avatarScope = ($property === 'avatarScope') ? $propertyValue : null;
+        $displayName = ($property === 'displayName') ? $propertyValue : null;
+        $displayNameScope = ($property === 'displayNameScope') ? $propertyValue : null;
+        $phone = ($property === 'phone') ? $propertyValue : null;
+        $phoneScope = ($property === 'phoneScope') ? $propertyValue : null;
+        $email = ($property === 'email') ? $propertyValue : null;
+        $emailScope = ($property === 'emailScope') ? $propertyValue : null;
+        $website = ($property === 'website') ? $propertyValue : null;
+        $websiteScope = ($property === 'websiteScope') ? $propertyValue : null;
+        $address = ($property === 'address') ? $propertyValue : null;
+        $addressScope = ($property === 'addressScope') ? $propertyValue : null;
+        $twitter = ($property === 'twitter') ? $propertyValue : null;
+        $twitterScope = ($property === 'twitterScope') ? $propertyValue : null;
+        $bluesky = ($property === 'bluesky') ? $propertyValue : null;
+        $blueskyScope = ($property === 'blueskyScope') ? $propertyValue : null;
+        $fediverse = ($property === 'fediverse') ? $propertyValue : null;
+        $fediverseScope = ($property === 'fediverseScope') ? $propertyValue : null;
+        $birthdate = ($property === 'birthdate') ? $propertyValue : null;
+        $birthdateScope = ($property === 'birthdateScope') ? $propertyValue : null;
+        $pronouns = ($property === 'pronouns') ? $propertyValue : null;
+        $pronounsScope = ($property === 'pronounsScope') ? $propertyValue : null;
+
+        /** @var IAccountProperty[]&MockObject[] $expectedProperties */
+        $expectedProperties = $userAccount->getProperties();
+        $isScope = strrpos($property, 'Scope') === strlen($property) - strlen('5');
+        switch ($property) {
+            case 'avatarScope':
+                $propertyId = IAccountManager::PROPERTY_AVATAR;
+                break;
+            case 'displayName':
+            case 'displayNameScope':
+                $propertyId = IAccountManager::PROPERTY_DISPLAYNAME;
+                break;
+            case 'phone':
+            case 'phoneScope':
+                $propertyId = IAccountManager::PROPERTY_PHONE;
+                break;
+            case 'email':
+            case 'emailScope':
+                $propertyId = IAccountManager::PROPERTY_EMAIL;
+                break;
+            case 'website':
+            case 'websiteScope':
+                $propertyId = IAccountManager::PROPERTY_WEBSITE;
+                break;
+            case 'address':
+            case 'addressScope':
+                $propertyId = IAccountManager::PROPERTY_ADDRESS;
+                break;
+            case 'twitter':
+            case 'twitterScope':
+                $propertyId = IAccountManager::PROPERTY_TWITTER;
+                break;
+            case 'bluesky':
+            case 'blueskyScope':
+                $propertyId = IAccountManager::PROPERTY_BLUESKY;
+                break;
+            case 'fediverse':
+            case 'fediverseScope':
+                $propertyId = IAccountManager::PROPERTY_FEDIVERSE;
+                break;
+            case 'birthdate':
+            case 'birthdateScope':
+                $propertyId = IAccountManager::PROPERTY_BIRTHDATE;
+                break;
+            case 'pronouns':
+            case 'pronounsScope':
+                $propertyId = IAccountManager::PROPERTY_PRONOUNS;
+                break;
+            default:
+                $propertyId = '404';
+        }
+        $expectedProperties[$propertyId]->expects($this->any())
+            ->method($isScope ? 'getScope' : 'getValue')
+            ->willReturn($propertyValue);
+
+        if (!empty($email)) {
+            $this->mailer->expects($this->once())->method('validateMailAddress')
+                ->willReturn(true);
+        }
+
+        $controller->expects($this->once())
+            ->method('saveUserSettings')
+            ->with($userAccount);
+
+        $controller->setUserSettings(
+            $avatarScope,
+            $displayName,
+            $displayNameScope,
+            $phone,
+            $phoneScope,
+            $email,
+            $emailScope,
+            $website,
+            $websiteScope,
+            $address,
+            $addressScope,
+            $twitter,
+            $twitterScope,
+            $bluesky,
+            $blueskyScope,
+            $fediverse,
+            $fediverseScope,
+            $birthdate,
+            $birthdateScope,
+            $pronouns,
+            $pronounsScope,
+        );
+    }
+
+    public static function dataTestSetUserSettingsSubset(): array {
+        return [
+            ['avatarScope', IAccountManager::SCOPE_PUBLISHED],
+            ['displayName', 'Display name'],
+            ['displayNameScope', IAccountManager::SCOPE_PUBLISHED],
+            ['phone', '47658468'],
+            ['phoneScope', IAccountManager::SCOPE_PUBLISHED],
+            ['email', 'john@example.com'],
+            ['emailScope', IAccountManager::SCOPE_PUBLISHED],
+            ['website', 'nextcloud.com'],
+            ['websiteScope', IAccountManager::SCOPE_PUBLISHED],
+            ['address', 'street and city'],
+            ['addressScope', IAccountManager::SCOPE_PUBLISHED],
+            ['twitter', '@nextclouders'],
+            ['twitterScope', IAccountManager::SCOPE_PUBLISHED],
+            ['bluesky', 'nextclouders.net'],
+            ['blueskyScope', IAccountManager::SCOPE_PUBLISHED],
+            ['fediverse', '@nextclouders@floss.social'],
+            ['fediverseScope', IAccountManager::SCOPE_PUBLISHED],
+            ['birthdate', '2020-01-01'],
+            ['birthdateScope', IAccountManager::SCOPE_PUBLISHED],
+            ['pronouns', 'he/him'],
+            ['pronounsScope', IAccountManager::SCOPE_PUBLISHED],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSaveUserSettings')]
+    public function testSaveUserSettings(array $data, ?string $oldEmailAddress, ?string $oldDisplayName): void {
+        $controller = $this->getController();
+        $user = $this->createMock(IUser::class);
+
+        $user->method('getDisplayName')->willReturn($oldDisplayName);
+        $user->method('getSystemEMailAddress')->willReturn($oldEmailAddress);
+        $user->method('canChangeDisplayName')->willReturn(true);
+
+        if (strtolower($data[IAccountManager::PROPERTY_EMAIL]['value']) === strtolower($oldEmailAddress ?? '')) {
+            $user->expects($this->never())->method('setSystemEMailAddress');
+        } else {
+            $user->expects($this->once())->method('setSystemEMailAddress')
+                ->with($data[IAccountManager::PROPERTY_EMAIL]['value']);
+        }
+
+        if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] === $oldDisplayName ?? '') {
+            $user->expects($this->never())->method('setDisplayName');
+        } else {
+            $user->expects($this->once())->method('setDisplayName')
+                ->with($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'])
+                ->willReturn(true);
+        }
+
+        $properties = [];
+        foreach ($data as $propertyName => $propertyData) {
+            $properties[$propertyName] = $this->createMock(IAccountProperty::class);
+            $properties[$propertyName]->expects($this->any())
+                ->method('getValue')
+                ->willReturn($propertyData['value']);
+        }
+
+        $account = $this->createMock(IAccount::class);
+        $account->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $account->expects($this->any())
+            ->method('getProperty')
+            ->willReturnCallback(function (string $propertyName) use ($properties) {
+                return $properties[$propertyName];
+            });
+
+        $this->accountManager->expects($this->any())
+            ->method('getAccount')
+            ->willReturn($account);
+
+        $this->accountManager->expects($this->once())
+            ->method('updateAccount')
+            ->with($account);
+
+        $this->invokePrivate($controller, 'saveUserSettings', [$account]);
+    }
+
+    public static function dataTestSaveUserSettings(): array {
+        return [
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'john@example.com',
+                'john doe'
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'johnNew@example.com',
+                'john New doe'
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'johnNew@example.com',
+                'john doe'
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'john@example.com',
+                'john New doe'
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => ''],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                null,
+                'john New doe'
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'john@example.com',
+                null
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'JOHN@example.com',
+                null
+            ],
+
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestSaveUserSettingsException')]
+    public function testSaveUserSettingsException(
+        array $data,
+        string $oldEmailAddress,
+        string $oldDisplayName,
+        bool $setDisplayNameResult,
+        bool $canChangeEmail,
+    ): void {
+        $this->expectException(ForbiddenException::class);
+
+        $controller = $this->getController();
+        $user = $this->createMock(IUser::class);
+
+        $user->method('getDisplayName')->willReturn($oldDisplayName);
+        $user->method('getEMailAddress')->willReturn($oldEmailAddress);
+
+        /** @var MockObject|IAccount $userAccount */
+        $userAccount = $this->createMock(IAccount::class);
+        $userAccount->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $propertyMocks = [];
+        foreach ($data as $propertyName => $propertyData) {
+            /** @var MockObject|IAccountProperty $property */
+            $propertyMocks[$propertyName] = $this->buildPropertyMock($propertyName, $propertyData['value'], '');
+        }
+        $userAccount->expects($this->any())
+            ->method('getProperty')
+            ->willReturnCallback(function (string $propertyName) use ($propertyMocks) {
+                return $propertyMocks[$propertyName];
+            });
+
+        if ($data[IAccountManager::PROPERTY_EMAIL]['value'] !== $oldEmailAddress) {
+            $user->method('canChangeDisplayName')
+                ->willReturn($canChangeEmail);
+        }
+
+        if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] !== $oldDisplayName) {
+            $user->method('setDisplayName')
+                ->with($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'])
+                ->willReturn($setDisplayNameResult);
+        }
+
+        $this->invokePrivate($controller, 'saveUserSettings', [$userAccount]);
+    }
+
+
+    public static function dataTestSaveUserSettingsException(): array {
+        return [
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'johnNew@example.com',
+                'john New doe',
+                true,
+                false
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'johnNew@example.com',
+                'john New doe',
+                false,
+                true
+            ],
+            [
+                [
+                    IAccountManager::PROPERTY_EMAIL => ['value' => 'john@example.com'],
+                    IAccountManager::PROPERTY_DISPLAYNAME => ['value' => 'john doe'],
+                ],
+                'johnNew@example.com',
+                'john New doe',
+                false,
+                false
+            ],
+
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestGetVerificationCode')]
+    public function testGetVerificationCode(string $account, string $type, array $dataBefore, array $expectedData, bool $onlyVerificationCode): void {
+        $message = 'Use my Federated Cloud ID to share with me: user@nextcloud.com';
+        $signature = 'theSignature';
+
+        $code = $message . ' ' . $signature;
+        if ($type === IAccountManager::PROPERTY_TWITTER || $type === IAccountManager::PROPERTY_FEDIVERSE) {
+            $code = $message . ' ' . md5($signature);
+        }
+
+        $controller = $this->getController(false, ['signMessage', 'getCurrentTime']);
+
+        $user = $this->createMock(IUser::class);
+
+        $property = $this->buildPropertyMock($type, $dataBefore[$type]['value'], '', IAccountManager::NOT_VERIFIED);
+        $property->expects($this->atLeastOnce())
+            ->method('setVerified')
+            ->with(IAccountManager::VERIFICATION_IN_PROGRESS)
+            ->willReturnSelf();
+        $property->expects($this->atLeastOnce())
+            ->method('setVerificationData')
+            ->with($signature)
+            ->willReturnSelf();
+
+        $userAccount = $this->createMock(IAccount::class);
+        $userAccount->expects($this->any())
+            ->method('getUser')
+            ->willReturn($user);
+        $userAccount->expects($this->any())
+            ->method('getProperty')
+            ->willReturn($property);
+
+        $this->userSession->expects($this->once())->method('getUser')->willReturn($user);
+        $this->accountManager->expects($this->once())->method('getAccount')->with($user)->willReturn($userAccount);
+        $user->expects($this->any())->method('getCloudId')->willReturn('user@nextcloud.com');
+        $user->expects($this->any())->method('getUID')->willReturn('uid');
+        $controller->expects($this->once())->method('signMessage')->with($user, $message)->willReturn($signature);
+        $controller->expects($this->any())->method('getCurrentTime')->willReturn(1234567);
+
+        if ($onlyVerificationCode === false) {
+            $this->accountManager->expects($this->once())->method('updateAccount')->with($userAccount)->willReturnArgument(1);
+            $this->jobList->expects($this->once())->method('add')
+                ->with('OCA\Settings\BackgroundJobs\VerifyUserData',
+                    [
+                        'verificationCode' => $code,
+                        'data' => $dataBefore[$type]['value'],
+                        'type' => $type,
+                        'uid' => 'uid',
+                        'try' => 0,
+                        'lastRun' => 1234567
+                    ]);
+        }
+
+        $result = $controller->getVerificationCode($account, $onlyVerificationCode);
+
+        $data = $result->getData();
+        $this->assertSame(Http::STATUS_OK, $result->getStatus());
+        $this->assertSame($code, $data['code']);
+    }
+
+    public static function dataTestGetVerificationCode(): array {
+        $accountDataBefore = [
+            IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::NOT_VERIFIED],
+            IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
+        ];
+
+        $accountDataAfterWebsite = [
+            IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
+            IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::NOT_VERIFIED, 'signature' => 'theSignature'],
+        ];
+
+        $accountDataAfterTwitter = [
+            IAccountManager::PROPERTY_WEBSITE => ['value' => 'https://nextcloud.com', 'verified' => IAccountManager::NOT_VERIFIED],
+            IAccountManager::PROPERTY_TWITTER => ['value' => '@nextclouders', 'verified' => IAccountManager::VERIFICATION_IN_PROGRESS, 'signature' => 'theSignature'],
+        ];
+
+        return [
+            ['verify-twitter', IAccountManager::PROPERTY_TWITTER, $accountDataBefore, $accountDataAfterTwitter, false],
+            ['verify-website', IAccountManager::PROPERTY_WEBSITE, $accountDataBefore, $accountDataAfterWebsite, false],
+            ['verify-twitter', IAccountManager::PROPERTY_TWITTER, $accountDataBefore, $accountDataAfterTwitter, true],
+            ['verify-website', IAccountManager::PROPERTY_WEBSITE, $accountDataBefore, $accountDataAfterWebsite, true],
+        ];
+    }
+
+    /**
+     * test get verification code in case no valid user was given
+     */
+    public function testGetVerificationCodeInvalidUser(): void {
+        $controller = $this->getController();
+        $this->userSession->expects($this->once())->method('getUser')->willReturn(null);
+        $result = $controller->getVerificationCode('account', false);
+
+        $this->assertSame(Http::STATUS_BAD_REQUEST, $result->getStatus());
+    }
+
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataTestCanAdminChangeUserPasswords')]
+    public function testCanAdminChangeUserPasswords(
+        bool $encryptionEnabled,
+        bool $encryptionModuleLoaded,
+        bool $masterKeyEnabled,
+        bool $expected,
+    ): void {
+        $controller = $this->getController();
+
+        $this->encryptionManager->expects($this->any())
+            ->method('isEnabled')
+            ->willReturn($encryptionEnabled);
+        $this->encryptionManager->expects($this->any())
+            ->method('getEncryptionModule')
+            ->willReturnCallback(function () use ($encryptionModuleLoaded) {
+                if ($encryptionModuleLoaded) {
+                    return $this->encryptionModule;
+                } else {
+                    throw new ModuleDoesNotExistsException();
+                }
+            });
+        $this->encryptionModule->expects($this->any())
+            ->method('needDetailedAccessList')
+            ->willReturn(!$masterKeyEnabled);
+
+        $result = $this->invokePrivate($controller, 'canAdminChangeUserPasswords', []);
+        $this->assertSame($expected, $result);
+    }
+
+    public static function dataTestCanAdminChangeUserPasswords(): array {
+        return [
+            // encryptionEnabled, encryptionModuleLoaded, masterKeyEnabled, expectedResult
+            [true, true, true, true],
+            [false, true, true, true],
+            [true, false, true, false],
+            [false, false, true, true],
+            [true, true, false, false],
+            [false, true, false, false],
+            [true, false, false, false],
+            [false, false, false, true],
+        ];
+    }
 }

apps/settings/lib/Controller/UsersController.php

Indentation +525 added lines, -525 removed lines

@@ -56,529 +56,529 @@
 
 #[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
 class UsersController extends Controller {
-	/** Limit for counting users for subadmins, to avoid spending too much time */
-	private const COUNT_LIMIT_FOR_SUBADMINS = 999;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private UserManager $userManager,
-		private IGroupManager $groupManager,
-		private IUserSession $userSession,
-		private IConfig $config,
-		private IL10N $l10n,
-		private IMailer $mailer,
-		private IFactory $l10nFactory,
-		private IAppManager $appManager,
-		private IAccountManager $accountManager,
-		private Manager $keyManager,
-		private IJobList $jobList,
-		private IManager $encryptionManager,
-		private KnownUserService $knownUserService,
-		private IEventDispatcher $dispatcher,
-		private IInitialState $initialState,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-
-	/**
-	 * Display users list template
-	 *
-	 * @return TemplateResponse
-	 */
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	public function usersListByGroup(INavigationManager $navigationManager, ISubAdmin $subAdmin): TemplateResponse {
-		return $this->usersList($navigationManager, $subAdmin);
-	}
-
-	/**
-	 * Display users list template
-	 *
-	 * @return TemplateResponse
-	 */
-	#[NoAdminRequired]
-	#[NoCSRFRequired]
-	public function usersList(INavigationManager $navigationManager, ISubAdmin $subAdmin): TemplateResponse {
-		$user = $this->userSession->getUser();
-		$uid = $user->getUID();
-		$isAdmin = $this->groupManager->isAdmin($uid);
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
-
-		$navigationManager->setActiveEntry('core_users');
-
-		/* SORT OPTION: SORT_USERCOUNT or SORT_GROUPNAME */
-		$sortGroupsBy = MetaData::SORT_USERCOUNT;
-		$isLDAPUsed = false;
-		if ($this->config->getSystemValueBool('sort_groups_by_name', false)) {
-			$sortGroupsBy = MetaData::SORT_GROUPNAME;
-		} else {
-			if ($this->appManager->isEnabledForUser('user_ldap')) {
-				$isLDAPUsed
-					= $this->groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
-				if ($isLDAPUsed) {
-					// LDAP user count can be slow, so we sort by group name here
-					$sortGroupsBy = MetaData::SORT_GROUPNAME;
-				}
-			}
-		}
-
-		$canChangePassword = $this->canAdminChangeUserPasswords();
-
-		/* GROUPS */
-		$groupsInfo = new MetaData(
-			$uid,
-			$isAdmin,
-			$isDelegatedAdmin,
-			$this->groupManager,
-			$this->userSession
-		);
-
-		$adminGroup = $this->groupManager->get('admin');
-		$adminGroupData = [
-			'id' => $adminGroup->getGID(),
-			'name' => $adminGroup->getDisplayName(),
-			'usercount' => $sortGroupsBy === MetaData::SORT_USERCOUNT ? $adminGroup->count() : 0,
-			'disabled' => $adminGroup->countDisabled(),
-			'canAdd' => $adminGroup->canAddUser(),
-			'canRemove' => $adminGroup->canRemoveUser(),
-		];
-
-		if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
-			$isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
-				return $ldapFound || $backend instanceof User_Proxy;
-			});
-		}
-
-		$disabledUsers = -1;
-		$userCount = 0;
-
-		if (!$isLDAPUsed) {
-			if ($isAdmin || $isDelegatedAdmin) {
-				$disabledUsers = $this->userManager->countDisabledUsers();
-				$userCount = array_reduce($this->userManager->countUsers(), function ($v, $w) {
-					return $v + (int)$w;
-				}, 0);
-			} else {
-				// User is subadmin !
-				[$userCount,$disabledUsers] = $this->userManager->countUsersAndDisabledUsersOfGroups($groupsInfo->getGroups(), self::COUNT_LIMIT_FOR_SUBADMINS);
-			}
-
-			if ($disabledUsers > 0) {
-				$userCount -= $disabledUsers;
-			}
-		}
-
-		$recentUsersGroup = [
-			'id' => '__nc_internal_recent',
-			'name' => $this->l10n->t('Recently active'),
-			'usercount' => $this->userManager->countSeenUsers(),
-		];
-
-		$disabledUsersGroup = [
-			'id' => 'disabled',
-			'name' => $this->l10n->t('Disabled accounts'),
-			'usercount' => $disabledUsers
-		];
-
-		if (!$isAdmin && !$isDelegatedAdmin) {
-			$subAdminGroups = array_map(
-				fn (IGroup $group) => ['id' => $group->getGID(), 'name' => $group->getDisplayName()],
-				$subAdmin->getSubAdminsGroups($user),
-			);
-			$subAdminGroups = array_values($subAdminGroups);
-		}
-
-		/* QUOTAS PRESETS */
-		$quotaPreset = $this->parseQuotaPreset($this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'));
-		$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
-		if (!$allowUnlimitedQuota && count($quotaPreset) > 0) {
-			$defaultQuota = $this->config->getAppValue('files', 'default_quota', $quotaPreset[0]);
-		} else {
-			$defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none');
-		}
-
-		$event = new BeforeTemplateRenderedEvent();
-		$this->dispatcher->dispatch('OC\Settings\Users::loadAdditionalScripts', $event);
-		$this->dispatcher->dispatchTyped($event);
-
-		/* LANGUAGES */
-		$languages = $this->l10nFactory->getLanguages();
-
-		/** Using LDAP or admins (system config) can enfore sorting by group name, in this case the frontend setting is overwritten */
-		$forceSortGroupByName = $sortGroupsBy === MetaData::SORT_GROUPNAME;
-
-		/* FINAL DATA */
-		$serverData = [];
-		// groups
-		$serverData['systemGroups'] = [$adminGroupData, $recentUsersGroup, $disabledUsersGroup];
-		$serverData['subAdminGroups'] = $subAdminGroups ?? [];
-		// Various data
-		$serverData['isAdmin'] = $isAdmin;
-		$serverData['isDelegatedAdmin'] = $isDelegatedAdmin;
-		$serverData['sortGroups'] = $forceSortGroupByName
-			? MetaData::SORT_GROUPNAME
-			: (int)$this->config->getAppValue('core', 'group.sortBy', (string)MetaData::SORT_USERCOUNT);
-		$serverData['forceSortGroupByName'] = $forceSortGroupByName;
-		$serverData['quotaPreset'] = $quotaPreset;
-		$serverData['allowUnlimitedQuota'] = $allowUnlimitedQuota;
-		$serverData['userCount'] = $userCount;
-		$serverData['languages'] = $languages;
-		$serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en');
-		$serverData['forceLanguage'] = $this->config->getSystemValue('force_language', false);
-		// Settings
-		$serverData['defaultQuota'] = $defaultQuota;
-		$serverData['canChangePassword'] = $canChangePassword;
-		$serverData['newUserGenerateUserID'] = $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes';
-		$serverData['newUserRequireEmail'] = $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes';
-		$serverData['newUserSendEmail'] = $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes';
-
-		$this->initialState->provideInitialState('usersSettings', $serverData);
-
-		Util::addStyle('settings', 'settings');
-		Util::addScript('settings', 'vue-settings-apps-users-management');
-
-		return new TemplateResponse('settings', 'settings/empty', ['pageTitle' => $this->l10n->t('Settings')]);
-	}
-
-	/**
-	 * @param string $key
-	 * @param string $value
-	 *
-	 * @return JSONResponse
-	 */
-	#[AuthorizedAdminSetting(settings:Users::class)]
-	public function setPreference(string $key, string $value): JSONResponse {
-		$allowed = ['newUser.sendEmail', 'group.sortBy'];
-		if (!in_array($key, $allowed, true)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->config->setAppValue('core', $key, $value);
-
-		return new JSONResponse([]);
-	}
-
-	/**
-	 * Parse the app value for quota_present
-	 *
-	 * @param string $quotaPreset
-	 * @return array
-	 */
-	protected function parseQuotaPreset(string $quotaPreset): array {
-		// 1 GB, 5 GB, 10 GB => [1 GB, 5 GB, 10 GB]
-		$presets = array_filter(array_map('trim', explode(',', $quotaPreset)));
-		// Drop default and none, Make array indexes numerically
-		return array_values(array_diff($presets, ['default', 'none']));
-	}
-
-	/**
-	 * check if the admin can change the users password
-	 *
-	 * The admin can change the passwords if:
-	 *
-	 *   - no encryption module is loaded and encryption is disabled
-	 *   - encryption module is loaded but it doesn't require per user keys
-	 *
-	 * The admin can not change the passwords if:
-	 *
-	 *   - an encryption module is loaded and it uses per-user keys
-	 *   - encryption is enabled but no encryption modules are loaded
-	 *
-	 * @return bool
-	 */
-	protected function canAdminChangeUserPasswords(): bool {
-		$isEncryptionEnabled = $this->encryptionManager->isEnabled();
-		try {
-			$noUserSpecificEncryptionKeys = !$this->encryptionManager->getEncryptionModule()->needDetailedAccessList();
-			$isEncryptionModuleLoaded = true;
-		} catch (ModuleDoesNotExistsException $e) {
-			$noUserSpecificEncryptionKeys = true;
-			$isEncryptionModuleLoaded = false;
-		}
-		$canChangePassword = ($isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
-			|| (!$isEncryptionModuleLoaded && !$isEncryptionEnabled);
-
-		return $canChangePassword;
-	}
-
-	/**
-	 * @NoSubAdminRequired
-	 *
-	 * @param string|null $avatarScope
-	 * @param string|null $displayname
-	 * @param string|null $displaynameScope
-	 * @param string|null $phone
-	 * @param string|null $phoneScope
-	 * @param string|null $email
-	 * @param string|null $emailScope
-	 * @param string|null $website
-	 * @param string|null $websiteScope
-	 * @param string|null $address
-	 * @param string|null $addressScope
-	 * @param string|null $twitter
-	 * @param string|null $twitterScope
-	 * @param string|null $bluesky
-	 * @param string|null $blueskyScope
-	 * @param string|null $fediverse
-	 * @param string|null $fediverseScope
-	 * @param string|null $birthdate
-	 * @param string|null $birthdateScope
-	 *
-	 * @return DataResponse
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	#[UserRateLimit(limit: 5, period: 60)]
-	public function setUserSettings(?string $avatarScope = null,
-		?string $displayname = null,
-		?string $displaynameScope = null,
-		?string $phone = null,
-		?string $phoneScope = null,
-		?string $email = null,
-		?string $emailScope = null,
-		?string $website = null,
-		?string $websiteScope = null,
-		?string $address = null,
-		?string $addressScope = null,
-		?string $twitter = null,
-		?string $twitterScope = null,
-		?string $bluesky = null,
-		?string $blueskyScope = null,
-		?string $fediverse = null,
-		?string $fediverseScope = null,
-		?string $birthdate = null,
-		?string $birthdateScope = null,
-		?string $pronouns = null,
-		?string $pronounsScope = null,
-	) {
-		$user = $this->userSession->getUser();
-		if (!$user instanceof IUser) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Invalid account')
-					]
-				],
-				Http::STATUS_UNAUTHORIZED
-			);
-		}
-
-		$email = !is_null($email) ? strtolower($email) : $email;
-		if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
-			return new DataResponse(
-				[
-					'status' => 'error',
-					'data' => [
-						'message' => $this->l10n->t('Invalid mail address')
-					]
-				],
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		$userAccount = $this->accountManager->getAccount($user);
-		$oldPhoneValue = $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
-
-		$updatable = [
-			IAccountManager::PROPERTY_AVATAR => ['value' => null, 'scope' => $avatarScope],
-			IAccountManager::PROPERTY_DISPLAYNAME => ['value' => $displayname, 'scope' => $displaynameScope],
-			IAccountManager::PROPERTY_EMAIL => ['value' => $email, 'scope' => $emailScope],
-			IAccountManager::PROPERTY_WEBSITE => ['value' => $website, 'scope' => $websiteScope],
-			IAccountManager::PROPERTY_ADDRESS => ['value' => $address, 'scope' => $addressScope],
-			IAccountManager::PROPERTY_PHONE => ['value' => $phone, 'scope' => $phoneScope],
-			IAccountManager::PROPERTY_TWITTER => ['value' => $twitter, 'scope' => $twitterScope],
-			IAccountManager::PROPERTY_BLUESKY => ['value' => $bluesky, 'scope' => $blueskyScope],
-			IAccountManager::PROPERTY_FEDIVERSE => ['value' => $fediverse, 'scope' => $fediverseScope],
-			IAccountManager::PROPERTY_BIRTHDATE => ['value' => $birthdate, 'scope' => $birthdateScope],
-			IAccountManager::PROPERTY_PRONOUNS => ['value' => $pronouns, 'scope' => $pronounsScope],
-		];
-		$allowUserToChangeDisplayName = $this->config->getSystemValueBool('allow_user_to_change_display_name', true);
-		foreach ($updatable as $property => $data) {
-			if ($allowUserToChangeDisplayName === false
-				&& in_array($property, [IAccountManager::PROPERTY_DISPLAYNAME, IAccountManager::PROPERTY_EMAIL], true)) {
-				continue;
-			}
-			$property = $userAccount->getProperty($property);
-			if ($data['value'] !== null) {
-				$property->setValue($data['value']);
-			}
-			if ($data['scope'] !== null) {
-				$property->setScope($data['scope']);
-			}
-		}
-
-		try {
-			$this->saveUserSettings($userAccount);
-			if ($oldPhoneValue !== $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getValue()) {
-				$this->knownUserService->deleteByContactUserId($user->getUID());
-			}
-			return new DataResponse(
-				[
-					'status' => 'success',
-					'data' => [
-						'userId' => $user->getUID(),
-						'avatarScope' => $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope(),
-						'displayname' => $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue(),
-						'displaynameScope' => $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope(),
-						'phone' => $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(),
-						'phoneScope' => $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getScope(),
-						'email' => $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
-						'emailScope' => $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
-						'website' => $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE)->getValue(),
-						'websiteScope' => $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE)->getScope(),
-						'address' => $userAccount->getProperty(IAccountManager::PROPERTY_ADDRESS)->getValue(),
-						'addressScope' => $userAccount->getProperty(IAccountManager::PROPERTY_ADDRESS)->getScope(),
-						'twitter' => $userAccount->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
-						'twitterScope' => $userAccount->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
-						'bluesky' => $userAccount->getProperty(IAccountManager::PROPERTY_BLUESKY)->getValue(),
-						'blueskyScope' => $userAccount->getProperty(IAccountManager::PROPERTY_BLUESKY)->getScope(),
-						'fediverse' => $userAccount->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getValue(),
-						'fediverseScope' => $userAccount->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getScope(),
-						'birthdate' => $userAccount->getProperty(IAccountManager::PROPERTY_BIRTHDATE)->getValue(),
-						'birthdateScope' => $userAccount->getProperty(IAccountManager::PROPERTY_BIRTHDATE)->getScope(),
-						'pronouns' => $userAccount->getProperty(IAccountManager::PROPERTY_PRONOUNS)->getValue(),
-						'pronounsScope' => $userAccount->getProperty(IAccountManager::PROPERTY_PRONOUNS)->getScope(),
-						'message' => $this->l10n->t('Settings saved'),
-					],
-				],
-				Http::STATUS_OK
-			);
-		} catch (ForbiddenException|InvalidArgumentException|PropertyDoesNotExistException $e) {
-			return new DataResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getMessage()
-				],
-			]);
-		}
-	}
-	/**
-	 * update account manager with new user data
-	 *
-	 * @throws ForbiddenException
-	 * @throws InvalidArgumentException
-	 */
-	protected function saveUserSettings(IAccount $userAccount): void {
-		// keep the user back-end up-to-date with the latest display name and email
-		// address
-		$oldDisplayName = $userAccount->getUser()->getDisplayName();
-		if ($oldDisplayName !== $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue()) {
-			$result = $userAccount->getUser()->setDisplayName($userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue());
-			if ($result === false) {
-				throw new ForbiddenException($this->l10n->t('Unable to change full name'));
-			}
-		}
-
-		$oldEmailAddress = $userAccount->getUser()->getSystemEMailAddress();
-		$oldEmailAddress = strtolower((string)$oldEmailAddress);
-		if ($oldEmailAddress !== strtolower($userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue())) {
-			// this is the only permission a backend provides and is also used
-			// for the permission of setting a email address
-			if (!$userAccount->getUser()->canChangeDisplayName()) {
-				throw new ForbiddenException($this->l10n->t('Unable to change email address'));
-			}
-			$userAccount->getUser()->setSystemEMailAddress($userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue());
-		}
-
-		try {
-			$this->accountManager->updateAccount($userAccount);
-		} catch (InvalidArgumentException $e) {
-			if ($e->getMessage() === IAccountManager::PROPERTY_PHONE) {
-				throw new InvalidArgumentException($this->l10n->t('Unable to set invalid phone number'));
-			}
-			if ($e->getMessage() === IAccountManager::PROPERTY_WEBSITE) {
-				throw new InvalidArgumentException($this->l10n->t('Unable to set invalid website'));
-			}
-			throw new InvalidArgumentException($this->l10n->t('Some account data was invalid'));
-		}
-	}
-
-	/**
-	 * Set the mail address of a user
-	 *
-	 * @NoSubAdminRequired
-	 *
-	 * @param string $account
-	 * @param bool $onlyVerificationCode only return verification code without updating the data
-	 * @return DataResponse
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	public function getVerificationCode(string $account, bool $onlyVerificationCode): DataResponse {
-		$user = $this->userSession->getUser();
-
-		if ($user === null) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$userAccount = $this->accountManager->getAccount($user);
-		$cloudId = $user->getCloudId();
-		$message = 'Use my Federated Cloud ID to share with me: ' . $cloudId;
-		$signature = $this->signMessage($user, $message);
-
-		$code = $message . ' ' . $signature;
-		$codeMd5 = $message . ' ' . md5($signature);
-
-		switch ($account) {
-			case 'verify-twitter':
-				$msg = $this->l10n->t('In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):');
-				$code = $codeMd5;
-				$type = IAccountManager::PROPERTY_TWITTER;
-				break;
-			case 'verify-website':
-				$msg = $this->l10n->t('In order to verify your Website, store the following content in your web-root at \'.well-known/CloudIdVerificationCode.txt\' (please make sure that the complete text is in one line):');
-				$type = IAccountManager::PROPERTY_WEBSITE;
-				break;
-			default:
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		$userProperty = $userAccount->getProperty($type);
-		$userProperty
-			->setVerified(IAccountManager::VERIFICATION_IN_PROGRESS)
-			->setVerificationData($signature);
-
-		if ($onlyVerificationCode === false) {
-			$this->accountManager->updateAccount($userAccount);
-
-			$this->jobList->add(VerifyUserData::class,
-				[
-					'verificationCode' => $code,
-					'data' => $userProperty->getValue(),
-					'type' => $type,
-					'uid' => $user->getUID(),
-					'try' => 0,
-					'lastRun' => $this->getCurrentTime()
-				]
-			);
-		}
-
-		return new DataResponse(['msg' => $msg, 'code' => $code]);
-	}
-
-	/**
-	 * get current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getCurrentTime(): int {
-		return time();
-	}
-
-	/**
-	 * sign message with users private key
-	 *
-	 * @param IUser $user
-	 * @param string $message
-	 *
-	 * @return string base64 encoded signature
-	 */
-	protected function signMessage(IUser $user, string $message): string {
-		$privateKey = $this->keyManager->getKey($user)->getPrivate();
-		openssl_sign(json_encode($message), $signature, $privateKey, OPENSSL_ALGO_SHA512);
-		return base64_encode($signature);
-	}
+    /** Limit for counting users for subadmins, to avoid spending too much time */
+    private const COUNT_LIMIT_FOR_SUBADMINS = 999;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private UserManager $userManager,
+        private IGroupManager $groupManager,
+        private IUserSession $userSession,
+        private IConfig $config,
+        private IL10N $l10n,
+        private IMailer $mailer,
+        private IFactory $l10nFactory,
+        private IAppManager $appManager,
+        private IAccountManager $accountManager,
+        private Manager $keyManager,
+        private IJobList $jobList,
+        private IManager $encryptionManager,
+        private KnownUserService $knownUserService,
+        private IEventDispatcher $dispatcher,
+        private IInitialState $initialState,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+
+    /**
+     * Display users list template
+     *
+     * @return TemplateResponse
+     */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    public function usersListByGroup(INavigationManager $navigationManager, ISubAdmin $subAdmin): TemplateResponse {
+        return $this->usersList($navigationManager, $subAdmin);
+    }
+
+    /**
+     * Display users list template
+     *
+     * @return TemplateResponse
+     */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    public function usersList(INavigationManager $navigationManager, ISubAdmin $subAdmin): TemplateResponse {
+        $user = $this->userSession->getUser();
+        $uid = $user->getUID();
+        $isAdmin = $this->groupManager->isAdmin($uid);
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($uid);
+
+        $navigationManager->setActiveEntry('core_users');
+
+        /* SORT OPTION: SORT_USERCOUNT or SORT_GROUPNAME */
+        $sortGroupsBy = MetaData::SORT_USERCOUNT;
+        $isLDAPUsed = false;
+        if ($this->config->getSystemValueBool('sort_groups_by_name', false)) {
+            $sortGroupsBy = MetaData::SORT_GROUPNAME;
+        } else {
+            if ($this->appManager->isEnabledForUser('user_ldap')) {
+                $isLDAPUsed
+                    = $this->groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy');
+                if ($isLDAPUsed) {
+                    // LDAP user count can be slow, so we sort by group name here
+                    $sortGroupsBy = MetaData::SORT_GROUPNAME;
+                }
+            }
+        }
+
+        $canChangePassword = $this->canAdminChangeUserPasswords();
+
+        /* GROUPS */
+        $groupsInfo = new MetaData(
+            $uid,
+            $isAdmin,
+            $isDelegatedAdmin,
+            $this->groupManager,
+            $this->userSession
+        );
+
+        $adminGroup = $this->groupManager->get('admin');
+        $adminGroupData = [
+            'id' => $adminGroup->getGID(),
+            'name' => $adminGroup->getDisplayName(),
+            'usercount' => $sortGroupsBy === MetaData::SORT_USERCOUNT ? $adminGroup->count() : 0,
+            'disabled' => $adminGroup->countDisabled(),
+            'canAdd' => $adminGroup->canAddUser(),
+            'canRemove' => $adminGroup->canRemoveUser(),
+        ];
+
+        if (!$isLDAPUsed && $this->appManager->isEnabledForUser('user_ldap')) {
+            $isLDAPUsed = (bool)array_reduce($this->userManager->getBackends(), function ($ldapFound, $backend) {
+                return $ldapFound || $backend instanceof User_Proxy;
+            });
+        }
+
+        $disabledUsers = -1;
+        $userCount = 0;
+
+        if (!$isLDAPUsed) {
+            if ($isAdmin || $isDelegatedAdmin) {
+                $disabledUsers = $this->userManager->countDisabledUsers();
+                $userCount = array_reduce($this->userManager->countUsers(), function ($v, $w) {
+                    return $v + (int)$w;
+                }, 0);
+            } else {
+                // User is subadmin !
+                [$userCount,$disabledUsers] = $this->userManager->countUsersAndDisabledUsersOfGroups($groupsInfo->getGroups(), self::COUNT_LIMIT_FOR_SUBADMINS);
+            }
+
+            if ($disabledUsers > 0) {
+                $userCount -= $disabledUsers;
+            }
+        }
+
+        $recentUsersGroup = [
+            'id' => '__nc_internal_recent',
+            'name' => $this->l10n->t('Recently active'),
+            'usercount' => $this->userManager->countSeenUsers(),
+        ];
+
+        $disabledUsersGroup = [
+            'id' => 'disabled',
+            'name' => $this->l10n->t('Disabled accounts'),
+            'usercount' => $disabledUsers
+        ];
+
+        if (!$isAdmin && !$isDelegatedAdmin) {
+            $subAdminGroups = array_map(
+                fn (IGroup $group) => ['id' => $group->getGID(), 'name' => $group->getDisplayName()],
+                $subAdmin->getSubAdminsGroups($user),
+            );
+            $subAdminGroups = array_values($subAdminGroups);
+        }
+
+        /* QUOTAS PRESETS */
+        $quotaPreset = $this->parseQuotaPreset($this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB'));
+        $allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
+        if (!$allowUnlimitedQuota && count($quotaPreset) > 0) {
+            $defaultQuota = $this->config->getAppValue('files', 'default_quota', $quotaPreset[0]);
+        } else {
+            $defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none');
+        }
+
+        $event = new BeforeTemplateRenderedEvent();
+        $this->dispatcher->dispatch('OC\Settings\Users::loadAdditionalScripts', $event);
+        $this->dispatcher->dispatchTyped($event);
+
+        /* LANGUAGES */
+        $languages = $this->l10nFactory->getLanguages();
+
+        /** Using LDAP or admins (system config) can enfore sorting by group name, in this case the frontend setting is overwritten */
+        $forceSortGroupByName = $sortGroupsBy === MetaData::SORT_GROUPNAME;
+
+        /* FINAL DATA */
+        $serverData = [];
+        // groups
+        $serverData['systemGroups'] = [$adminGroupData, $recentUsersGroup, $disabledUsersGroup];
+        $serverData['subAdminGroups'] = $subAdminGroups ?? [];
+        // Various data
+        $serverData['isAdmin'] = $isAdmin;
+        $serverData['isDelegatedAdmin'] = $isDelegatedAdmin;
+        $serverData['sortGroups'] = $forceSortGroupByName
+            ? MetaData::SORT_GROUPNAME
+            : (int)$this->config->getAppValue('core', 'group.sortBy', (string)MetaData::SORT_USERCOUNT);
+        $serverData['forceSortGroupByName'] = $forceSortGroupByName;
+        $serverData['quotaPreset'] = $quotaPreset;
+        $serverData['allowUnlimitedQuota'] = $allowUnlimitedQuota;
+        $serverData['userCount'] = $userCount;
+        $serverData['languages'] = $languages;
+        $serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en');
+        $serverData['forceLanguage'] = $this->config->getSystemValue('force_language', false);
+        // Settings
+        $serverData['defaultQuota'] = $defaultQuota;
+        $serverData['canChangePassword'] = $canChangePassword;
+        $serverData['newUserGenerateUserID'] = $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes';
+        $serverData['newUserRequireEmail'] = $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes';
+        $serverData['newUserSendEmail'] = $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes';
+
+        $this->initialState->provideInitialState('usersSettings', $serverData);
+
+        Util::addStyle('settings', 'settings');
+        Util::addScript('settings', 'vue-settings-apps-users-management');
+
+        return new TemplateResponse('settings', 'settings/empty', ['pageTitle' => $this->l10n->t('Settings')]);
+    }
+
+    /**
+     * @param string $key
+     * @param string $value
+     *
+     * @return JSONResponse
+     */
+    #[AuthorizedAdminSetting(settings:Users::class)]
+    public function setPreference(string $key, string $value): JSONResponse {
+        $allowed = ['newUser.sendEmail', 'group.sortBy'];
+        if (!in_array($key, $allowed, true)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->config->setAppValue('core', $key, $value);
+
+        return new JSONResponse([]);
+    }
+
+    /**
+     * Parse the app value for quota_present
+     *
+     * @param string $quotaPreset
+     * @return array
+     */
+    protected function parseQuotaPreset(string $quotaPreset): array {
+        // 1 GB, 5 GB, 10 GB => [1 GB, 5 GB, 10 GB]
+        $presets = array_filter(array_map('trim', explode(',', $quotaPreset)));
+        // Drop default and none, Make array indexes numerically
+        return array_values(array_diff($presets, ['default', 'none']));
+    }
+
+    /**
+     * check if the admin can change the users password
+     *
+     * The admin can change the passwords if:
+     *
+     *   - no encryption module is loaded and encryption is disabled
+     *   - encryption module is loaded but it doesn't require per user keys
+     *
+     * The admin can not change the passwords if:
+     *
+     *   - an encryption module is loaded and it uses per-user keys
+     *   - encryption is enabled but no encryption modules are loaded
+     *
+     * @return bool
+     */
+    protected function canAdminChangeUserPasswords(): bool {
+        $isEncryptionEnabled = $this->encryptionManager->isEnabled();
+        try {
+            $noUserSpecificEncryptionKeys = !$this->encryptionManager->getEncryptionModule()->needDetailedAccessList();
+            $isEncryptionModuleLoaded = true;
+        } catch (ModuleDoesNotExistsException $e) {
+            $noUserSpecificEncryptionKeys = true;
+            $isEncryptionModuleLoaded = false;
+        }
+        $canChangePassword = ($isEncryptionModuleLoaded && $noUserSpecificEncryptionKeys)
+            || (!$isEncryptionModuleLoaded && !$isEncryptionEnabled);
+
+        return $canChangePassword;
+    }
+
+    /**
+     * @NoSubAdminRequired
+     *
+     * @param string|null $avatarScope
+     * @param string|null $displayname
+     * @param string|null $displaynameScope
+     * @param string|null $phone
+     * @param string|null $phoneScope
+     * @param string|null $email
+     * @param string|null $emailScope
+     * @param string|null $website
+     * @param string|null $websiteScope
+     * @param string|null $address
+     * @param string|null $addressScope
+     * @param string|null $twitter
+     * @param string|null $twitterScope
+     * @param string|null $bluesky
+     * @param string|null $blueskyScope
+     * @param string|null $fediverse
+     * @param string|null $fediverseScope
+     * @param string|null $birthdate
+     * @param string|null $birthdateScope
+     *
+     * @return DataResponse
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    #[UserRateLimit(limit: 5, period: 60)]
+    public function setUserSettings(?string $avatarScope = null,
+        ?string $displayname = null,
+        ?string $displaynameScope = null,
+        ?string $phone = null,
+        ?string $phoneScope = null,
+        ?string $email = null,
+        ?string $emailScope = null,
+        ?string $website = null,
+        ?string $websiteScope = null,
+        ?string $address = null,
+        ?string $addressScope = null,
+        ?string $twitter = null,
+        ?string $twitterScope = null,
+        ?string $bluesky = null,
+        ?string $blueskyScope = null,
+        ?string $fediverse = null,
+        ?string $fediverseScope = null,
+        ?string $birthdate = null,
+        ?string $birthdateScope = null,
+        ?string $pronouns = null,
+        ?string $pronounsScope = null,
+    ) {
+        $user = $this->userSession->getUser();
+        if (!$user instanceof IUser) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Invalid account')
+                    ]
+                ],
+                Http::STATUS_UNAUTHORIZED
+            );
+        }
+
+        $email = !is_null($email) ? strtolower($email) : $email;
+        if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
+            return new DataResponse(
+                [
+                    'status' => 'error',
+                    'data' => [
+                        'message' => $this->l10n->t('Invalid mail address')
+                    ]
+                ],
+                Http::STATUS_UNPROCESSABLE_ENTITY
+            );
+        }
+
+        $userAccount = $this->accountManager->getAccount($user);
+        $oldPhoneValue = $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getValue();
+
+        $updatable = [
+            IAccountManager::PROPERTY_AVATAR => ['value' => null, 'scope' => $avatarScope],
+            IAccountManager::PROPERTY_DISPLAYNAME => ['value' => $displayname, 'scope' => $displaynameScope],
+            IAccountManager::PROPERTY_EMAIL => ['value' => $email, 'scope' => $emailScope],
+            IAccountManager::PROPERTY_WEBSITE => ['value' => $website, 'scope' => $websiteScope],
+            IAccountManager::PROPERTY_ADDRESS => ['value' => $address, 'scope' => $addressScope],
+            IAccountManager::PROPERTY_PHONE => ['value' => $phone, 'scope' => $phoneScope],
+            IAccountManager::PROPERTY_TWITTER => ['value' => $twitter, 'scope' => $twitterScope],
+            IAccountManager::PROPERTY_BLUESKY => ['value' => $bluesky, 'scope' => $blueskyScope],
+            IAccountManager::PROPERTY_FEDIVERSE => ['value' => $fediverse, 'scope' => $fediverseScope],
+            IAccountManager::PROPERTY_BIRTHDATE => ['value' => $birthdate, 'scope' => $birthdateScope],
+            IAccountManager::PROPERTY_PRONOUNS => ['value' => $pronouns, 'scope' => $pronounsScope],
+        ];
+        $allowUserToChangeDisplayName = $this->config->getSystemValueBool('allow_user_to_change_display_name', true);
+        foreach ($updatable as $property => $data) {
+            if ($allowUserToChangeDisplayName === false
+                && in_array($property, [IAccountManager::PROPERTY_DISPLAYNAME, IAccountManager::PROPERTY_EMAIL], true)) {
+                continue;
+            }
+            $property = $userAccount->getProperty($property);
+            if ($data['value'] !== null) {
+                $property->setValue($data['value']);
+            }
+            if ($data['scope'] !== null) {
+                $property->setScope($data['scope']);
+            }
+        }
+
+        try {
+            $this->saveUserSettings($userAccount);
+            if ($oldPhoneValue !== $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getValue()) {
+                $this->knownUserService->deleteByContactUserId($user->getUID());
+            }
+            return new DataResponse(
+                [
+                    'status' => 'success',
+                    'data' => [
+                        'userId' => $user->getUID(),
+                        'avatarScope' => $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope(),
+                        'displayname' => $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue(),
+                        'displaynameScope' => $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope(),
+                        'phone' => $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getValue(),
+                        'phoneScope' => $userAccount->getProperty(IAccountManager::PROPERTY_PHONE)->getScope(),
+                        'email' => $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
+                        'emailScope' => $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
+                        'website' => $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE)->getValue(),
+                        'websiteScope' => $userAccount->getProperty(IAccountManager::PROPERTY_WEBSITE)->getScope(),
+                        'address' => $userAccount->getProperty(IAccountManager::PROPERTY_ADDRESS)->getValue(),
+                        'addressScope' => $userAccount->getProperty(IAccountManager::PROPERTY_ADDRESS)->getScope(),
+                        'twitter' => $userAccount->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
+                        'twitterScope' => $userAccount->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
+                        'bluesky' => $userAccount->getProperty(IAccountManager::PROPERTY_BLUESKY)->getValue(),
+                        'blueskyScope' => $userAccount->getProperty(IAccountManager::PROPERTY_BLUESKY)->getScope(),
+                        'fediverse' => $userAccount->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getValue(),
+                        'fediverseScope' => $userAccount->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getScope(),
+                        'birthdate' => $userAccount->getProperty(IAccountManager::PROPERTY_BIRTHDATE)->getValue(),
+                        'birthdateScope' => $userAccount->getProperty(IAccountManager::PROPERTY_BIRTHDATE)->getScope(),
+                        'pronouns' => $userAccount->getProperty(IAccountManager::PROPERTY_PRONOUNS)->getValue(),
+                        'pronounsScope' => $userAccount->getProperty(IAccountManager::PROPERTY_PRONOUNS)->getScope(),
+                        'message' => $this->l10n->t('Settings saved'),
+                    ],
+                ],
+                Http::STATUS_OK
+            );
+        } catch (ForbiddenException|InvalidArgumentException|PropertyDoesNotExistException $e) {
+            return new DataResponse([
+                'status' => 'error',
+                'data' => [
+                    'message' => $e->getMessage()
+                ],
+            ]);
+        }
+    }
+    /**
+     * update account manager with new user data
+     *
+     * @throws ForbiddenException
+     * @throws InvalidArgumentException
+     */
+    protected function saveUserSettings(IAccount $userAccount): void {
+        // keep the user back-end up-to-date with the latest display name and email
+        // address
+        $oldDisplayName = $userAccount->getUser()->getDisplayName();
+        if ($oldDisplayName !== $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue()) {
+            $result = $userAccount->getUser()->setDisplayName($userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getValue());
+            if ($result === false) {
+                throw new ForbiddenException($this->l10n->t('Unable to change full name'));
+            }
+        }
+
+        $oldEmailAddress = $userAccount->getUser()->getSystemEMailAddress();
+        $oldEmailAddress = strtolower((string)$oldEmailAddress);
+        if ($oldEmailAddress !== strtolower($userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue())) {
+            // this is the only permission a backend provides and is also used
+            // for the permission of setting a email address
+            if (!$userAccount->getUser()->canChangeDisplayName()) {
+                throw new ForbiddenException($this->l10n->t('Unable to change email address'));
+            }
+            $userAccount->getUser()->setSystemEMailAddress($userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue());
+        }
+
+        try {
+            $this->accountManager->updateAccount($userAccount);
+        } catch (InvalidArgumentException $e) {
+            if ($e->getMessage() === IAccountManager::PROPERTY_PHONE) {
+                throw new InvalidArgumentException($this->l10n->t('Unable to set invalid phone number'));
+            }
+            if ($e->getMessage() === IAccountManager::PROPERTY_WEBSITE) {
+                throw new InvalidArgumentException($this->l10n->t('Unable to set invalid website'));
+            }
+            throw new InvalidArgumentException($this->l10n->t('Some account data was invalid'));
+        }
+    }
+
+    /**
+     * Set the mail address of a user
+     *
+     * @NoSubAdminRequired
+     *
+     * @param string $account
+     * @param bool $onlyVerificationCode only return verification code without updating the data
+     * @return DataResponse
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    public function getVerificationCode(string $account, bool $onlyVerificationCode): DataResponse {
+        $user = $this->userSession->getUser();
+
+        if ($user === null) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        $userAccount = $this->accountManager->getAccount($user);
+        $cloudId = $user->getCloudId();
+        $message = 'Use my Federated Cloud ID to share with me: ' . $cloudId;
+        $signature = $this->signMessage($user, $message);
+
+        $code = $message . ' ' . $signature;
+        $codeMd5 = $message . ' ' . md5($signature);
+
+        switch ($account) {
+            case 'verify-twitter':
+                $msg = $this->l10n->t('In order to verify your Twitter account, post the following tweet on Twitter (please make sure to post it without any line breaks):');
+                $code = $codeMd5;
+                $type = IAccountManager::PROPERTY_TWITTER;
+                break;
+            case 'verify-website':
+                $msg = $this->l10n->t('In order to verify your Website, store the following content in your web-root at \'.well-known/CloudIdVerificationCode.txt\' (please make sure that the complete text is in one line):');
+                $type = IAccountManager::PROPERTY_WEBSITE;
+                break;
+            default:
+                return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        $userProperty = $userAccount->getProperty($type);
+        $userProperty
+            ->setVerified(IAccountManager::VERIFICATION_IN_PROGRESS)
+            ->setVerificationData($signature);
+
+        if ($onlyVerificationCode === false) {
+            $this->accountManager->updateAccount($userAccount);
+
+            $this->jobList->add(VerifyUserData::class,
+                [
+                    'verificationCode' => $code,
+                    'data' => $userProperty->getValue(),
+                    'type' => $type,
+                    'uid' => $user->getUID(),
+                    'try' => 0,
+                    'lastRun' => $this->getCurrentTime()
+                ]
+            );
+        }
+
+        return new DataResponse(['msg' => $msg, 'code' => $code]);
+    }
+
+    /**
+     * get current timestamp
+     *
+     * @return int
+     */
+    protected function getCurrentTime(): int {
+        return time();
+    }
+
+    /**
+     * sign message with users private key
+     *
+     * @param IUser $user
+     * @param string $message
+     *
+     * @return string base64 encoded signature
+     */
+    protected function signMessage(IUser $user, string $message): string {
+        $privateKey = $this->keyManager->getKey($user)->getPrivate();
+        openssl_sign(json_encode($message), $signature, $privateKey, OPENSSL_ALGO_SHA512);
+        return base64_encode($signature);
+    }
 }

apps/settings/lib/Settings/Personal/PersonalInfo.php

Indentation +284 added lines, -284 removed lines

@@ -33,288 +33,288 @@
 
 class PersonalInfo implements ISettings {
 
-	/** @var ProfileManager */
-	private $profileManager;
-
-	public function __construct(
-		private IConfig $config,
-		private IUserManager $userManager,
-		private IGroupManager $groupManager,
-		private IAccountManager $accountManager,
-		ProfileManager $profileManager,
-		private IAppManager $appManager,
-		private IFactory $l10nFactory,
-		private IL10N $l,
-		private IInitialState $initialStateService,
-		private IManager $manager,
-	) {
-		$this->profileManager = $profileManager;
-	}
-
-	public function getForm(): TemplateResponse {
-		$federationEnabled = $this->appManager->isEnabledForUser('federation');
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
-		$lookupServerUploadEnabled = false;
-		if ($federatedFileSharingEnabled) {
-			/** @var FederatedShareProvider $shareProvider */
-			$shareProvider = Server::get(FederatedShareProvider::class);
-			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
-		}
-
-		$uid = \OC_User::getUser();
-		$user = $this->userManager->get($uid);
-		$account = $this->accountManager->getAccount($user);
-
-		// make sure FS is setup before querying storage related stuff...
-		\OC_Util::setupFS($user->getUID());
-
-		$storageInfo = \OC_Helper::getStorageInfo('/');
-		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l->t('Unlimited');
-		} else {
-			$totalSpace = Util::humanFileSize($storageInfo['total']);
-		}
-
-		$messageParameters = $this->getMessageParameters($account);
-
-		$parameters = [
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-			'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
-			'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
-		] + $messageParameters;
-
-		$personalInfoParameters = [
-			'userId' => $uid,
-			'avatar' => $this->getProperty($account, IAccountManager::PROPERTY_AVATAR),
-			'groups' => $this->getGroups($user),
-			'quota' => $storageInfo['quota'],
-			'totalSpace' => $totalSpace,
-			'usage' => Util::humanFileSize($storageInfo['used']),
-			'usageRelative' => round($storageInfo['relative']),
-			'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
-			'emailMap' => $this->getEmailMap($account),
-			'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
-			'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
-			'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
-			'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
-			'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
-			'bluesky' => $this->getProperty($account, IAccountManager::PROPERTY_BLUESKY),
-			'fediverse' => $this->getProperty($account, IAccountManager::PROPERTY_FEDIVERSE),
-			'languageMap' => $this->getLanguageMap($user),
-			'localeMap' => $this->getLocaleMap($user),
-			'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
-			'profileEnabled' => $this->profileManager->isProfileEnabled($user),
-			'organisation' => $this->getProperty($account, IAccountManager::PROPERTY_ORGANISATION),
-			'role' => $this->getProperty($account, IAccountManager::PROPERTY_ROLE),
-			'headline' => $this->getProperty($account, IAccountManager::PROPERTY_HEADLINE),
-			'biography' => $this->getProperty($account, IAccountManager::PROPERTY_BIOGRAPHY),
-			'birthdate' => $this->getProperty($account, IAccountManager::PROPERTY_BIRTHDATE),
-			'firstDayOfWeek' => $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK),
-			'pronouns' => $this->getProperty($account, IAccountManager::PROPERTY_PRONOUNS),
-		];
-
-		$accountParameters = [
-			'avatarChangeSupported' => $user->canChangeAvatar(),
-			'displayNameChangeSupported' => $user->canChangeDisplayName(),
-			'emailChangeSupported' => $user->canChangeEmail(),
-			'federationEnabled' => $federationEnabled,
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-		];
-
-		$profileParameters = [
-			'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user),
-		];
-
-		$this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled());
-		$this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters);
-		$this->initialStateService->provideInitialState('accountParameters', $accountParameters);
-		$this->initialStateService->provideInitialState('profileParameters', $profileParameters);
-
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
-	}
-
-	/**
-	 * Check if is fair use of free push service
-	 * @return boolean
-	 */
-	private function isFairUseOfFreePushService(): bool {
-		return $this->manager->isFairUseOfFreePushService();
-	}
-
-	/**
-	 * returns the property data in an
-	 * associative array
-	 */
-	private function getProperty(IAccount $account, string $property): array {
-		$property = [
-			'name' => $account->getProperty($property)->getName(),
-			'value' => $account->getProperty($property)->getValue(),
-			'scope' => $account->getProperty($property)->getScope(),
-			'verified' => $account->getProperty($property)->getVerified(),
-		];
-
-		return $property;
-	}
-
-	/**
-	 * returns the section ID string, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection(): string {
-		return 'personal-info';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority(): int {
-		return 10;
-	}
-
-	/**
-	 * returns a sorted list of the user's group GIDs
-	 */
-	private function getGroups(IUser $user): array {
-		$groups = array_map(
-			static function (IGroup $group) {
-				return $group->getDisplayName();
-			},
-			$this->groupManager->getUserGroups($user)
-		);
-		sort($groups);
-
-		return $groups;
-	}
-
-	/**
-	 * returns the primary email and additional emails in an
-	 * associative array
-	 */
-	private function getEmailMap(IAccount $account): array {
-		$systemEmail = [
-			'name' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getName(),
-			'value' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
-			'scope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
-			'verified' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
-		];
-
-		$additionalEmails = array_map(
-			function (IAccountProperty $property) {
-				return [
-					'name' => $property->getName(),
-					'value' => $property->getValue(),
-					'scope' => $property->getScope(),
-					'verified' => $property->getVerified(),
-					'locallyVerified' => $property->getLocallyVerified(),
-				];
-			},
-			$account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties(),
-		);
-
-		$emailMap = [
-			'primaryEmail' => $systemEmail,
-			'additionalEmails' => $additionalEmails,
-			'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
-		];
-
-		return $emailMap;
-	}
-
-	/**
-	 * returns the user's active language, common languages, and other languages in an
-	 * associative array
-	 */
-	private function getLanguageMap(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_language', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$languages = $this->l10nFactory->getLanguages();
-
-		// associate the user language with the proper array
-		$userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
-		$userLang = $languages['commonLanguages'][$userLangIndex];
-		// search in the other languages
-		if ($userLangIndex === false) {
-			$userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'));
-			$userLang = $languages['otherLanguages'][$userLangIndex];
-		}
-		// if user language is not available but set somehow: show the actual code as name
-		if (!is_array($userLang)) {
-			$userLang = [
-				'code' => $userConfLang,
-				'name' => $userConfLang,
-			];
-		}
-
-		return array_merge(
-			['activeLanguage' => $userLang],
-			$languages
-		);
-	}
-
-	private function getLocaleMap(IUser $user): array {
-		$forceLanguage = $this->config->getSystemValue('force_locale', false);
-		if ($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));
-		$localeCodes = $this->l10nFactory->findAvailableLocales();
-		$userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);
-
-		if (!empty($userLocale)) {
-			$userLocale = reset($userLocale);
-		}
-
-		$localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => str_starts_with($localeCode['code'], $userLang)));
-		$otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => !str_starts_with($localeCode['code'], $userLang)));
-
-		if (!$userLocale) {
-			$userLocale = [
-				'code' => 'en',
-				'name' => 'English'
-			];
-		}
-
-		return [
-			'activeLocaleLang' => $userLocaleString,
-			'activeLocale' => $userLocale,
-			'localesForLanguage' => $localesForLanguage,
-			'otherLocales' => $otherLocales,
-		];
-	}
-
-	/**
-	 * returns the message parameters
-	 */
-	private function getMessageParameters(IAccount $account): array {
-		$needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
-		$messageParameters = [];
-		foreach ($needVerifyMessage as $property) {
-			switch ($account->getProperty($property)->getVerified()) {
-				case IAccountManager::VERIFIED:
-					$message = $this->l->t('Verifying');
-					break;
-				case IAccountManager::VERIFICATION_IN_PROGRESS:
-					$message = $this->l->t('Verifying …');
-					break;
-				default:
-					$message = $this->l->t('Verify');
-			}
-			$messageParameters[$property . 'Message'] = $message;
-		}
-		return $messageParameters;
-	}
+    /** @var ProfileManager */
+    private $profileManager;
+
+    public function __construct(
+        private IConfig $config,
+        private IUserManager $userManager,
+        private IGroupManager $groupManager,
+        private IAccountManager $accountManager,
+        ProfileManager $profileManager,
+        private IAppManager $appManager,
+        private IFactory $l10nFactory,
+        private IL10N $l,
+        private IInitialState $initialStateService,
+        private IManager $manager,
+    ) {
+        $this->profileManager = $profileManager;
+    }
+
+    public function getForm(): TemplateResponse {
+        $federationEnabled = $this->appManager->isEnabledForUser('federation');
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
+        $lookupServerUploadEnabled = false;
+        if ($federatedFileSharingEnabled) {
+            /** @var FederatedShareProvider $shareProvider */
+            $shareProvider = Server::get(FederatedShareProvider::class);
+            $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
+        }
+
+        $uid = \OC_User::getUser();
+        $user = $this->userManager->get($uid);
+        $account = $this->accountManager->getAccount($user);
+
+        // make sure FS is setup before querying storage related stuff...
+        \OC_Util::setupFS($user->getUID());
+
+        $storageInfo = \OC_Helper::getStorageInfo('/');
+        if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l->t('Unlimited');
+        } else {
+            $totalSpace = Util::humanFileSize($storageInfo['total']);
+        }
+
+        $messageParameters = $this->getMessageParameters($account);
+
+        $parameters = [
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+            'isFairUseOfFreePushService' => $this->isFairUseOfFreePushService(),
+            'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
+        ] + $messageParameters;
+
+        $personalInfoParameters = [
+            'userId' => $uid,
+            'avatar' => $this->getProperty($account, IAccountManager::PROPERTY_AVATAR),
+            'groups' => $this->getGroups($user),
+            'quota' => $storageInfo['quota'],
+            'totalSpace' => $totalSpace,
+            'usage' => Util::humanFileSize($storageInfo['used']),
+            'usageRelative' => round($storageInfo['relative']),
+            'displayName' => $this->getProperty($account, IAccountManager::PROPERTY_DISPLAYNAME),
+            'emailMap' => $this->getEmailMap($account),
+            'phone' => $this->getProperty($account, IAccountManager::PROPERTY_PHONE),
+            'defaultPhoneRegion' => $this->config->getSystemValueString('default_phone_region'),
+            'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
+            'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
+            'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
+            'bluesky' => $this->getProperty($account, IAccountManager::PROPERTY_BLUESKY),
+            'fediverse' => $this->getProperty($account, IAccountManager::PROPERTY_FEDIVERSE),
+            'languageMap' => $this->getLanguageMap($user),
+            'localeMap' => $this->getLocaleMap($user),
+            'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),
+            'profileEnabled' => $this->profileManager->isProfileEnabled($user),
+            'organisation' => $this->getProperty($account, IAccountManager::PROPERTY_ORGANISATION),
+            'role' => $this->getProperty($account, IAccountManager::PROPERTY_ROLE),
+            'headline' => $this->getProperty($account, IAccountManager::PROPERTY_HEADLINE),
+            'biography' => $this->getProperty($account, IAccountManager::PROPERTY_BIOGRAPHY),
+            'birthdate' => $this->getProperty($account, IAccountManager::PROPERTY_BIRTHDATE),
+            'firstDayOfWeek' => $this->config->getUserValue($uid, 'core', AUserDataOCSController::USER_FIELD_FIRST_DAY_OF_WEEK),
+            'pronouns' => $this->getProperty($account, IAccountManager::PROPERTY_PRONOUNS),
+        ];
+
+        $accountParameters = [
+            'avatarChangeSupported' => $user->canChangeAvatar(),
+            'displayNameChangeSupported' => $user->canChangeDisplayName(),
+            'emailChangeSupported' => $user->canChangeEmail(),
+            'federationEnabled' => $federationEnabled,
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+        ];
+
+        $profileParameters = [
+            'profileConfig' => $this->profileManager->getProfileConfigWithMetadata($user, $user),
+        ];
+
+        $this->initialStateService->provideInitialState('profileEnabledGlobally', $this->profileManager->isProfileEnabled());
+        $this->initialStateService->provideInitialState('personalInfoParameters', $personalInfoParameters);
+        $this->initialStateService->provideInitialState('accountParameters', $accountParameters);
+        $this->initialStateService->provideInitialState('profileParameters', $profileParameters);
+
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
+    }
+
+    /**
+     * Check if is fair use of free push service
+     * @return boolean
+     */
+    private function isFairUseOfFreePushService(): bool {
+        return $this->manager->isFairUseOfFreePushService();
+    }
+
+    /**
+     * returns the property data in an
+     * associative array
+     */
+    private function getProperty(IAccount $account, string $property): array {
+        $property = [
+            'name' => $account->getProperty($property)->getName(),
+            'value' => $account->getProperty($property)->getValue(),
+            'scope' => $account->getProperty($property)->getScope(),
+            'verified' => $account->getProperty($property)->getVerified(),
+        ];
+
+        return $property;
+    }
+
+    /**
+     * returns the section ID string, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection(): string {
+        return 'personal-info';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     *             the admin section. The forms are arranged in ascending order of the
+     *             priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority(): int {
+        return 10;
+    }
+
+    /**
+     * returns a sorted list of the user's group GIDs
+     */
+    private function getGroups(IUser $user): array {
+        $groups = array_map(
+            static function (IGroup $group) {
+                return $group->getDisplayName();
+            },
+            $this->groupManager->getUserGroups($user)
+        );
+        sort($groups);
+
+        return $groups;
+    }
+
+    /**
+     * returns the primary email and additional emails in an
+     * associative array
+     */
+    private function getEmailMap(IAccount $account): array {
+        $systemEmail = [
+            'name' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getName(),
+            'value' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getValue(),
+            'scope' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope(),
+            'verified' => $account->getProperty(IAccountManager::PROPERTY_EMAIL)->getVerified(),
+        ];
+
+        $additionalEmails = array_map(
+            function (IAccountProperty $property) {
+                return [
+                    'name' => $property->getName(),
+                    'value' => $property->getValue(),
+                    'scope' => $property->getScope(),
+                    'verified' => $property->getVerified(),
+                    'locallyVerified' => $property->getLocallyVerified(),
+                ];
+            },
+            $account->getPropertyCollection(IAccountManager::COLLECTION_EMAIL)->getProperties(),
+        );
+
+        $emailMap = [
+            'primaryEmail' => $systemEmail,
+            'additionalEmails' => $additionalEmails,
+            'notificationEmail' => (string)$account->getUser()->getPrimaryEMailAddress(),
+        ];
+
+        return $emailMap;
+    }
+
+    /**
+     * returns the user's active language, common languages, and other languages in an
+     * associative array
+     */
+    private function getLanguageMap(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_language', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $languages = $this->l10nFactory->getLanguages();
+
+        // associate the user language with the proper array
+        $userLangIndex = array_search($userConfLang, array_column($languages['commonLanguages'], 'code'));
+        $userLang = $languages['commonLanguages'][$userLangIndex];
+        // search in the other languages
+        if ($userLangIndex === false) {
+            $userLangIndex = array_search($userConfLang, array_column($languages['otherLanguages'], 'code'));
+            $userLang = $languages['otherLanguages'][$userLangIndex];
+        }
+        // if user language is not available but set somehow: show the actual code as name
+        if (!is_array($userLang)) {
+            $userLang = [
+                'code' => $userConfLang,
+                'name' => $userConfLang,
+            ];
+        }
+
+        return array_merge(
+            ['activeLanguage' => $userLang],
+            $languages
+        );
+    }
+
+    private function getLocaleMap(IUser $user): array {
+        $forceLanguage = $this->config->getSystemValue('force_locale', false);
+        if ($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale($userLang));
+        $localeCodes = $this->l10nFactory->findAvailableLocales();
+        $userLocale = array_filter($localeCodes, fn ($value) => $userLocaleString === $value['code']);
+
+        if (!empty($userLocale)) {
+            $userLocale = reset($userLocale);
+        }
+
+        $localesForLanguage = array_values(array_filter($localeCodes, fn ($localeCode) => str_starts_with($localeCode['code'], $userLang)));
+        $otherLocales = array_values(array_filter($localeCodes, fn ($localeCode) => !str_starts_with($localeCode['code'], $userLang)));
+
+        if (!$userLocale) {
+            $userLocale = [
+                'code' => 'en',
+                'name' => 'English'
+            ];
+        }
+
+        return [
+            'activeLocaleLang' => $userLocaleString,
+            'activeLocale' => $userLocale,
+            'localesForLanguage' => $localesForLanguage,
+            'otherLocales' => $otherLocales,
+        ];
+    }
+
+    /**
+     * returns the message parameters
+     */
+    private function getMessageParameters(IAccount $account): array {
+        $needVerifyMessage = [IAccountManager::PROPERTY_EMAIL, IAccountManager::PROPERTY_WEBSITE, IAccountManager::PROPERTY_TWITTER];
+        $messageParameters = [];
+        foreach ($needVerifyMessage as $property) {
+            switch ($account->getProperty($property)->getVerified()) {
+                case IAccountManager::VERIFIED:
+                    $message = $this->l->t('Verifying');
+                    break;
+                case IAccountManager::VERIFICATION_IN_PROGRESS:
+                    $message = $this->l->t('Verifying …');
+                    break;
+                default:
+                    $message = $this->l->t('Verify');
+            }
+            $messageParameters[$property . 'Message'] = $message;
+        }
+        return $messageParameters;
+    }
 }

apps/provisioning_api/tests/Controller/UsersControllerTest.php

Indentation +4412 added lines, -4412 removed lines

@@ -47,4417 +47,4417 @@
 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')->willReturnOnConsecutiveCalls(['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')
-			->willReturn($this->createMock(IUser::class));
-		$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')
-			->willReturn($this->createMock(IUser::class));
-		$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')
-			->willReturn($this->createMock(IUser::class));
-		$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('setSystemEMailAddress');
-		$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 testAddUserSuccessfulLowercaseEmail(): void {
-		$this->userManager
-			->expects($this->once())
-			->method('userExists')
-			->with('NewUser')
-			->willReturn(false);
-		$newUser = $this->createMock(IUser::class);
-		$newUser->expects($this->once())
-			->method('setSystemEMailAddress')
-			->with('foo@bar.com');
-		$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.CoM')->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): void {
-				$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')
-			->willThrowException($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): void {
-				$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_BLUESKY => ['value' => 'bluesky'],
-			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',
-			'bluesky' => 'bluesky',
-			'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_BLUESKY => ['value' => 'bluesky'],
-			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',
-			'bluesky' => 'bluesky',
-			'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_BLUESKY => ['value' => 'bluesky'],
-			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',
-			'bluesky' => 'bluesky',
-			'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']],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\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('setSystemEMailAddress')
-			->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_BLUESKY, 'old.bluesky', 'new.bluesky'],
-			[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'],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\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_BLUESKY, 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],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\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],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\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());
-	}
-
-	#[\PHPUnit\Framework\Attributes\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')->willReturnOnConsecutiveCalls(['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')
+            ->willReturn($this->createMock(IUser::class));
+        $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')
+            ->willReturn($this->createMock(IUser::class));
+        $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')
+            ->willReturn($this->createMock(IUser::class));
+        $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('setSystemEMailAddress');
+        $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 testAddUserSuccessfulLowercaseEmail(): void {
+        $this->userManager
+            ->expects($this->once())
+            ->method('userExists')
+            ->with('NewUser')
+            ->willReturn(false);
+        $newUser = $this->createMock(IUser::class);
+        $newUser->expects($this->once())
+            ->method('setSystemEMailAddress')
+            ->with('foo@bar.com');
+        $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.CoM')->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): void {
+                $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')
+            ->willThrowException($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): void {
+                $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_BLUESKY => ['value' => 'bluesky'],
+            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',
+            'bluesky' => 'bluesky',
+            '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_BLUESKY => ['value' => 'bluesky'],
+            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',
+            'bluesky' => 'bluesky',
+            '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_BLUESKY => ['value' => 'bluesky'],
+            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',
+            'bluesky' => 'bluesky',
+            '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']],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\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('setSystemEMailAddress')
+            ->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_BLUESKY, 'old.bluesky', 'new.bluesky'],
+            [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'],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\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_BLUESKY, 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],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\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],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\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());
+    }
+
+    #[\PHPUnit\Framework\Attributes\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',
-					'bluesky' => 'bluesky',
-					'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',
-			'bluesky' => 'bluesky',
-			'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',
-			'bluesky' => 'bluesky',
-			'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_BLUESKY,
-				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_BLUESKY,
-				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_BLUESKY,
-				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_BLUESKY,
-				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_BLUESKY,
-				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_BLUESKY,
-				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_BLUESKY,
-				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_BLUESKY,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			]],
-		];
-	}
-
-	#[\PHPUnit\Framework\Attributes\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')
-			->willReturnMap($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',
+                    'bluesky' => 'bluesky',
+                    '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',
+            'bluesky' => 'bluesky',
+            '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',
+            'bluesky' => 'bluesky',
+            '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_BLUESKY,
+                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_BLUESKY,
+                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_BLUESKY,
+                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_BLUESKY,
+                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_BLUESKY,
+                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_BLUESKY,
+                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_BLUESKY,
+                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_BLUESKY,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ]],
+        ];
+    }
+
+    #[\PHPUnit\Framework\Attributes\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')
+            ->willReturnMap($mockedProperties);
+
+        $this->accountManager->expects($this->any())->method('getAccount')
+            ->with($targetUser)
+            ->willReturn($account);
+    }
 }

apps/provisioning_api/lib/Controller/AUserDataOCSController.php

Indentation +284 added lines, -284 removed lines

@@ -38,288 +38,288 @@
  * @psalm-import-type Provisioning_APIUserDetailsQuota from ResponseDefinitions
  */
 abstract class AUserDataOCSController extends OCSController {
-	public const SCOPE_SUFFIX = 'Scope';
-
-	public const USER_FIELD_DISPLAYNAME = 'display';
-	public const USER_FIELD_LANGUAGE = 'language';
-	public const USER_FIELD_LOCALE = 'locale';
-	public const USER_FIELD_FIRST_DAY_OF_WEEK = 'first_day_of_week';
-	public const USER_FIELD_PASSWORD = 'password';
-	public const USER_FIELD_QUOTA = 'quota';
-	public const USER_FIELD_MANAGER = 'manager';
-	public const USER_FIELD_NOTIFICATION_EMAIL = 'notify_email';
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		protected IUserManager $userManager,
-		protected IConfig $config,
-		protected GroupManager $groupManager,
-		protected IUserSession $userSession,
-		protected IAccountManager $accountManager,
-		protected ISubAdmin $subAdminManager,
-		protected IFactory $l10nFactory,
-		protected IRootFolder $rootFolder,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * creates a array with all user data
-	 *
-	 * @param string $userId
-	 * @param bool $includeScopes
-	 * @return Provisioning_APIUserDetails|null
-	 * @throws NotFoundException
-	 * @throws OCSException
-	 * @throws OCSNotFoundException
-	 */
-	protected function getUserData(string $userId, bool $includeScopes = false): ?array {
-		$currentLoggedInUser = $this->userSession->getUser();
-		assert($currentLoggedInUser !== null, 'No user logged in');
-
-		$data = [];
-
-		// Check if the target user exists
-		$targetUserObject = $this->userManager->get($userId);
-		if ($targetUserObject === null) {
-			throw new OCSNotFoundException('User does not exist');
-		}
-
-		$isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
-		$isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
-		if ($isAdmin
-			|| $isDelegatedAdmin
-			|| $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
-			$data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
-		} else {
-			// Check they are looking up themselves
-			if ($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
-				return null;
-			}
-		}
-
-		// Get groups data
-		$userAccount = $this->accountManager->getAccount($targetUserObject);
-		$groups = $this->groupManager->getUserGroups($targetUserObject);
-		$gids = [];
-		foreach ($groups as $group) {
-			$gids[] = $group->getGID();
-		}
-
-		if ($isAdmin || $isDelegatedAdmin) {
-			try {
-				# might be thrown by LDAP due to handling of users disappears
-				# from the external source (reasons unknown to us)
-				# cf. https://github.com/nextcloud/server/issues/12991
-				$data['storageLocation'] = $targetUserObject->getHome();
-			} catch (NoUserException $e) {
-				throw new OCSNotFoundException($e->getMessage(), $e);
-			}
-		}
-
-		// Find the data
-		$data['id'] = $targetUserObject->getUID();
-		$data['firstLoginTimestamp'] = $targetUserObject->getFirstLogin();
-		$data['lastLoginTimestamp'] = $targetUserObject->getLastLogin();
-		$data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
-		$data['backend'] = $targetUserObject->getBackendClassName();
-		$data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());
-		$data[self::USER_FIELD_QUOTA] = $this->fillStorageInfo($targetUserObject);
-		$managers = $this->getManagers($targetUserObject);
-		$data[self::USER_FIELD_MANAGER] = empty($managers) ? '' : $managers[0];
-
-		try {
-			if ($includeScopes) {
-				$data[IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope();
-			}
-
-			$data[IAccountManager::PROPERTY_EMAIL] = $targetUserObject->getSystemEMailAddress();
-			if ($includeScopes) {
-				$data[IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope();
-			}
-
-			$additionalEmails = $additionalEmailScopes = [];
-			$emailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
-			foreach ($emailCollection->getProperties() as $property) {
-				$email = mb_strtolower(trim($property->getValue()));
-				$additionalEmails[] = $email;
-				if ($includeScopes) {
-					$additionalEmailScopes[] = $property->getScope();
-				}
-			}
-			$data[IAccountManager::COLLECTION_EMAIL] = $additionalEmails;
-			if ($includeScopes) {
-				$data[IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX] = $additionalEmailScopes;
-			}
-
-			$data[IAccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
-			$data[IAccountManager::PROPERTY_DISPLAYNAME_LEGACY] = $data[IAccountManager::PROPERTY_DISPLAYNAME];
-			if ($includeScopes) {
-				$data[IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope();
-			}
-
-			foreach ([
-				IAccountManager::PROPERTY_PHONE,
-				IAccountManager::PROPERTY_ADDRESS,
-				IAccountManager::PROPERTY_WEBSITE,
-				IAccountManager::PROPERTY_TWITTER,
-				IAccountManager::PROPERTY_BLUESKY,
-				IAccountManager::PROPERTY_FEDIVERSE,
-				IAccountManager::PROPERTY_ORGANISATION,
-				IAccountManager::PROPERTY_ROLE,
-				IAccountManager::PROPERTY_HEADLINE,
-				IAccountManager::PROPERTY_BIOGRAPHY,
-				IAccountManager::PROPERTY_PROFILE_ENABLED,
-				IAccountManager::PROPERTY_PRONOUNS,
-			] as $propertyName) {
-				$property = $userAccount->getProperty($propertyName);
-				$data[$propertyName] = $property->getValue();
-				if ($includeScopes) {
-					$data[$propertyName . self::SCOPE_SUFFIX] = $property->getScope();
-				}
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			// hard coded properties should exist
-			throw new OCSException($e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
-
-		$data['groups'] = $gids;
-		$data[self::USER_FIELD_LANGUAGE] = $this->l10nFactory->getUserLanguage($targetUserObject);
-		$data[self::USER_FIELD_LOCALE] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale');
-		$data[self::USER_FIELD_NOTIFICATION_EMAIL] = $targetUserObject->getPrimaryEMailAddress();
-
-		$backend = $targetUserObject->getBackend();
-		$data['backendCapabilities'] = [
-			'setDisplayName' => $backend instanceof ISetDisplayNameBackend || $backend->implementsActions(Backend::SET_DISPLAYNAME),
-			'setPassword' => $backend instanceof ISetPasswordBackend || $backend->implementsActions(Backend::SET_PASSWORD),
-		];
-
-		return $data;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	protected function getManagers(IUser $user): array {
-		$currentLoggedInUser = $this->userSession->getUser();
-
-		$managerUids = $user->getManagerUids();
-		if ($this->groupManager->isAdmin($currentLoggedInUser->getUID()) || $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID())) {
-			return $managerUids;
-		}
-
-		if ($this->subAdminManager->isSubAdmin($currentLoggedInUser)) {
-			$accessibleManagerUids = array_values(array_filter(
-				$managerUids,
-				function (string $managerUid) use ($currentLoggedInUser) {
-					$manager = $this->userManager->get($managerUid);
-					if (!($manager instanceof IUser)) {
-						return false;
-					}
-					return $this->subAdminManager->isUserAccessible($currentLoggedInUser, $manager);
-				},
-			));
-			return $accessibleManagerUids;
-		}
-
-		return [];
-	}
-
-	/**
-	 * Get the groups a user is a subadmin of
-	 *
-	 * @param string $userId
-	 * @return list<string>
-	 * @throws OCSException
-	 */
-	protected function getUserSubAdminGroupsData(string $userId): array {
-		$user = $this->userManager->get($userId);
-		// Check if the user exists
-		if ($user === null) {
-			throw new OCSNotFoundException('User does not exist');
-		}
-
-		// Get the subadmin groups
-		$subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
-		$groups = [];
-		foreach ($subAdminGroups as $key => $group) {
-			$groups[] = $group->getGID();
-		}
-
-		return $groups;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return Provisioning_APIUserDetailsQuota
-	 * @throws OCSException
-	 */
-	protected function fillStorageInfo(IUser $user): array {
-		$includeExternal = $this->config->getSystemValueBool('quota_include_external_storage');
-		$userId = $user->getUID();
-
-		$quota = $user->getQuota();
-		if ($quota === 'none') {
-			$quota = FileInfo::SPACE_UNLIMITED;
-		} else {
-			$quota = Util::computerFileSize($quota);
-			if ($quota === false) {
-				$quota = FileInfo::SPACE_UNLIMITED;
-			}
-		}
-
-		try {
-			if ($includeExternal) {
-				\OC_Util::tearDownFS();
-				\OC_Util::setupFS($user->getUID());
-				$storage = \OC_Helper::getStorageInfo('/', null, true, false);
-				$data = [
-					'free' => $storage['free'],
-					'used' => $storage['used'],
-					'total' => $storage['total'],
-					'relative' => $storage['relative'],
-					self::USER_FIELD_QUOTA => $storage['quota'],
-				];
-			} else {
-				$userFileInfo = $this->rootFolder->getUserFolder($userId)->getStorage()->getCache()->get('');
-				$used = $userFileInfo->getSize();
-
-				if ($quota > 0) {
-					// prevent division by zero or error codes (negative values)
-					$relative = round(($used / $quota) * 10000) / 100;
-					$free = $quota - $used;
-					$total = $quota;
-				} else {
-					$relative = 0;
-					$free = FileInfo::SPACE_UNLIMITED;
-					$total = FileInfo::SPACE_UNLIMITED;
-				}
-
-				$data = [
-					'free' => $free,
-					'used' => $used,
-					'total' => $total,
-					'relative' => $relative,
-					self::USER_FIELD_QUOTA => $quota,
-				];
-			}
-		} catch (NotFoundException $ex) {
-			$data = [
-				self::USER_FIELD_QUOTA => $quota >= 0 ? $quota : 'none',
-				'used' => 0
-			];
-		} catch (\Exception $e) {
-			Server::get(\Psr\Log\LoggerInterface::class)->error(
-				'Could not load storage info for {user}',
-				[
-					'app' => 'provisioning_api',
-					'user' => $userId,
-					'exception' => $e,
-				]
-			);
-			return [];
-		}
-		return $data;
-	}
+    public const SCOPE_SUFFIX = 'Scope';
+
+    public const USER_FIELD_DISPLAYNAME = 'display';
+    public const USER_FIELD_LANGUAGE = 'language';
+    public const USER_FIELD_LOCALE = 'locale';
+    public const USER_FIELD_FIRST_DAY_OF_WEEK = 'first_day_of_week';
+    public const USER_FIELD_PASSWORD = 'password';
+    public const USER_FIELD_QUOTA = 'quota';
+    public const USER_FIELD_MANAGER = 'manager';
+    public const USER_FIELD_NOTIFICATION_EMAIL = 'notify_email';
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected IUserManager $userManager,
+        protected IConfig $config,
+        protected GroupManager $groupManager,
+        protected IUserSession $userSession,
+        protected IAccountManager $accountManager,
+        protected ISubAdmin $subAdminManager,
+        protected IFactory $l10nFactory,
+        protected IRootFolder $rootFolder,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * creates a array with all user data
+     *
+     * @param string $userId
+     * @param bool $includeScopes
+     * @return Provisioning_APIUserDetails|null
+     * @throws NotFoundException
+     * @throws OCSException
+     * @throws OCSNotFoundException
+     */
+    protected function getUserData(string $userId, bool $includeScopes = false): ?array {
+        $currentLoggedInUser = $this->userSession->getUser();
+        assert($currentLoggedInUser !== null, 'No user logged in');
+
+        $data = [];
+
+        // Check if the target user exists
+        $targetUserObject = $this->userManager->get($userId);
+        if ($targetUserObject === null) {
+            throw new OCSNotFoundException('User does not exist');
+        }
+
+        $isAdmin = $this->groupManager->isAdmin($currentLoggedInUser->getUID());
+        $isDelegatedAdmin = $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID());
+        if ($isAdmin
+            || $isDelegatedAdmin
+            || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) {
+            $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true';
+        } else {
+            // Check they are looking up themselves
+            if ($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) {
+                return null;
+            }
+        }
+
+        // Get groups data
+        $userAccount = $this->accountManager->getAccount($targetUserObject);
+        $groups = $this->groupManager->getUserGroups($targetUserObject);
+        $gids = [];
+        foreach ($groups as $group) {
+            $gids[] = $group->getGID();
+        }
+
+        if ($isAdmin || $isDelegatedAdmin) {
+            try {
+                # might be thrown by LDAP due to handling of users disappears
+                # from the external source (reasons unknown to us)
+                # cf. https://github.com/nextcloud/server/issues/12991
+                $data['storageLocation'] = $targetUserObject->getHome();
+            } catch (NoUserException $e) {
+                throw new OCSNotFoundException($e->getMessage(), $e);
+            }
+        }
+
+        // Find the data
+        $data['id'] = $targetUserObject->getUID();
+        $data['firstLoginTimestamp'] = $targetUserObject->getFirstLogin();
+        $data['lastLoginTimestamp'] = $targetUserObject->getLastLogin();
+        $data['lastLogin'] = $targetUserObject->getLastLogin() * 1000;
+        $data['backend'] = $targetUserObject->getBackendClassName();
+        $data['subadmin'] = $this->getUserSubAdminGroupsData($targetUserObject->getUID());
+        $data[self::USER_FIELD_QUOTA] = $this->fillStorageInfo($targetUserObject);
+        $managers = $this->getManagers($targetUserObject);
+        $data[self::USER_FIELD_MANAGER] = empty($managers) ? '' : $managers[0];
+
+        try {
+            if ($includeScopes) {
+                $data[IAccountManager::PROPERTY_AVATAR . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_AVATAR)->getScope();
+            }
+
+            $data[IAccountManager::PROPERTY_EMAIL] = $targetUserObject->getSystemEMailAddress();
+            if ($includeScopes) {
+                $data[IAccountManager::PROPERTY_EMAIL . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_EMAIL)->getScope();
+            }
+
+            $additionalEmails = $additionalEmailScopes = [];
+            $emailCollection = $userAccount->getPropertyCollection(IAccountManager::COLLECTION_EMAIL);
+            foreach ($emailCollection->getProperties() as $property) {
+                $email = mb_strtolower(trim($property->getValue()));
+                $additionalEmails[] = $email;
+                if ($includeScopes) {
+                    $additionalEmailScopes[] = $property->getScope();
+                }
+            }
+            $data[IAccountManager::COLLECTION_EMAIL] = $additionalEmails;
+            if ($includeScopes) {
+                $data[IAccountManager::COLLECTION_EMAIL . self::SCOPE_SUFFIX] = $additionalEmailScopes;
+            }
+
+            $data[IAccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName();
+            $data[IAccountManager::PROPERTY_DISPLAYNAME_LEGACY] = $data[IAccountManager::PROPERTY_DISPLAYNAME];
+            if ($includeScopes) {
+                $data[IAccountManager::PROPERTY_DISPLAYNAME . self::SCOPE_SUFFIX] = $userAccount->getProperty(IAccountManager::PROPERTY_DISPLAYNAME)->getScope();
+            }
+
+            foreach ([
+                IAccountManager::PROPERTY_PHONE,
+                IAccountManager::PROPERTY_ADDRESS,
+                IAccountManager::PROPERTY_WEBSITE,
+                IAccountManager::PROPERTY_TWITTER,
+                IAccountManager::PROPERTY_BLUESKY,
+                IAccountManager::PROPERTY_FEDIVERSE,
+                IAccountManager::PROPERTY_ORGANISATION,
+                IAccountManager::PROPERTY_ROLE,
+                IAccountManager::PROPERTY_HEADLINE,
+                IAccountManager::PROPERTY_BIOGRAPHY,
+                IAccountManager::PROPERTY_PROFILE_ENABLED,
+                IAccountManager::PROPERTY_PRONOUNS,
+            ] as $propertyName) {
+                $property = $userAccount->getProperty($propertyName);
+                $data[$propertyName] = $property->getValue();
+                if ($includeScopes) {
+                    $data[$propertyName . self::SCOPE_SUFFIX] = $property->getScope();
+                }
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            // hard coded properties should exist
+            throw new OCSException($e->getMessage(), Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
+
+        $data['groups'] = $gids;
+        $data[self::USER_FIELD_LANGUAGE] = $this->l10nFactory->getUserLanguage($targetUserObject);
+        $data[self::USER_FIELD_LOCALE] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale');
+        $data[self::USER_FIELD_NOTIFICATION_EMAIL] = $targetUserObject->getPrimaryEMailAddress();
+
+        $backend = $targetUserObject->getBackend();
+        $data['backendCapabilities'] = [
+            'setDisplayName' => $backend instanceof ISetDisplayNameBackend || $backend->implementsActions(Backend::SET_DISPLAYNAME),
+            'setPassword' => $backend instanceof ISetPasswordBackend || $backend->implementsActions(Backend::SET_PASSWORD),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @return string[]
+     */
+    protected function getManagers(IUser $user): array {
+        $currentLoggedInUser = $this->userSession->getUser();
+
+        $managerUids = $user->getManagerUids();
+        if ($this->groupManager->isAdmin($currentLoggedInUser->getUID()) || $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID())) {
+            return $managerUids;
+        }
+
+        if ($this->subAdminManager->isSubAdmin($currentLoggedInUser)) {
+            $accessibleManagerUids = array_values(array_filter(
+                $managerUids,
+                function (string $managerUid) use ($currentLoggedInUser) {
+                    $manager = $this->userManager->get($managerUid);
+                    if (!($manager instanceof IUser)) {
+                        return false;
+                    }
+                    return $this->subAdminManager->isUserAccessible($currentLoggedInUser, $manager);
+                },
+            ));
+            return $accessibleManagerUids;
+        }
+
+        return [];
+    }
+
+    /**
+     * Get the groups a user is a subadmin of
+     *
+     * @param string $userId
+     * @return list<string>
+     * @throws OCSException
+     */
+    protected function getUserSubAdminGroupsData(string $userId): array {
+        $user = $this->userManager->get($userId);
+        // Check if the user exists
+        if ($user === null) {
+            throw new OCSNotFoundException('User does not exist');
+        }
+
+        // Get the subadmin groups
+        $subAdminGroups = $this->groupManager->getSubAdmin()->getSubAdminsGroups($user);
+        $groups = [];
+        foreach ($subAdminGroups as $key => $group) {
+            $groups[] = $group->getGID();
+        }
+
+        return $groups;
+    }
+
+    /**
+     * @param IUser $user
+     * @return Provisioning_APIUserDetailsQuota
+     * @throws OCSException
+     */
+    protected function fillStorageInfo(IUser $user): array {
+        $includeExternal = $this->config->getSystemValueBool('quota_include_external_storage');
+        $userId = $user->getUID();
+
+        $quota = $user->getQuota();
+        if ($quota === 'none') {
+            $quota = FileInfo::SPACE_UNLIMITED;
+        } else {
+            $quota = Util::computerFileSize($quota);
+            if ($quota === false) {
+                $quota = FileInfo::SPACE_UNLIMITED;
+            }
+        }
+
+        try {
+            if ($includeExternal) {
+                \OC_Util::tearDownFS();
+                \OC_Util::setupFS($user->getUID());
+                $storage = \OC_Helper::getStorageInfo('/', null, true, false);
+                $data = [
+                    'free' => $storage['free'],
+                    'used' => $storage['used'],
+                    'total' => $storage['total'],
+                    'relative' => $storage['relative'],
+                    self::USER_FIELD_QUOTA => $storage['quota'],
+                ];
+            } else {
+                $userFileInfo = $this->rootFolder->getUserFolder($userId)->getStorage()->getCache()->get('');
+                $used = $userFileInfo->getSize();
+
+                if ($quota > 0) {
+                    // prevent division by zero or error codes (negative values)
+                    $relative = round(($used / $quota) * 10000) / 100;
+                    $free = $quota - $used;
+                    $total = $quota;
+                } else {
+                    $relative = 0;
+                    $free = FileInfo::SPACE_UNLIMITED;
+                    $total = FileInfo::SPACE_UNLIMITED;
+                }
+
+                $data = [
+                    'free' => $free,
+                    'used' => $used,
+                    'total' => $total,
+                    'relative' => $relative,
+                    self::USER_FIELD_QUOTA => $quota,
+                ];
+            }
+        } catch (NotFoundException $ex) {
+            $data = [
+                self::USER_FIELD_QUOTA => $quota >= 0 ? $quota : 'none',
+                'used' => 0
+            ];
+        } catch (\Exception $e) {
+            Server::get(\Psr\Log\LoggerInterface::class)->error(
+                'Could not load storage info for {user}',
+                [
+                    'app' => 'provisioning_api',
+                    'user' => $userId,
+                    'exception' => $e,
+                ]
+            );
+            return [];
+        }
+        return $data;
+    }
 }

apps/provisioning_api/lib/Controller/UsersController.php

Indentation +1755 added lines, -1755 removed lines

@@ -59,1759 +59,1759 @@
  */
 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;
-		}
-
-		$email = mb_strtolower(trim($email));
-		if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
-			throw new OCSException($this->l10n->t('Required email address was not provided'), 110);
-		}
-
-		// Create the user
-		try {
-			$newUser = $this->userManager->createUser($userid, $password);
-			if (!$newUser instanceof IUser) {
-				// If the user is not an instance of IUser, it means the user creation failed
-				$this->logger->error('Failed addUser attempt: User creation failed.', ['app' => 'ocs_api']);
-				throw new OCSException($this->l10n->t('User creation failed'), 111);
-			}
-
-			$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->setSystemEMailAddress($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_BLUESKY;
-		$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 !== '') {
-					$value = mb_strtolower(trim($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_BLUESKY;
-			$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_BLUESKY . 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_BLUESKY;
-				$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:
-				$value = mb_strtolower(trim($value));
-				if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
-					$targetUser->setSystemEMailAddress($value);
-				} else {
-					throw new OCSException('', 101);
-				}
-				break;
-			case IAccountManager::COLLECTION_EMAIL:
-				$value = mb_strtolower(trim($value));
-				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_BLUESKY:
-			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_BLUESKY . 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;
+        }
+
+        $email = mb_strtolower(trim($email));
+        if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
+            throw new OCSException($this->l10n->t('Required email address was not provided'), 110);
+        }
+
+        // Create the user
+        try {
+            $newUser = $this->userManager->createUser($userid, $password);
+            if (!$newUser instanceof IUser) {
+                // If the user is not an instance of IUser, it means the user creation failed
+                $this->logger->error('Failed addUser attempt: User creation failed.', ['app' => 'ocs_api']);
+                throw new OCSException($this->l10n->t('User creation failed'), 111);
+            }
+
+            $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->setSystemEMailAddress($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_BLUESKY;
+        $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 !== '') {
+                    $value = mb_strtolower(trim($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_BLUESKY;
+            $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_BLUESKY . 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_BLUESKY;
+                $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:
+                $value = mb_strtolower(trim($value));
+                if (filter_var($value, FILTER_VALIDATE_EMAIL) || $value === '') {
+                    $targetUser->setSystemEMailAddress($value);
+                } else {
+                    throw new OCSException('', 101);
+                }
+                break;
+            case IAccountManager::COLLECTION_EMAIL:
+                $value = mb_strtolower(trim($value));
+                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_BLUESKY:
+            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_BLUESKY . 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/Accounts/AccountManager.php

Indentation +843 added lines, -843 removed lines

@@ -52,847 +52,847 @@
  * @package OC\Accounts
  */
 class AccountManager implements IAccountManager {
-	use TAccountsHelper;
-
-	use TProfileHelper;
-
-	private string $table = 'accounts';
-	private string $dataTable = 'accounts_data';
-	private ?IL10N $l10n = null;
-	private CappedMemoryCache $internalCache;
-
-	/**
-	 * The list of default scopes for each property.
-	 */
-	public const DEFAULT_SCOPES = [
-		self::PROPERTY_ADDRESS => self::SCOPE_LOCAL,
-		self::PROPERTY_AVATAR => self::SCOPE_FEDERATED,
-		self::PROPERTY_BIOGRAPHY => self::SCOPE_LOCAL,
-		self::PROPERTY_BIRTHDATE => self::SCOPE_LOCAL,
-		self::PROPERTY_DISPLAYNAME => self::SCOPE_FEDERATED,
-		self::PROPERTY_EMAIL => self::SCOPE_FEDERATED,
-		self::PROPERTY_FEDIVERSE => self::SCOPE_LOCAL,
-		self::PROPERTY_HEADLINE => self::SCOPE_LOCAL,
-		self::PROPERTY_ORGANISATION => self::SCOPE_LOCAL,
-		self::PROPERTY_PHONE => self::SCOPE_LOCAL,
-		self::PROPERTY_PRONOUNS => self::SCOPE_FEDERATED,
-		self::PROPERTY_ROLE => self::SCOPE_LOCAL,
-		self::PROPERTY_TWITTER => self::SCOPE_LOCAL,
-		self::PROPERTY_BLUESKY => self::SCOPE_LOCAL,
-		self::PROPERTY_WEBSITE => self::SCOPE_LOCAL,
-	];
-
-	public function __construct(
-		private IDBConnection $connection,
-		private IConfig $config,
-		private IEventDispatcher $dispatcher,
-		private IJobList $jobList,
-		private LoggerInterface $logger,
-		private IVerificationToken $verificationToken,
-		private IMailer $mailer,
-		private Defaults $defaults,
-		private IFactory $l10nFactory,
-		private IURLGenerator $urlGenerator,
-		private ICrypto $crypto,
-		private IPhoneNumberUtil $phoneNumberUtil,
-		private IClientService $clientService,
-	) {
-		$this->internalCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * @param IAccountProperty[] $properties
-	 */
-	protected function testValueLengths(array $properties, bool $throwOnData = false): void {
-		foreach ($properties as $property) {
-			if (strlen($property->getValue()) > 2048) {
-				if ($throwOnData) {
-					throw new InvalidArgumentException($property->getName());
-				} else {
-					$property->setValue('');
-				}
-			}
-		}
-	}
-
-	protected function testPropertyScope(IAccountProperty $property, array $allowedScopes, bool $throwOnData): void {
-		if ($throwOnData && !in_array($property->getScope(), $allowedScopes, true)) {
-			throw new InvalidArgumentException('scope');
-		}
-
-		if (
-			$property->getScope() === self::SCOPE_PRIVATE
-			&& in_array($property->getName(), [self::PROPERTY_DISPLAYNAME, self::PROPERTY_EMAIL])
-		) {
-			if ($throwOnData) {
-				// v2-private is not available for these fields
-				throw new InvalidArgumentException('scope');
-			} else {
-				// default to local
-				$property->setScope(self::SCOPE_LOCAL);
-			}
-		} else {
-			$property->setScope($property->getScope());
-		}
-	}
-
-	protected function updateUser(IUser $user, array $data, ?array $oldUserData, bool $throwOnData = false): array {
-		if ($oldUserData === null) {
-			$oldUserData = $this->getUser($user, false);
-		}
-
-		$updated = true;
-
-		if ($oldUserData !== $data) {
-			$this->updateExistingUser($user, $data, $oldUserData);
-		} else {
-			// nothing needs to be done if new and old data set are the same
-			$updated = false;
-		}
-
-		if ($updated) {
-			$this->dispatcher->dispatchTyped(new UserUpdatedEvent(
-				$user,
-				$data,
-			));
-		}
-
-		return $data;
-	}
-
-	/**
-	 * delete user from accounts table
-	 */
-	public function deleteUser(IUser $user): void {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->table)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-
-		$this->deleteUserData($user);
-	}
-
-	/**
-	 * delete user from accounts table
-	 */
-	public function deleteUserData(IUser $user): void {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->delete($this->dataTable)
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-	}
-
-	/**
-	 * get stored data from a given user
-	 */
-	protected function getUser(IUser $user, bool $insertIfNotExists = true): array {
-		$uid = $user->getUID();
-		$query = $this->connection->getQueryBuilder();
-		$query->select('data')
-			->from($this->table)
-			->where($query->expr()->eq('uid', $query->createParameter('uid')))
-			->setParameter('uid', $uid);
-		$result = $query->executeQuery();
-		$accountData = $result->fetchAll();
-		$result->closeCursor();
-
-		if (empty($accountData)) {
-			$userData = $this->buildDefaultUserRecord($user);
-			if ($insertIfNotExists) {
-				$this->insertNewUser($user, $userData);
-			}
-			return $userData;
-		}
-
-		$userDataArray = $this->importFromJson($accountData[0]['data'], $uid);
-		if ($userDataArray === null || $userDataArray === []) {
-			return $this->buildDefaultUserRecord($user);
-		}
-
-		return $this->addMissingDefaultValues($userDataArray, $this->buildDefaultUserRecord($user));
-	}
-
-	public function searchUsers(string $property, array $values): array {
-		// the value col is limited to 255 bytes. It is used for searches only.
-		$values = array_map(function (string $value) {
-			return Util::shortenMultibyteString($value, 255);
-		}, $values);
-		$chunks = array_chunk($values, 500);
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from($this->dataTable)
-			->where($query->expr()->eq('name', $query->createNamedParameter($property)))
-			->andWhere($query->expr()->in('value', $query->createParameter('values')));
-
-		$matches = [];
-		foreach ($chunks as $chunk) {
-			$query->setParameter('values', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
-			$result = $query->executeQuery();
-
-			while ($row = $result->fetch()) {
-				$matches[$row['uid']] = $row['value'];
-			}
-			$result->closeCursor();
-		}
-
-		$result = array_merge($matches, $this->searchUsersForRelatedCollection($property, $values));
-
-		return array_flip($result);
-	}
-
-	protected function searchUsersForRelatedCollection(string $property, array $values): array {
-		return match ($property) {
-			IAccountManager::PROPERTY_EMAIL => array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values)),
-			default => [],
-		};
-	}
-
-	/**
-	 * check if we need to ask the server for email verification, if yes we create a cronjob
-	 */
-	protected function checkEmailVerification(IAccount $updatedAccount, array $oldData): void {
-		try {
-			$property = $updatedAccount->getProperty(self::PROPERTY_EMAIL);
-		} catch (PropertyDoesNotExistException $e) {
-			return;
-		}
-
-		$oldMailIndex = array_search(self::PROPERTY_EMAIL, array_column($oldData, 'name'), true);
-		$oldMail = $oldMailIndex !== false ? $oldData[$oldMailIndex]['value'] : '';
-
-		if ($oldMail !== $property->getValue()) {
-			$this->jobList->add(
-				VerifyUserData::class,
-				[
-					'verificationCode' => '',
-					'data' => $property->getValue(),
-					'type' => self::PROPERTY_EMAIL,
-					'uid' => $updatedAccount->getUser()->getUID(),
-					'try' => 0,
-					'lastRun' => time()
-				]
-			);
-
-			$property->setVerified(self::VERIFICATION_IN_PROGRESS);
-		}
-	}
-
-	protected function checkLocalEmailVerification(IAccount $updatedAccount, array $oldData): void {
-		$mailCollection = $updatedAccount->getPropertyCollection(self::COLLECTION_EMAIL);
-		foreach ($mailCollection->getProperties() as $property) {
-			if ($property->getLocallyVerified() !== self::NOT_VERIFIED) {
-				continue;
-			}
-			if ($this->sendEmailVerificationEmail($updatedAccount->getUser(), $property->getValue())) {
-				$property->setLocallyVerified(self::VERIFICATION_IN_PROGRESS);
-			}
-		}
-	}
-
-	protected function sendEmailVerificationEmail(IUser $user, string $email): bool {
-		$ref = \substr(hash('sha256', $email), 0, 8);
-		$key = $this->crypto->encrypt($email);
-		$token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
-
-		$link = $this->urlGenerator->linkToRouteAbsolute(
-			'provisioning_api.Verification.verifyMail',
-			[
-				'userId' => $user->getUID(),
-				'token' => $token,
-				'key' => $key
-			]
-		);
-
-		$emailTemplate = $this->mailer->createEMailTemplate('core.EmailVerification', [
-			'link' => $link,
-		]);
-
-		if (!$this->l10n) {
-			$this->l10n = $this->l10nFactory->get('core');
-		}
-
-		$emailTemplate->setSubject($this->l10n->t('%s email verification', [$this->defaults->getName()]));
-		$emailTemplate->addHeader();
-		$emailTemplate->addHeading($this->l10n->t('Email verification'));
-
-		$emailTemplate->addBodyText(
-			htmlspecialchars($this->l10n->t('Click the following button to confirm your email.')),
-			$this->l10n->t('Click the following link to confirm your email.')
-		);
-
-		$emailTemplate->addBodyButton(
-			htmlspecialchars($this->l10n->t('Confirm your email')),
-			$link,
-			false
-		);
-		$emailTemplate->addFooter();
-
-		try {
-			$message = $this->mailer->createMessage();
-			$message->setTo([$email => $user->getDisplayName()]);
-			$message->setFrom([Util::getDefaultEmailAddress('verification-noreply') => $this->defaults->getName()]);
-			$message->useTemplate($emailTemplate);
-			$this->mailer->send($message);
-		} catch (Exception $e) {
-			// Log the exception and continue
-			$this->logger->info('Failed to send verification mail', [
-				'app' => 'core',
-				'exception' => $e
-			]);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Make sure that all expected data are set
-	 */
-	protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
-		foreach ($defaultUserData as $defaultDataItem) {
-			// If property does not exist, initialize it
-			$userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
-			if ($userDataIndex === false) {
-				$userData[] = $defaultDataItem;
-				continue;
-			}
-
-			// Merge and extend default missing values
-			$userData[$userDataIndex] = array_merge($defaultDataItem, $userData[$userDataIndex]);
-		}
-
-		return $userData;
-	}
-
-	protected function updateVerificationStatus(IAccount $updatedAccount, array $oldData): void {
-		static $propertiesVerifiableByLookupServer = [
-			self::PROPERTY_TWITTER,
-			self::PROPERTY_FEDIVERSE,
-			self::PROPERTY_WEBSITE,
-			self::PROPERTY_EMAIL,
-		];
-
-		foreach ($propertiesVerifiableByLookupServer as $propertyName) {
-			try {
-				$property = $updatedAccount->getProperty($propertyName);
-			} catch (PropertyDoesNotExistException $e) {
-				continue;
-			}
-			$wasVerified = isset($oldData[$propertyName])
-				&& isset($oldData[$propertyName]['verified'])
-				&& $oldData[$propertyName]['verified'] === self::VERIFIED;
-			if ((!isset($oldData[$propertyName])
-					|| !isset($oldData[$propertyName]['value'])
-					|| $property->getValue() !== $oldData[$propertyName]['value'])
-				&& ($property->getVerified() !== self::NOT_VERIFIED
-					|| $wasVerified)
-			) {
-				$property->setVerified(self::NOT_VERIFIED);
-			}
-		}
-	}
-
-	/**
-	 * add new user to accounts table
-	 */
-	protected function insertNewUser(IUser $user, array $data): void {
-		$uid = $user->getUID();
-		$jsonEncodedData = $this->prepareJson($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->table)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($uid),
-					'data' => $query->createNamedParameter($jsonEncodedData),
-				]
-			)
-			->executeStatement();
-
-		$this->deleteUserData($user);
-		$this->writeUserData($user, $data);
-	}
-
-	protected function prepareJson(array $data): string {
-		$preparedData = [];
-		foreach ($data as $dataRow) {
-			$propertyName = $dataRow['name'];
-			unset($dataRow['name']);
-
-			if (isset($dataRow['locallyVerified']) && $dataRow['locallyVerified'] === self::NOT_VERIFIED) {
-				// do not write default value, save DB space
-				unset($dataRow['locallyVerified']);
-			}
-
-			if (!$this->isCollection($propertyName)) {
-				$preparedData[$propertyName] = $dataRow;
-				continue;
-			}
-			if (!isset($preparedData[$propertyName])) {
-				$preparedData[$propertyName] = [];
-			}
-			$preparedData[$propertyName][] = $dataRow;
-		}
-		return json_encode($preparedData);
-	}
-
-	protected function importFromJson(string $json, string $userId): ?array {
-		$result = [];
-		$jsonArray = json_decode($json, true);
-		$jsonError = json_last_error();
-		if ($jsonError !== JSON_ERROR_NONE) {
-			$this->logger->critical(
-				'User data of {uid} contained invalid JSON (error {json_error}), hence falling back to a default user record',
-				[
-					'uid' => $userId,
-					'json_error' => $jsonError
-				]
-			);
-			return null;
-		}
-		foreach ($jsonArray as $propertyName => $row) {
-			if (!$this->isCollection($propertyName)) {
-				$result[] = array_merge($row, ['name' => $propertyName]);
-				continue;
-			}
-			foreach ($row as $singleRow) {
-				$result[] = array_merge($singleRow, ['name' => $propertyName]);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Update existing user in accounts table
-	 */
-	protected function updateExistingUser(IUser $user, array $data, array $oldData): void {
-		$uid = $user->getUID();
-		$jsonEncodedData = $this->prepareJson($data);
-		$query = $this->connection->getQueryBuilder();
-		$query->update($this->table)
-			->set('data', $query->createNamedParameter($jsonEncodedData))
-			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-			->executeStatement();
-
-		$this->deleteUserData($user);
-		$this->writeUserData($user, $data);
-	}
-
-	protected function writeUserData(IUser $user, array $data): void {
-		$query = $this->connection->getQueryBuilder();
-		$query->insert($this->dataTable)
-			->values(
-				[
-					'uid' => $query->createNamedParameter($user->getUID()),
-					'name' => $query->createParameter('name'),
-					'value' => $query->createParameter('value'),
-				]
-			);
-		$this->writeUserDataProperties($query, $data);
-	}
-
-	protected function writeUserDataProperties(IQueryBuilder $query, array $data): void {
-		foreach ($data as $property) {
-			if ($property['name'] === self::PROPERTY_AVATAR) {
-				continue;
-			}
-
-			// the value col is limited to 255 bytes. It is used for searches only.
-			$value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : '';
-
-			$query->setParameter('name', $property['name'])
-				->setParameter('value', $value);
-			$query->executeStatement();
-		}
-	}
-
-	/**
-	 * build default user record in case not data set exists yet
-	 */
-	protected function buildDefaultUserRecord(IUser $user): array {
-		$scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function (string $scope, string $property) {
-			return in_array($property, self::ALLOWED_PROPERTIES, true) && in_array($scope, self::ALLOWED_SCOPES, true);
-		}, ARRAY_FILTER_USE_BOTH));
-
-		return [
-			[
-				'name' => self::PROPERTY_DISPLAYNAME,
-				'value' => $user->getDisplayName(),
-				// Display name must be at least SCOPE_LOCAL
-				'scope' => $scopes[self::PROPERTY_DISPLAYNAME] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_DISPLAYNAME],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_ADDRESS,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ADDRESS],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_WEBSITE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_WEBSITE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_EMAIL,
-				'value' => $user->getEMailAddress(),
-				// Email must be at least SCOPE_LOCAL
-				'scope' => $scopes[self::PROPERTY_EMAIL] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_EMAIL],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_AVATAR,
-				'scope' => $scopes[self::PROPERTY_AVATAR],
-			],
-
-			[
-				'name' => self::PROPERTY_PHONE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_PHONE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_TWITTER,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_TWITTER],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_BLUESKY,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BLUESKY],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_FEDIVERSE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_FEDIVERSE],
-				'verified' => self::NOT_VERIFIED,
-			],
-
-			[
-				'name' => self::PROPERTY_ORGANISATION,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ORGANISATION],
-			],
-
-			[
-				'name' => self::PROPERTY_ROLE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_ROLE],
-			],
-
-			[
-				'name' => self::PROPERTY_HEADLINE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_HEADLINE],
-			],
-
-			[
-				'name' => self::PROPERTY_BIOGRAPHY,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BIOGRAPHY],
-			],
-
-			[
-				'name' => self::PROPERTY_BIRTHDATE,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_BIRTHDATE],
-			],
-
-			[
-				'name' => self::PROPERTY_PROFILE_ENABLED,
-				'value' => $this->isProfileEnabledByDefault($this->config) ? '1' : '0',
-			],
-
-			[
-				'name' => self::PROPERTY_PRONOUNS,
-				'value' => '',
-				'scope' => $scopes[self::PROPERTY_PRONOUNS],
-			],
-		];
-	}
-
-	private function arrayDataToCollection(IAccount $account, array $data): IAccountPropertyCollection {
-		$collection = $account->getPropertyCollection($data['name']);
-
-		$p = new AccountProperty(
-			$data['name'],
-			$data['value'] ?? '',
-			$data['scope'] ?? self::SCOPE_LOCAL,
-			$data['verified'] ?? self::NOT_VERIFIED,
-			''
-		);
-		$p->setLocallyVerified($data['locallyVerified'] ?? self::NOT_VERIFIED);
-		$collection->addProperty($p);
-
-		return $collection;
-	}
-
-	private function parseAccountData(IUser $user, $data): Account {
-		$account = new Account($user);
-		foreach ($data as $accountData) {
-			if ($this->isCollection($accountData['name'])) {
-				$account->setPropertyCollection($this->arrayDataToCollection($account, $accountData));
-			} else {
-				$account->setProperty($accountData['name'], $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
-				if (isset($accountData['locallyVerified'])) {
-					$property = $account->getProperty($accountData['name']);
-					$property->setLocallyVerified($accountData['locallyVerified']);
-				}
-			}
-		}
-		return $account;
-	}
-
-	public function getAccount(IUser $user): IAccount {
-		$cached = $this->internalCache->get($user->getUID());
-		if ($cached !== null) {
-			return $cached;
-		}
-		$account = $this->parseAccountData($user, $this->getUser($user));
-		if ($user->getBackend() instanceof IGetDisplayNameBackend) {
-			$property = $account->getProperty(self::PROPERTY_DISPLAYNAME);
-			$account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName(), $property->getScope(), $property->getVerified());
-		}
-		$this->internalCache->set($user->getUID(), $account);
-		return $account;
-	}
-
-	/**
-	 * Converts value (phone number) in E.164 format when it was a valid number
-	 * @throws InvalidArgumentException When the phone number was invalid or no default region is set and the number doesn't start with a country code
-	 */
-	protected function sanitizePropertyPhoneNumber(IAccountProperty $property): void {
-		$defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
-
-		if ($defaultRegion === '') {
-			// When no default region is set, only +49… numbers are valid
-			if (!str_starts_with($property->getValue(), '+')) {
-				throw new InvalidArgumentException(self::PROPERTY_PHONE);
-			}
-
-			$defaultRegion = 'EN';
-		}
-
-		$phoneNumber = $this->phoneNumberUtil->convertToStandardFormat($property->getValue(), $defaultRegion);
-		if ($phoneNumber === null) {
-			throw new InvalidArgumentException(self::PROPERTY_PHONE);
-		}
-		$property->setValue($phoneNumber);
-	}
-
-	/**
-	 * @throws InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
-	 */
-	private function sanitizePropertyWebsite(IAccountProperty $property): void {
-		$parts = parse_url($property->getValue());
-		if (!isset($parts['scheme']) || ($parts['scheme'] !== 'https' && $parts['scheme'] !== 'http')) {
-			throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
-		}
-
-		if (!isset($parts['host']) || $parts['host'] === '') {
-			throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
-		}
-	}
-
-	/**
-	 * @throws InvalidArgumentException If the property value is not a valid user handle according to X's rules
-	 */
-	private function sanitizePropertyTwitter(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_TWITTER) {
-			$matches = [];
-			// twitter handles only contain alpha numeric characters and the underscore and must not be longer than 15 characters
-			if (preg_match('/^@?([a-zA-Z0-9_]{2,15})$/', $property->getValue(), $matches) !== 1) {
-				throw new InvalidArgumentException(self::PROPERTY_TWITTER);
-			}
-
-			// drop the leading @ if any to make it the valid handle
-			$property->setValue($matches[1]);
-
-		}
-	}
-
-	private function validateBlueSkyHandle(string $text): bool {
-		if ($text === '') {
-			return true;
-		}
-
-		$lowerText = strtolower($text);
-
-		if ($lowerText === 'bsky.social') {
-			// "bsky.social" itself is not a valid handle
-			return false;
-		}
-
-		if (str_ends_with($lowerText, '.bsky.social')) {
-			$parts = explode('.', $lowerText);
-
-			// Must be exactly: username.bsky.social → 3 parts
-			if (count($parts) !== 3 || $parts[1] !== 'bsky' || $parts[2] !== 'social') {
-				return false;
-			}
-
-			$username = $parts[0];
-
-			// Must be 3–18 chars, alphanumeric/hyphen, no start/end hyphen
-			return preg_match('/^[a-z0-9][a-z0-9-]{2,17}$/', $username) === 1;
-		}
-
-		// Allow custom domains (Bluesky handle via personal domain)
-		return filter_var($text, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) !== false;
-	}
-
-
-	private function sanitizePropertyBluesky(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_BLUESKY) {
-			if (!$this->validateBlueSkyHandle($property->getValue())) {
-				throw new InvalidArgumentException(self::PROPERTY_BLUESKY);
-			}
-
-			$property->setValue($property->getValue());
-		}
-	}
-
-	/**
-	 * @throws InvalidArgumentException If the property value is not a valid fediverse handle (username@instance where instance is a valid domain)
-	 */
-	private function sanitizePropertyFediverse(IAccountProperty $property): void {
-		if ($property->getName() === self::PROPERTY_FEDIVERSE) {
-			$matches = [];
-			if (preg_match('/^@?([^@\s\/\\\]+)@([^\s\/\\\]+)$/', trim($property->getValue()), $matches) !== 1) {
-				throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-			}
-
-			[, $username, $instance] = $matches;
-			$validated = filter_var($instance, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME);
-			if ($validated !== $instance) {
-				throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-			}
-
-			if ($this->config->getSystemValueBool('has_internet_connection', true)) {
-				$client = $this->clientService->newClient();
-
-				try {
-					// try the public account lookup API of mastodon
-					$response = $client->get("https://{$instance}/.well-known/webfinger?resource=acct:{$username}@{$instance}");
-					// should be a json response with account information
-					$data = $response->getBody();
-					if (is_resource($data)) {
-						$data = stream_get_contents($data);
-					}
-					$decoded = json_decode($data, true);
-					// ensure the username is the same the user passed
-					// in this case we can assume this is a valid fediverse server and account
-					if (!is_array($decoded) || ($decoded['subject'] ?? '') !== "acct:{$username}@{$instance}") {
-						throw new InvalidArgumentException();
-					}
-					// check for activitypub link
-					if (is_array($decoded['links']) && isset($decoded['links'])) {
-						$found = false;
-						foreach ($decoded['links'] as $link) {
-							// have application/activity+json or application/ld+json
-							if (isset($link['type']) && (
-								$link['type'] === 'application/activity+json'
-								|| $link['type'] === 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
-							)) {
-								$found = true;
-								break;
-							}
-						}
-						if (!$found) {
-							throw new InvalidArgumentException();
-						}
-					}
-				} catch (InvalidArgumentException) {
-					throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-				} catch (\Exception $error) {
-					$this->logger->error('Could not verify fediverse account', ['exception' => $error, 'instance' => $instance]);
-					throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
-				}
-			}
-
-			$property->setValue("$username@$instance");
-		}
-	}
-
-	public function updateAccount(IAccount $account): void {
-		$this->testValueLengths(iterator_to_array($account->getAllProperties()), true);
-		try {
-			$property = $account->getProperty(self::PROPERTY_PHONE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyPhoneNumber($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_WEBSITE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyWebsite($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_TWITTER);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyTwitter($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_BLUESKY);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyBluesky($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		try {
-			$property = $account->getProperty(self::PROPERTY_FEDIVERSE);
-			if ($property->getValue() !== '') {
-				$this->sanitizePropertyFediverse($property);
-			}
-		} catch (PropertyDoesNotExistException $e) {
-			//  valid case, nothing to do
-		}
-
-		foreach ($account->getAllProperties() as $property) {
-			$this->testPropertyScope($property, self::ALLOWED_SCOPES, true);
-		}
-
-		$oldData = $this->getUser($account->getUser(), false);
-		$this->updateVerificationStatus($account, $oldData);
-		$this->checkEmailVerification($account, $oldData);
-		$this->checkLocalEmailVerification($account, $oldData);
-
-		$data = [];
-		foreach ($account->getAllProperties() as $property) {
-			/** @var IAccountProperty $property */
-			$data[] = [
-				'name' => $property->getName(),
-				'value' => $property->getValue(),
-				'scope' => $property->getScope(),
-				'verified' => $property->getVerified(),
-				'locallyVerified' => $property->getLocallyVerified(),
-			];
-		}
-
-		$this->updateUser($account->getUser(), $data, $oldData, true);
-		$this->internalCache->set($account->getUser()->getUID(), $account);
-	}
+    use TAccountsHelper;
+
+    use TProfileHelper;
+
+    private string $table = 'accounts';
+    private string $dataTable = 'accounts_data';
+    private ?IL10N $l10n = null;
+    private CappedMemoryCache $internalCache;
+
+    /**
+     * The list of default scopes for each property.
+     */
+    public const DEFAULT_SCOPES = [
+        self::PROPERTY_ADDRESS => self::SCOPE_LOCAL,
+        self::PROPERTY_AVATAR => self::SCOPE_FEDERATED,
+        self::PROPERTY_BIOGRAPHY => self::SCOPE_LOCAL,
+        self::PROPERTY_BIRTHDATE => self::SCOPE_LOCAL,
+        self::PROPERTY_DISPLAYNAME => self::SCOPE_FEDERATED,
+        self::PROPERTY_EMAIL => self::SCOPE_FEDERATED,
+        self::PROPERTY_FEDIVERSE => self::SCOPE_LOCAL,
+        self::PROPERTY_HEADLINE => self::SCOPE_LOCAL,
+        self::PROPERTY_ORGANISATION => self::SCOPE_LOCAL,
+        self::PROPERTY_PHONE => self::SCOPE_LOCAL,
+        self::PROPERTY_PRONOUNS => self::SCOPE_FEDERATED,
+        self::PROPERTY_ROLE => self::SCOPE_LOCAL,
+        self::PROPERTY_TWITTER => self::SCOPE_LOCAL,
+        self::PROPERTY_BLUESKY => self::SCOPE_LOCAL,
+        self::PROPERTY_WEBSITE => self::SCOPE_LOCAL,
+    ];
+
+    public function __construct(
+        private IDBConnection $connection,
+        private IConfig $config,
+        private IEventDispatcher $dispatcher,
+        private IJobList $jobList,
+        private LoggerInterface $logger,
+        private IVerificationToken $verificationToken,
+        private IMailer $mailer,
+        private Defaults $defaults,
+        private IFactory $l10nFactory,
+        private IURLGenerator $urlGenerator,
+        private ICrypto $crypto,
+        private IPhoneNumberUtil $phoneNumberUtil,
+        private IClientService $clientService,
+    ) {
+        $this->internalCache = new CappedMemoryCache();
+    }
+
+    /**
+     * @param IAccountProperty[] $properties
+     */
+    protected function testValueLengths(array $properties, bool $throwOnData = false): void {
+        foreach ($properties as $property) {
+            if (strlen($property->getValue()) > 2048) {
+                if ($throwOnData) {
+                    throw new InvalidArgumentException($property->getName());
+                } else {
+                    $property->setValue('');
+                }
+            }
+        }
+    }
+
+    protected function testPropertyScope(IAccountProperty $property, array $allowedScopes, bool $throwOnData): void {
+        if ($throwOnData && !in_array($property->getScope(), $allowedScopes, true)) {
+            throw new InvalidArgumentException('scope');
+        }
+
+        if (
+            $property->getScope() === self::SCOPE_PRIVATE
+            && in_array($property->getName(), [self::PROPERTY_DISPLAYNAME, self::PROPERTY_EMAIL])
+        ) {
+            if ($throwOnData) {
+                // v2-private is not available for these fields
+                throw new InvalidArgumentException('scope');
+            } else {
+                // default to local
+                $property->setScope(self::SCOPE_LOCAL);
+            }
+        } else {
+            $property->setScope($property->getScope());
+        }
+    }
+
+    protected function updateUser(IUser $user, array $data, ?array $oldUserData, bool $throwOnData = false): array {
+        if ($oldUserData === null) {
+            $oldUserData = $this->getUser($user, false);
+        }
+
+        $updated = true;
+
+        if ($oldUserData !== $data) {
+            $this->updateExistingUser($user, $data, $oldUserData);
+        } else {
+            // nothing needs to be done if new and old data set are the same
+            $updated = false;
+        }
+
+        if ($updated) {
+            $this->dispatcher->dispatchTyped(new UserUpdatedEvent(
+                $user,
+                $data,
+            ));
+        }
+
+        return $data;
+    }
+
+    /**
+     * delete user from accounts table
+     */
+    public function deleteUser(IUser $user): void {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->table)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+    }
+
+    /**
+     * delete user from accounts table
+     */
+    public function deleteUserData(IUser $user): void {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->delete($this->dataTable)
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+    }
+
+    /**
+     * get stored data from a given user
+     */
+    protected function getUser(IUser $user, bool $insertIfNotExists = true): array {
+        $uid = $user->getUID();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('data')
+            ->from($this->table)
+            ->where($query->expr()->eq('uid', $query->createParameter('uid')))
+            ->setParameter('uid', $uid);
+        $result = $query->executeQuery();
+        $accountData = $result->fetchAll();
+        $result->closeCursor();
+
+        if (empty($accountData)) {
+            $userData = $this->buildDefaultUserRecord($user);
+            if ($insertIfNotExists) {
+                $this->insertNewUser($user, $userData);
+            }
+            return $userData;
+        }
+
+        $userDataArray = $this->importFromJson($accountData[0]['data'], $uid);
+        if ($userDataArray === null || $userDataArray === []) {
+            return $this->buildDefaultUserRecord($user);
+        }
+
+        return $this->addMissingDefaultValues($userDataArray, $this->buildDefaultUserRecord($user));
+    }
+
+    public function searchUsers(string $property, array $values): array {
+        // the value col is limited to 255 bytes. It is used for searches only.
+        $values = array_map(function (string $value) {
+            return Util::shortenMultibyteString($value, 255);
+        }, $values);
+        $chunks = array_chunk($values, 500);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from($this->dataTable)
+            ->where($query->expr()->eq('name', $query->createNamedParameter($property)))
+            ->andWhere($query->expr()->in('value', $query->createParameter('values')));
+
+        $matches = [];
+        foreach ($chunks as $chunk) {
+            $query->setParameter('values', $chunk, IQueryBuilder::PARAM_STR_ARRAY);
+            $result = $query->executeQuery();
+
+            while ($row = $result->fetch()) {
+                $matches[$row['uid']] = $row['value'];
+            }
+            $result->closeCursor();
+        }
+
+        $result = array_merge($matches, $this->searchUsersForRelatedCollection($property, $values));
+
+        return array_flip($result);
+    }
+
+    protected function searchUsersForRelatedCollection(string $property, array $values): array {
+        return match ($property) {
+            IAccountManager::PROPERTY_EMAIL => array_flip($this->searchUsers(IAccountManager::COLLECTION_EMAIL, $values)),
+            default => [],
+        };
+    }
+
+    /**
+     * check if we need to ask the server for email verification, if yes we create a cronjob
+     */
+    protected function checkEmailVerification(IAccount $updatedAccount, array $oldData): void {
+        try {
+            $property = $updatedAccount->getProperty(self::PROPERTY_EMAIL);
+        } catch (PropertyDoesNotExistException $e) {
+            return;
+        }
+
+        $oldMailIndex = array_search(self::PROPERTY_EMAIL, array_column($oldData, 'name'), true);
+        $oldMail = $oldMailIndex !== false ? $oldData[$oldMailIndex]['value'] : '';
+
+        if ($oldMail !== $property->getValue()) {
+            $this->jobList->add(
+                VerifyUserData::class,
+                [
+                    'verificationCode' => '',
+                    'data' => $property->getValue(),
+                    'type' => self::PROPERTY_EMAIL,
+                    'uid' => $updatedAccount->getUser()->getUID(),
+                    'try' => 0,
+                    'lastRun' => time()
+                ]
+            );
+
+            $property->setVerified(self::VERIFICATION_IN_PROGRESS);
+        }
+    }
+
+    protected function checkLocalEmailVerification(IAccount $updatedAccount, array $oldData): void {
+        $mailCollection = $updatedAccount->getPropertyCollection(self::COLLECTION_EMAIL);
+        foreach ($mailCollection->getProperties() as $property) {
+            if ($property->getLocallyVerified() !== self::NOT_VERIFIED) {
+                continue;
+            }
+            if ($this->sendEmailVerificationEmail($updatedAccount->getUser(), $property->getValue())) {
+                $property->setLocallyVerified(self::VERIFICATION_IN_PROGRESS);
+            }
+        }
+    }
+
+    protected function sendEmailVerificationEmail(IUser $user, string $email): bool {
+        $ref = \substr(hash('sha256', $email), 0, 8);
+        $key = $this->crypto->encrypt($email);
+        $token = $this->verificationToken->create($user, 'verifyMail' . $ref, $email);
+
+        $link = $this->urlGenerator->linkToRouteAbsolute(
+            'provisioning_api.Verification.verifyMail',
+            [
+                'userId' => $user->getUID(),
+                'token' => $token,
+                'key' => $key
+            ]
+        );
+
+        $emailTemplate = $this->mailer->createEMailTemplate('core.EmailVerification', [
+            'link' => $link,
+        ]);
+
+        if (!$this->l10n) {
+            $this->l10n = $this->l10nFactory->get('core');
+        }
+
+        $emailTemplate->setSubject($this->l10n->t('%s email verification', [$this->defaults->getName()]));
+        $emailTemplate->addHeader();
+        $emailTemplate->addHeading($this->l10n->t('Email verification'));
+
+        $emailTemplate->addBodyText(
+            htmlspecialchars($this->l10n->t('Click the following button to confirm your email.')),
+            $this->l10n->t('Click the following link to confirm your email.')
+        );
+
+        $emailTemplate->addBodyButton(
+            htmlspecialchars($this->l10n->t('Confirm your email')),
+            $link,
+            false
+        );
+        $emailTemplate->addFooter();
+
+        try {
+            $message = $this->mailer->createMessage();
+            $message->setTo([$email => $user->getDisplayName()]);
+            $message->setFrom([Util::getDefaultEmailAddress('verification-noreply') => $this->defaults->getName()]);
+            $message->useTemplate($emailTemplate);
+            $this->mailer->send($message);
+        } catch (Exception $e) {
+            // Log the exception and continue
+            $this->logger->info('Failed to send verification mail', [
+                'app' => 'core',
+                'exception' => $e
+            ]);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Make sure that all expected data are set
+     */
+    protected function addMissingDefaultValues(array $userData, array $defaultUserData): array {
+        foreach ($defaultUserData as $defaultDataItem) {
+            // If property does not exist, initialize it
+            $userDataIndex = array_search($defaultDataItem['name'], array_column($userData, 'name'));
+            if ($userDataIndex === false) {
+                $userData[] = $defaultDataItem;
+                continue;
+            }
+
+            // Merge and extend default missing values
+            $userData[$userDataIndex] = array_merge($defaultDataItem, $userData[$userDataIndex]);
+        }
+
+        return $userData;
+    }
+
+    protected function updateVerificationStatus(IAccount $updatedAccount, array $oldData): void {
+        static $propertiesVerifiableByLookupServer = [
+            self::PROPERTY_TWITTER,
+            self::PROPERTY_FEDIVERSE,
+            self::PROPERTY_WEBSITE,
+            self::PROPERTY_EMAIL,
+        ];
+
+        foreach ($propertiesVerifiableByLookupServer as $propertyName) {
+            try {
+                $property = $updatedAccount->getProperty($propertyName);
+            } catch (PropertyDoesNotExistException $e) {
+                continue;
+            }
+            $wasVerified = isset($oldData[$propertyName])
+                && isset($oldData[$propertyName]['verified'])
+                && $oldData[$propertyName]['verified'] === self::VERIFIED;
+            if ((!isset($oldData[$propertyName])
+                    || !isset($oldData[$propertyName]['value'])
+                    || $property->getValue() !== $oldData[$propertyName]['value'])
+                && ($property->getVerified() !== self::NOT_VERIFIED
+                    || $wasVerified)
+            ) {
+                $property->setVerified(self::NOT_VERIFIED);
+            }
+        }
+    }
+
+    /**
+     * add new user to accounts table
+     */
+    protected function insertNewUser(IUser $user, array $data): void {
+        $uid = $user->getUID();
+        $jsonEncodedData = $this->prepareJson($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->table)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($uid),
+                    'data' => $query->createNamedParameter($jsonEncodedData),
+                ]
+            )
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+        $this->writeUserData($user, $data);
+    }
+
+    protected function prepareJson(array $data): string {
+        $preparedData = [];
+        foreach ($data as $dataRow) {
+            $propertyName = $dataRow['name'];
+            unset($dataRow['name']);
+
+            if (isset($dataRow['locallyVerified']) && $dataRow['locallyVerified'] === self::NOT_VERIFIED) {
+                // do not write default value, save DB space
+                unset($dataRow['locallyVerified']);
+            }
+
+            if (!$this->isCollection($propertyName)) {
+                $preparedData[$propertyName] = $dataRow;
+                continue;
+            }
+            if (!isset($preparedData[$propertyName])) {
+                $preparedData[$propertyName] = [];
+            }
+            $preparedData[$propertyName][] = $dataRow;
+        }
+        return json_encode($preparedData);
+    }
+
+    protected function importFromJson(string $json, string $userId): ?array {
+        $result = [];
+        $jsonArray = json_decode($json, true);
+        $jsonError = json_last_error();
+        if ($jsonError !== JSON_ERROR_NONE) {
+            $this->logger->critical(
+                'User data of {uid} contained invalid JSON (error {json_error}), hence falling back to a default user record',
+                [
+                    'uid' => $userId,
+                    'json_error' => $jsonError
+                ]
+            );
+            return null;
+        }
+        foreach ($jsonArray as $propertyName => $row) {
+            if (!$this->isCollection($propertyName)) {
+                $result[] = array_merge($row, ['name' => $propertyName]);
+                continue;
+            }
+            foreach ($row as $singleRow) {
+                $result[] = array_merge($singleRow, ['name' => $propertyName]);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Update existing user in accounts table
+     */
+    protected function updateExistingUser(IUser $user, array $data, array $oldData): void {
+        $uid = $user->getUID();
+        $jsonEncodedData = $this->prepareJson($data);
+        $query = $this->connection->getQueryBuilder();
+        $query->update($this->table)
+            ->set('data', $query->createNamedParameter($jsonEncodedData))
+            ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
+            ->executeStatement();
+
+        $this->deleteUserData($user);
+        $this->writeUserData($user, $data);
+    }
+
+    protected function writeUserData(IUser $user, array $data): void {
+        $query = $this->connection->getQueryBuilder();
+        $query->insert($this->dataTable)
+            ->values(
+                [
+                    'uid' => $query->createNamedParameter($user->getUID()),
+                    'name' => $query->createParameter('name'),
+                    'value' => $query->createParameter('value'),
+                ]
+            );
+        $this->writeUserDataProperties($query, $data);
+    }
+
+    protected function writeUserDataProperties(IQueryBuilder $query, array $data): void {
+        foreach ($data as $property) {
+            if ($property['name'] === self::PROPERTY_AVATAR) {
+                continue;
+            }
+
+            // the value col is limited to 255 bytes. It is used for searches only.
+            $value = $property['value'] ? Util::shortenMultibyteString($property['value'], 255) : '';
+
+            $query->setParameter('name', $property['name'])
+                ->setParameter('value', $value);
+            $query->executeStatement();
+        }
+    }
+
+    /**
+     * build default user record in case not data set exists yet
+     */
+    protected function buildDefaultUserRecord(IUser $user): array {
+        $scopes = array_merge(self::DEFAULT_SCOPES, array_filter($this->config->getSystemValue('account_manager.default_property_scope', []), static function (string $scope, string $property) {
+            return in_array($property, self::ALLOWED_PROPERTIES, true) && in_array($scope, self::ALLOWED_SCOPES, true);
+        }, ARRAY_FILTER_USE_BOTH));
+
+        return [
+            [
+                'name' => self::PROPERTY_DISPLAYNAME,
+                'value' => $user->getDisplayName(),
+                // Display name must be at least SCOPE_LOCAL
+                'scope' => $scopes[self::PROPERTY_DISPLAYNAME] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_DISPLAYNAME],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_ADDRESS,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ADDRESS],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_WEBSITE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_WEBSITE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_EMAIL,
+                'value' => $user->getEMailAddress(),
+                // Email must be at least SCOPE_LOCAL
+                'scope' => $scopes[self::PROPERTY_EMAIL] === self::SCOPE_PRIVATE ? self::SCOPE_LOCAL : $scopes[self::PROPERTY_EMAIL],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_AVATAR,
+                'scope' => $scopes[self::PROPERTY_AVATAR],
+            ],
+
+            [
+                'name' => self::PROPERTY_PHONE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_PHONE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_TWITTER,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_TWITTER],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_BLUESKY,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BLUESKY],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_FEDIVERSE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_FEDIVERSE],
+                'verified' => self::NOT_VERIFIED,
+            ],
+
+            [
+                'name' => self::PROPERTY_ORGANISATION,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ORGANISATION],
+            ],
+
+            [
+                'name' => self::PROPERTY_ROLE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_ROLE],
+            ],
+
+            [
+                'name' => self::PROPERTY_HEADLINE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_HEADLINE],
+            ],
+
+            [
+                'name' => self::PROPERTY_BIOGRAPHY,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BIOGRAPHY],
+            ],
+
+            [
+                'name' => self::PROPERTY_BIRTHDATE,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_BIRTHDATE],
+            ],
+
+            [
+                'name' => self::PROPERTY_PROFILE_ENABLED,
+                'value' => $this->isProfileEnabledByDefault($this->config) ? '1' : '0',
+            ],
+
+            [
+                'name' => self::PROPERTY_PRONOUNS,
+                'value' => '',
+                'scope' => $scopes[self::PROPERTY_PRONOUNS],
+            ],
+        ];
+    }
+
+    private function arrayDataToCollection(IAccount $account, array $data): IAccountPropertyCollection {
+        $collection = $account->getPropertyCollection($data['name']);
+
+        $p = new AccountProperty(
+            $data['name'],
+            $data['value'] ?? '',
+            $data['scope'] ?? self::SCOPE_LOCAL,
+            $data['verified'] ?? self::NOT_VERIFIED,
+            ''
+        );
+        $p->setLocallyVerified($data['locallyVerified'] ?? self::NOT_VERIFIED);
+        $collection->addProperty($p);
+
+        return $collection;
+    }
+
+    private function parseAccountData(IUser $user, $data): Account {
+        $account = new Account($user);
+        foreach ($data as $accountData) {
+            if ($this->isCollection($accountData['name'])) {
+                $account->setPropertyCollection($this->arrayDataToCollection($account, $accountData));
+            } else {
+                $account->setProperty($accountData['name'], $accountData['value'] ?? '', $accountData['scope'] ?? self::SCOPE_LOCAL, $accountData['verified'] ?? self::NOT_VERIFIED);
+                if (isset($accountData['locallyVerified'])) {
+                    $property = $account->getProperty($accountData['name']);
+                    $property->setLocallyVerified($accountData['locallyVerified']);
+                }
+            }
+        }
+        return $account;
+    }
+
+    public function getAccount(IUser $user): IAccount {
+        $cached = $this->internalCache->get($user->getUID());
+        if ($cached !== null) {
+            return $cached;
+        }
+        $account = $this->parseAccountData($user, $this->getUser($user));
+        if ($user->getBackend() instanceof IGetDisplayNameBackend) {
+            $property = $account->getProperty(self::PROPERTY_DISPLAYNAME);
+            $account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName(), $property->getScope(), $property->getVerified());
+        }
+        $this->internalCache->set($user->getUID(), $account);
+        return $account;
+    }
+
+    /**
+     * Converts value (phone number) in E.164 format when it was a valid number
+     * @throws InvalidArgumentException When the phone number was invalid or no default region is set and the number doesn't start with a country code
+     */
+    protected function sanitizePropertyPhoneNumber(IAccountProperty $property): void {
+        $defaultRegion = $this->config->getSystemValueString('default_phone_region', '');
+
+        if ($defaultRegion === '') {
+            // When no default region is set, only +49… numbers are valid
+            if (!str_starts_with($property->getValue(), '+')) {
+                throw new InvalidArgumentException(self::PROPERTY_PHONE);
+            }
+
+            $defaultRegion = 'EN';
+        }
+
+        $phoneNumber = $this->phoneNumberUtil->convertToStandardFormat($property->getValue(), $defaultRegion);
+        if ($phoneNumber === null) {
+            throw new InvalidArgumentException(self::PROPERTY_PHONE);
+        }
+        $property->setValue($phoneNumber);
+    }
+
+    /**
+     * @throws InvalidArgumentException When the website did not have http(s) as protocol or the host name was empty
+     */
+    private function sanitizePropertyWebsite(IAccountProperty $property): void {
+        $parts = parse_url($property->getValue());
+        if (!isset($parts['scheme']) || ($parts['scheme'] !== 'https' && $parts['scheme'] !== 'http')) {
+            throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
+        }
+
+        if (!isset($parts['host']) || $parts['host'] === '') {
+            throw new InvalidArgumentException(self::PROPERTY_WEBSITE);
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException If the property value is not a valid user handle according to X's rules
+     */
+    private function sanitizePropertyTwitter(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_TWITTER) {
+            $matches = [];
+            // twitter handles only contain alpha numeric characters and the underscore and must not be longer than 15 characters
+            if (preg_match('/^@?([a-zA-Z0-9_]{2,15})$/', $property->getValue(), $matches) !== 1) {
+                throw new InvalidArgumentException(self::PROPERTY_TWITTER);
+            }
+
+            // drop the leading @ if any to make it the valid handle
+            $property->setValue($matches[1]);
+
+        }
+    }
+
+    private function validateBlueSkyHandle(string $text): bool {
+        if ($text === '') {
+            return true;
+        }
+
+        $lowerText = strtolower($text);
+
+        if ($lowerText === 'bsky.social') {
+            // "bsky.social" itself is not a valid handle
+            return false;
+        }
+
+        if (str_ends_with($lowerText, '.bsky.social')) {
+            $parts = explode('.', $lowerText);
+
+            // Must be exactly: username.bsky.social → 3 parts
+            if (count($parts) !== 3 || $parts[1] !== 'bsky' || $parts[2] !== 'social') {
+                return false;
+            }
+
+            $username = $parts[0];
+
+            // Must be 3–18 chars, alphanumeric/hyphen, no start/end hyphen
+            return preg_match('/^[a-z0-9][a-z0-9-]{2,17}$/', $username) === 1;
+        }
+
+        // Allow custom domains (Bluesky handle via personal domain)
+        return filter_var($text, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME) !== false;
+    }
+
+
+    private function sanitizePropertyBluesky(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_BLUESKY) {
+            if (!$this->validateBlueSkyHandle($property->getValue())) {
+                throw new InvalidArgumentException(self::PROPERTY_BLUESKY);
+            }
+
+            $property->setValue($property->getValue());
+        }
+    }
+
+    /**
+     * @throws InvalidArgumentException If the property value is not a valid fediverse handle (username@instance where instance is a valid domain)
+     */
+    private function sanitizePropertyFediverse(IAccountProperty $property): void {
+        if ($property->getName() === self::PROPERTY_FEDIVERSE) {
+            $matches = [];
+            if (preg_match('/^@?([^@\s\/\\\]+)@([^\s\/\\\]+)$/', trim($property->getValue()), $matches) !== 1) {
+                throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+            }
+
+            [, $username, $instance] = $matches;
+            $validated = filter_var($instance, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME);
+            if ($validated !== $instance) {
+                throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+            }
+
+            if ($this->config->getSystemValueBool('has_internet_connection', true)) {
+                $client = $this->clientService->newClient();
+
+                try {
+                    // try the public account lookup API of mastodon
+                    $response = $client->get("https://{$instance}/.well-known/webfinger?resource=acct:{$username}@{$instance}");
+                    // should be a json response with account information
+                    $data = $response->getBody();
+                    if (is_resource($data)) {
+                        $data = stream_get_contents($data);
+                    }
+                    $decoded = json_decode($data, true);
+                    // ensure the username is the same the user passed
+                    // in this case we can assume this is a valid fediverse server and account
+                    if (!is_array($decoded) || ($decoded['subject'] ?? '') !== "acct:{$username}@{$instance}") {
+                        throw new InvalidArgumentException();
+                    }
+                    // check for activitypub link
+                    if (is_array($decoded['links']) && isset($decoded['links'])) {
+                        $found = false;
+                        foreach ($decoded['links'] as $link) {
+                            // have application/activity+json or application/ld+json
+                            if (isset($link['type']) && (
+                                $link['type'] === 'application/activity+json'
+                                || $link['type'] === 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'
+                            )) {
+                                $found = true;
+                                break;
+                            }
+                        }
+                        if (!$found) {
+                            throw new InvalidArgumentException();
+                        }
+                    }
+                } catch (InvalidArgumentException) {
+                    throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+                } catch (\Exception $error) {
+                    $this->logger->error('Could not verify fediverse account', ['exception' => $error, 'instance' => $instance]);
+                    throw new InvalidArgumentException(self::PROPERTY_FEDIVERSE);
+                }
+            }
+
+            $property->setValue("$username@$instance");
+        }
+    }
+
+    public function updateAccount(IAccount $account): void {
+        $this->testValueLengths(iterator_to_array($account->getAllProperties()), true);
+        try {
+            $property = $account->getProperty(self::PROPERTY_PHONE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyPhoneNumber($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_WEBSITE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyWebsite($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_TWITTER);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyTwitter($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_BLUESKY);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyBluesky($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        try {
+            $property = $account->getProperty(self::PROPERTY_FEDIVERSE);
+            if ($property->getValue() !== '') {
+                $this->sanitizePropertyFediverse($property);
+            }
+        } catch (PropertyDoesNotExistException $e) {
+            //  valid case, nothing to do
+        }
+
+        foreach ($account->getAllProperties() as $property) {
+            $this->testPropertyScope($property, self::ALLOWED_SCOPES, true);
+        }
+
+        $oldData = $this->getUser($account->getUser(), false);
+        $this->updateVerificationStatus($account, $oldData);
+        $this->checkEmailVerification($account, $oldData);
+        $this->checkLocalEmailVerification($account, $oldData);
+
+        $data = [];
+        foreach ($account->getAllProperties() as $property) {
+            /** @var IAccountProperty $property */
+            $data[] = [
+                'name' => $property->getName(),
+                'value' => $property->getValue(),
+                'scope' => $property->getScope(),
+                'verified' => $property->getVerified(),
+                'locallyVerified' => $property->getLocallyVerified(),
+            ];
+        }
+
+        $this->updateUser($account->getUser(), $data, $oldData, true);
+        $this->internalCache->set($account->getUser()->getUID(), $account);
+    }
 }