fix(ldap): replace {username} with {user_identifier} in LDAP factories

tcitworld · tcitworld · commit 30baf8228efb · 2024-01-12T17:51:04.000+01:00
In SF 7.0, the deprecated {username} placeholder was removed in favor of {user_identifier} (in #50866). However, the default values for the filter and dn_string parameters still contained {username} instead of the updated key. This PR changes the value to the new updated key Signed-off-by: Thomas Citharel <tcit@tcit.fr>
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/FormLoginLdapFactory.php
@@ -32,7 +32,7 @@ public function addConfiguration(NodeDefinition $node): void
         $node
             ->children()
                 ->scalarNode('service')->defaultValue('ldap')->end()
-                ->scalarNode('dn_string')->defaultValue('{username}')->end()
+                ->scalarNode('dn_string')->defaultValue('{user_identifier}')->end()
                 ->scalarNode('query_string')->end()
                 ->scalarNode('search_dn')->defaultValue('')->end()
                 ->scalarNode('search_password')->defaultValue('')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/HttpBasicLdapFactory.php
@@ -77,7 +77,7 @@ public function addConfiguration(NodeDefinition $node): void
         $node
             ->children()
                 ->scalarNode('service')->defaultValue('ldap')->end()
-                ->scalarNode('dn_string')->defaultValue('{username}')->end()
+                ->scalarNode('dn_string')->defaultValue('{user_identifier}')->end()
                 ->scalarNode('query_string')->end()
                 ->scalarNode('search_dn')->defaultValue('')->end()
                 ->scalarNode('search_password')->defaultValue('')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/JsonLoginLdapFactory.php
@@ -29,7 +29,7 @@ public function addConfiguration(NodeDefinition $node): void
         $node
             ->children()
                 ->scalarNode('service')->defaultValue('ldap')->end()
-                ->scalarNode('dn_string')->defaultValue('{username}')->end()
+                ->scalarNode('dn_string')->defaultValue('{user_identifier}')->end()
                 ->scalarNode('query_string')->end()
                 ->scalarNode('search_dn')->defaultValue('')->end()
                 ->scalarNode('search_password')->defaultValue('')->end()
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/UserProvider/LdapFactory.php
@@ -64,7 +64,7 @@ public function addConfiguration(NodeDefinition $node): void
                     ->prototype('scalar')->end()
                 ->end()
                 ->scalarNode('uid_key')->defaultValue('sAMAccountName')->end()
-                ->scalarNode('filter')->defaultValue('({uid_key}={username})')->end()
+                ->scalarNode('filter')->defaultValue('({uid_key}={user_identifier})')->end()
                 ->scalarNode('password_attribute')->defaultNull()->end()
             ->end()
         ;

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function addConfiguration(NodeDefinition $node): void`
`64`	`64`	`->prototype('scalar')->end()`
`65`	`65`	`->end()`
`66`	`66`	`->scalarNode('uid_key')->defaultValue('sAMAccountName')->end()`
`67`		`- ->scalarNode('filter')->defaultValue('({uid_key}={username})')->end()`
	`67`	`+ ->scalarNode('filter')->defaultValue('({uid_key}={user_identifier})')->end()`
`68`	`68`	`->scalarNode('password_attribute')->defaultNull()->end()`
`69`	`69`	`->end()`
`70`	`70`	`;`