Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-11-06 18:49:39 +01:00
Code Issues Projects Releases Wiki Activity

Minor: Make email check in '/email change' case-insensitive

Browse Source
This commit is contained in:
ljacqu 2017-10-28 13:10:02 +02:00
parent ba65633182
commit fbd8049af5
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java
View File

@ -47,7 +47,7 @@ public class AsyncChangeEmail implements AsynchronousProcess {
service.send(player, MessageKey.USAGE_ADD_EMAIL); service.send(player, MessageKey.USAGE_ADD_EMAIL);
} else if (newEmail == null || !validationService.validateEmail(newEmail)) { } else if (newEmail == null || !validationService.validateEmail(newEmail)) {
service.send(player, MessageKey.INVALID_NEW_EMAIL); service.send(player, MessageKey.INVALID_NEW_EMAIL);
} else if (!oldEmail.equals(currentEmail)) { } else if (!oldEmail.equalsIgnoreCase(currentEmail)) {
service.send(player, MessageKey.INVALID_OLD_EMAIL); service.send(player, MessageKey.INVALID_OLD_EMAIL);
} else if (!validationService.isEmailFreeForRegistration(newEmail, player)) { } else if (!validationService.isEmailFreeForRegistration(newEmail, player)) {
service.send(player, MessageKey.EMAIL_ALREADY_USED_ERROR); service.send(player, MessageKey.EMAIL_ALREADY_USED_ERROR);

24
src/test/java/fr/xephi/authme/process/email/AsyncChangeEmailTest.java
View File

@ -45,7 +45,7 @@ public class AsyncChangeEmailTest {
private ValidationService validationService; private ValidationService validationService;
@Test @Test
public void shouldAddEmail() { public void shouldChangeEmail() {
// given // given
String newEmail = "new@mail.tld"; String newEmail = "new@mail.tld";
given(player.getName()).willReturn("Bobby"); given(player.getName()).willReturn("Bobby");
@ -65,6 +65,28 @@ public class AsyncChangeEmailTest {
verify(service).send(player, MessageKey.EMAIL_CHANGED_SUCCESS); verify(service).send(player, MessageKey.EMAIL_CHANGED_SUCCESS);
} }
@Test
public void shouldNotBeCaseSensitiveWhenComparingEmails() {
// given
String newEmail = "newmail@example.com";
given(player.getName()).willReturn("Debra");
given(playerCache.isAuthenticated("debra")).willReturn(true);
String oldEmail = "OLD-mail@example.org";
PlayerAuth auth = authWithMail(oldEmail);
given(playerCache.getAuth("debra")).willReturn(auth);
given(dataSource.updateEmail(auth)).willReturn(true);
given(validationService.validateEmail(newEmail)).willReturn(true);
given(validationService.isEmailFreeForRegistration(newEmail, player)).willReturn(true);
// when
process.changeEmail(player, "old-mail@example.org", newEmail);
// then
verify(dataSource).updateEmail(auth);
verify(playerCache).updatePlayer(auth);
verify(service).send(player, MessageKey.EMAIL_CHANGED_SUCCESS);
}
@Test @Test
public void shouldShowErrorIfSaveFails() { public void shouldShowErrorIfSaveFails() {
// given // given