quick return check for null email address, in reference to duplicate email check issue #1510
This commit is contained in:
parent
6dc17da00a
commit
9ad2a8272e
2 changed files with 5 additions and 0 deletions
|
@ -172,6 +172,7 @@ public class DefaultCacheUserProvider implements CacheUserProvider {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UserModel getUserByEmail(String email, RealmModel realm) {
|
public UserModel getUserByEmail(String email, RealmModel realm) {
|
||||||
|
if (email == null) return null;
|
||||||
|
|
||||||
email = email.toLowerCase();
|
email = email.toLowerCase();
|
||||||
|
|
||||||
|
|
|
@ -520,6 +520,8 @@ public class FederationProvidersIntegrationTest {
|
||||||
LDAPFederationProvider ldapFedProvider = FederationTestUtils.getLdapProvider(session, ldapModel);
|
LDAPFederationProvider ldapFedProvider = FederationTestUtils.getLdapProvider(session, ldapModel);
|
||||||
FederationTestUtils.addLDAPUser(ldapFedProvider, appRealm, "marykeycloak", "Mary1", "Kelly1", "mary1@email.org", null, "123");
|
FederationTestUtils.addLDAPUser(ldapFedProvider, appRealm, "marykeycloak", "Mary1", "Kelly1", "mary1@email.org", null, "123");
|
||||||
FederationTestUtils.addLDAPUser(ldapFedProvider, appRealm, "mary-duplicatemail", "Mary2", "Kelly2", "mary@test.com", null, "123");
|
FederationTestUtils.addLDAPUser(ldapFedProvider, appRealm, "mary-duplicatemail", "Mary2", "Kelly2", "mary@test.com", null, "123");
|
||||||
|
LDAPObject marynoemail = FederationTestUtils.addLDAPUser(ldapFedProvider, appRealm, "marynoemail", "Mary1", "Kelly1", null, null, "123");
|
||||||
|
ldapFedProvider.getLdapIdentityStore().updatePassword(marynoemail, "Password1");
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
@ -531,6 +533,8 @@ public class FederationProvidersIntegrationTest {
|
||||||
|
|
||||||
loginPage.login("mary1@email.org", "password");
|
loginPage.login("mary1@email.org", "password");
|
||||||
Assert.assertEquals("Username already exists.", loginPage.getError());
|
Assert.assertEquals("Username already exists.", loginPage.getError());
|
||||||
|
|
||||||
|
loginSuccessAndLogout("marynoemail", "Password1");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in a new issue