fix: normalize the login email case
The login address was only trimmed, so the casing somebody happened to type at their very first login was frozen into the user row forever — createOrUpdateLocalUser() never wrote the address back. Everything downstream re-sends the stored address rather than the one just authenticated with, which also leaked that casing into the OAuth2 email claim and the log identities. Harmless in practice, since BusPro matches an address case-insensitively and so does the utf8mb4_unicode_ci column, but it left User out of step with the newsletter entities, which have always normalized. Fold the case once in authenticate(), which covers the BusPro calls, the lookup and a new account alike, and write the address back on every login so an account created before this converges instead of staying frozen. No backfill: a row nobody logs into again is matched case-insensitively either way. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
@@ -76,6 +76,35 @@ class BpnAuthenticatorTest extends TestCase
|
||||
self::assertNotNull($user->getLastLoginAt(), 'the rest of the profile is still synced');
|
||||
}
|
||||
|
||||
public function testTheLoginAddressIsNormalizedAndRewritesAStoredCasing(): void
|
||||
{
|
||||
// An account from before the address was normalized: it carries the casing of whatever
|
||||
// its very first login happened to type.
|
||||
$existing = (new User('[email protected]'))->setRoles([Role::TEAMER]);
|
||||
|
||||
$persisted = null;
|
||||
$persistedPassword = null;
|
||||
$lookupCriteria = null;
|
||||
$authenticator = $this->authenticator(
|
||||
$this->crmAttributes([Role::TEAMER], []),
|
||||
$existing,
|
||||
$persisted,
|
||||
$persistedPassword,
|
||||
null,
|
||||
$lookupCriteria,
|
||||
);
|
||||
|
||||
$user = $this->loadUser($authenticator, ' [email protected] ');
|
||||
|
||||
self::assertSame($existing, $persisted, 'a differently cased address is the same account');
|
||||
self::assertSame(['email' => '[email protected]'], $lookupCriteria);
|
||||
self::assertSame(
|
||||
'[email protected]',
|
||||
$user->getEmail(),
|
||||
'the stored casing follows the login rather than staying frozen',
|
||||
);
|
||||
}
|
||||
|
||||
public function testApprovedRoleSurvivesTheNextLogin(): void
|
||||
{
|
||||
$existing = (new User('[email protected]'))->setRoles([Role::TEAMER, Role::HOUSE_MANAGER]);
|
||||
@@ -344,6 +373,7 @@ class BpnAuthenticatorTest extends TestCase
|
||||
?User &$persisted,
|
||||
?string &$persistedPassword = null,
|
||||
?string $contactEmail = null,
|
||||
?array &$lookupCriteria = null,
|
||||
): BpnAuthenticator {
|
||||
$personalData = new PersonalData();
|
||||
$personalData->personId = 42;
|
||||
@@ -355,7 +385,14 @@ class BpnAuthenticatorTest extends TestCase
|
||||
$apiClient->method('getCrmAttributes')->willReturn($crmAttributes);
|
||||
|
||||
$repository = $this->createStub(EntityRepository::class);
|
||||
$repository->method('findOneBy')->willReturn($existing);
|
||||
$repository
|
||||
->method('findOneBy')
|
||||
->willReturnCallback(static function (array $criteria) use ($existing, &$lookupCriteria): ?User {
|
||||
$lookupCriteria = $criteria;
|
||||
|
||||
return $existing;
|
||||
})
|
||||
;
|
||||
|
||||
$entityManager = $this->createStub(EntityManagerInterface::class);
|
||||
$entityManager->method('getRepository')->willReturn($repository);
|
||||
|
||||
Reference in New Issue
Block a user