Fix user_identifier support after username has been deprecated in favor of it.

vtsykun · vtsykun · commit adb9287f8d29 · 2023-01-15T04:16:57.000+01:00
diff --git a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php
@@ -85,7 +85,7 @@ public function onCheckPassport(CheckPassportEvent $event)
                 }
                 // @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0
                 $username = $ldap->escape(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), '', LdapInterface::ESCAPE_FILTER);
-                $query = str_replace('{username}', $username, $ldapBadge->getQueryString());
+                $query = str_replace(['{username}', '{user_identifier}'], $username, $ldapBadge->getQueryString());
                 $result = $ldap->query($ldapBadge->getDnString(), $query)->execute();
                 if (1 !== $result->count()) {
                     throw new BadCredentialsException('The presented username is invalid.');

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function onCheckPassport(CheckPassportEvent $event)`
`85`	`85`	`}`
`86`	`86`	`// @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0`
`87`	`87`	`$username = $ldap->escape(method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(), '', LdapInterface::ESCAPE_FILTER);`
`88`		`- $query = str_replace('{username}', $username, $ldapBadge->getQueryString());`
	`88`	`+ $query = str_replace(['{username}', '{user_identifier}'], $username, $ldapBadge->getQueryString());`
`89`	`89`	`$result = $ldap->query($ldapBadge->getDnString(), $query)->execute();`
`90`	`90`	`if (1 !== $result->count()) {`
`91`	`91`	`throw new BadCredentialsException('The presented username is invalid.');`