fix(user_ldap): Correctly cache that user exists to avoid a request o…

…n mapping new user Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Jul 9, 2024 · 4b75668 · 4b75668
1 parent e215f40
commit 4b75668
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
@@ -734,6 +734,7 @@ public function cacheUserHome(string $ocName, $home): void {
 	 */
 	public function cacheUserExists(string $ocName): void {
 		$this->connection->writeToCache('userExists' . $ocName, true);
+		$this->connection->writeToCache('userExistsOnLDAP' . $ocName, true);
 	}
 
 	/**

diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php
@@ -265,9 +265,7 @@ public function exists($id): bool {
 		if ($this->isDeletedUser($id)) {
 			return true;
 		}
-		$this->logger->debug('username2dn({id})', ['id' => $id]);
 		$dn = $this->access->username2dn($id);
-		$this->logger->debug('end username2dn({id})', ['id' => $id]);
 		if ($dn !== false) {
 			return true;
 		}

diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
@@ -471,7 +471,6 @@ public function getDisplayName($uid) {
 				$this->access->connection->writeToCache($cacheKey, $displayName);
 			}
 			if ($user instanceof OfflineUser) {
-				/** @var OfflineUser $user*/
 				$displayName = $user->getDisplayName();
 			}
 			return $displayName;
@@ -618,7 +617,6 @@ public function createUser($username, $password) {
 							$uuid,
 							true
 						);
-						$this->access->cacheUserExists($username);
 					} else {
 						$this->logger->warning(
 							'Failed to map created LDAP user with userid {userid}, because UUID could not be determined',