Commit a350416
committed
fix(login): remove duplicate loginName/user_autofocus block that clobbered LDAP resolution
A second if/else block after the alt_login assignment was unconditionally
overwriting $parameters['loginName'] with the raw $user input, silently
discarding the getUserName() resolution done in the first block for LDAP
accounts whose internal username is a UUID. The first block already handles
all cases correctly; the duplicate was dead code with a functional side-effect.
Adds a regression test (testShowLoginFormLdapUsernameResolutionNotClobbered)
that passes an internal UUID as $user and asserts loginName is the resolved
display name, not the raw UUID.
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>1 parent d2607b7 commit a350416
2 files changed
Lines changed: 38 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
193 | 193 | | |
194 | 194 | | |
195 | 195 | | |
196 | | - | |
197 | | - | |
198 | | - | |
199 | | - | |
200 | | - | |
201 | | - | |
202 | | - | |
203 | | - | |
204 | 196 | | |
205 | 197 | | |
206 | 198 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
388 | 388 | | |
389 | 389 | | |
390 | 390 | | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
391 | 429 | | |
392 | 430 | | |
393 | 431 | | |
| |||
0 commit comments