Skip to content

Commit a60f783

Browse files
committed
bug #53529 [Ldap] Use {user_identifier} over deprecated {username} in factories (tcitworld)
This PR was merged into the 7.0 branch. Discussion ---------- [Ldap] Use `{user_identifier}` over deprecated `{username}` in factories | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT 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 Commits ------- 30baf8228e fix(ldap): replace {username} with {user_identifier} in LDAP factories
2 parents 24bf1ab + 6633368 commit a60f783

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

DependencyInjection/Security/Factory/FormLoginLdapFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function addConfiguration(NodeDefinition $node): void
3232
$node
3333
->children()
3434
->scalarNode('service')->defaultValue('ldap')->end()
35-
->scalarNode('dn_string')->defaultValue('{username}')->end()
35+
->scalarNode('dn_string')->defaultValue('{user_identifier}')->end()
3636
->scalarNode('query_string')->end()
3737
->scalarNode('search_dn')->defaultValue('')->end()
3838
->scalarNode('search_password')->defaultValue('')->end()

DependencyInjection/Security/Factory/HttpBasicLdapFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function addConfiguration(NodeDefinition $node): void
7777
$node
7878
->children()
7979
->scalarNode('service')->defaultValue('ldap')->end()
80-
->scalarNode('dn_string')->defaultValue('{username}')->end()
80+
->scalarNode('dn_string')->defaultValue('{user_identifier}')->end()
8181
->scalarNode('query_string')->end()
8282
->scalarNode('search_dn')->defaultValue('')->end()
8383
->scalarNode('search_password')->defaultValue('')->end()

DependencyInjection/Security/Factory/JsonLoginLdapFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function addConfiguration(NodeDefinition $node): void
2929
$node
3030
->children()
3131
->scalarNode('service')->defaultValue('ldap')->end()
32-
->scalarNode('dn_string')->defaultValue('{username}')->end()
32+
->scalarNode('dn_string')->defaultValue('{user_identifier}')->end()
3333
->scalarNode('query_string')->end()
3434
->scalarNode('search_dn')->defaultValue('')->end()
3535
->scalarNode('search_password')->defaultValue('')->end()

DependencyInjection/Security/UserProvider/LdapFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function addConfiguration(NodeDefinition $node): void
6464
->prototype('scalar')->end()
6565
->end()
6666
->scalarNode('uid_key')->defaultValue('sAMAccountName')->end()
67-
->scalarNode('filter')->defaultValue('({uid_key}={username})')->end()
67+
->scalarNode('filter')->defaultValue('({uid_key}={user_identifier})')->end()
6868
->scalarNode('password_attribute')->defaultNull()->end()
6969
->end()
7070
;

0 commit comments

Comments
 (0)