Skip to content

fix(command): handle accounts without an email in /authme email #3162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xephi merged 1 commit into from
Oct 11, 2026
Merged

fix(command): handle accounts without an email in /authme email #3162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions authme-core/src/main/java/fr/xephi/authme/command/executable/authme/GetEmailCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import fr.xephi.authme.datasource.DataSource;
import fr.xephi.authme.message.MessageKey;
import fr.xephi.authme.service.CommonService;
import fr.xephi.authme.util.Utils;
import org.bukkit.command.CommandSender;

import javax.inject.Inject;
Expand All @@ -26,10 +27,12 @@ public void executeCommand(CommandSender sender, List<String> arguments) {
String playerName = arguments.isEmpty() ? sender.getName() : arguments.get(0);

DataSourceValue<String> email = dataSource.getEmail(playerName);
if (email.rowExists()) {
commonService.send(sender, MessageKey.ADMIN_EMAIL_SHOW, playerName, email.getValue());
} else {
if (!email.rowExists()) {
commonService.send(sender, MessageKey.UNKNOWN_USER);
} else if (Utils.isEmailEmpty(email.getValue())) {
commonService.send(sender, MessageKey.SHOW_NO_EMAIL);
} else {
commonService.send(sender, MessageKey.ADMIN_EMAIL_SHOW, playerName, email.getValue());
}
}
}
14 changes: 14 additions & 0 deletions authme-core/src/test/java/fr/xephi/authme/command/executable/authme/GetEmailCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,18 @@ void shouldReturnEmail() {
// then
verify(service).send(eq(sender), eq(MessageKey.ADMIN_EMAIL_SHOW), eq(user), eq(email));
}

@Test
void shouldReportMissingEmail() {
// given
String user = "userWithoutEmail";
given(dataSource.getEmail(user)).willReturn(DataSourceValueImpl.of(null));
CommandSender sender = mock(CommandSender.class);

// when
command.executeCommand(sender, Collections.singletonList(user));

// then
verify(service).send(sender, MessageKey.SHOW_NO_EMAIL);
}
}
Loading