From 142f9913a6158a65fd92878bb554829b32b185fe Mon Sep 17 00:00:00 2001
From: Côme Chilliet <come.chilliet@nextcloud.com>
Date: Mon, 24 Oct 2022 16:39:43 +0200
Subject: Expose mapped user count from LDAP and use that for user limit check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 lib/private/Support/Subscription/Registry.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/private/Support/Subscription/Registry.php b/lib/private/Support/Subscription/Registry.php
index 87070e7a0dc..7aafa539a0b 100644
--- a/lib/private/Support/Subscription/Registry.php
+++ b/lib/private/Support/Subscription/Registry.php
@@ -34,15 +34,15 @@ use OCP\IGroupManager;
 use OCP\IServerContainer;
 use OCP\IUserManager;
 use OCP\Notification\IManager;
-use OCP\User\Backend\ICountUsersBackend;
 use OCP\Support\Subscription\Exception\AlreadyRegisteredException;
 use OCP\Support\Subscription\IRegistry;
 use OCP\Support\Subscription\ISubscription;
 use OCP\Support\Subscription\ISupportedApps;
+use OCP\User\Backend\ICountMappedUsersBackend;
+use OCP\User\Backend\ICountUsersBackend;
 use Psr\Log\LoggerInterface;
 
 class Registry implements IRegistry {
-
 	/** @var ISubscription */
 	private $subscription = null;
 
@@ -189,7 +189,9 @@ class Registry implements IRegistry {
 		$userCount = 0;
 		$backends = $this->userManager->getBackends();
 		foreach ($backends as $backend) {
-			if ($backend->implementsActions(Backend::COUNT_USERS)) {
+			if ($backend instanceof ICountMappedUsersBackend) {
+				$userCount += $backend->countMappedUsers();
+			} elseif ($backend->implementsActions(Backend::COUNT_USERS)) {
 				/** @var ICountUsersBackend $backend */
 				$backendUsers = $backend->countUsers();
 				if ($backendUsers !== false) {
-- 
cgit v1.2.3