Merge pull request #1414 from nextcloud/carl/optimize-ldap-is-deleted

CarlSchwan · web-flow · commit 4128353de927 · 2026-04-15T13:15:56.000+02:00
perf(ldap): Optimize check if LDAP user is deleted
diff --git a/lib/Service/LdapService.php b/lib/Service/LdapService.php
@@ -48,6 +48,10 @@ public function isLdapDeletedUser(IUser $user): bool {
 			return false;
 		}
 
+		if (!$dui->isUserMarked($user->getUID())) {
+			return false;
+		}
+
 		if (!$dui->hasUsers()) {
 			return false;
 		}
diff --git a/tests/stubs/oca_user_ldap.php b/tests/stubs/oca_user_ldap.php
@@ -26,6 +26,9 @@ public function hasUsers(): bool {
 	public function getUsers(): array {
 		return [];
 	}
+
+	public function isUserMarked(string $uid): bool {
+	}
 }
 
 namespace OCA\User_LDAP;

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ public function isLdapDeletedUser(IUser $user): bool {`
`48`	`48`	`return false;`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ if (!$dui->isUserMarked($user->getUID())) {`
	`52`	`+ return false;`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`if (!$dui->hasUsers()) {`
`52`	`56`	`return false;`
`53`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ public function hasUsers(): bool {`
`26`	`26`	`public function getUsers(): array {`
`27`	`27`	`return [];`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ public function isUserMarked(string $uid): bool {`
	`31`	`+ }`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`namespace OCA\User_LDAP;`