diff --git a/src/main/java/it/tdlight/client/ConsoleInteractiveAuthenticationData.java b/src/main/java/it/tdlight/client/ConsoleInteractiveAuthenticationData.java index ffed0d8..0796e9a 100644 --- a/src/main/java/it/tdlight/client/ConsoleInteractiveAuthenticationData.java +++ b/src/main/java/it/tdlight/client/ConsoleInteractiveAuthenticationData.java @@ -21,6 +21,10 @@ final class ConsoleInteractiveAuthenticationData implements AuthenticationData { initializeIfNeeded(); } + public boolean isInitialized() { + return initialized; + } + @Override public boolean isBot() { initializeIfNeeded(); diff --git a/src/main/java/it/tdlight/client/ScannerClientInteraction.java b/src/main/java/it/tdlight/client/ScannerClientInteraction.java index a4e9aec..658d492 100644 --- a/src/main/java/it/tdlight/client/ScannerClientInteraction.java +++ b/src/main/java/it/tdlight/client/ScannerClientInteraction.java @@ -15,7 +15,15 @@ final class ScannerClientInteraction implements ClientInteraction { public String onParameterRequest(InputParameter parameter, ParameterInfo parameterInfo) { AuthenticationData authenticationData = authenticable.getAuthenticationData(); String who; - if (authenticationData.isBot()) { + boolean useRealWho; + if (authenticationData instanceof ConsoleInteractiveAuthenticationData) { + useRealWho = ((ConsoleInteractiveAuthenticationData) authenticationData).isInitialized(); + } else { + useRealWho = true; + } + if (!useRealWho) { + who = "login"; + } else if (authenticationData.isBot()) { who = authenticationData.getBotToken().split(":", 2)[0]; } else { who = "+" + authenticationData.getUserPhoneNumber();