Merge branch 'Stabrinai:master' into master
This commit is contained in:
DGun Otto
GitHub
commit
82f29af1ae
@ -70,7 +70,7 @@ public class TotpCodeCommand extends PlayerCommand {
|
||||
boolean isCodeValid = totpAuthenticator.checkCode(auth, inputCode);
|
||||
if (isCodeValid) {
|
||||
logger.debug("Successfully checked TOTP code for `{0}`", player.getName());
|
||||
asynchronousLogin.performLogin(player, auth);
|
||||
asynchronousLogin.performLogin(player, auth,false);
|
||||
} else {
|
||||
logger.debug("Input TOTP code was invalid for player `{0}`", player.getName());
|
||||
messages.send(player, MessageKey.TWO_FACTOR_INVALID_CODE);
|
||||
|
||||
@ -35,9 +35,6 @@ public enum MessageKey {
|
||||
/** In-game registration is disabled! */
|
||||
REGISTRATION_DISABLED("registration.disabled"),
|
||||
|
||||
/** Logged-in due to Session Reconnection. */
|
||||
SESSION_RECONNECTION("session.valid_session"),
|
||||
|
||||
/** Successful login! */
|
||||
LOGIN_SUCCESS("login.success"),
|
||||
|
||||
|
||||
@ -30,7 +30,6 @@ final class OldMessageKeysMigrater {
|
||||
.put(MessageKey.WRONG_PASSWORD, "wrong_pwd")
|
||||
.put(MessageKey.UNREGISTERED_SUCCESS, "unregistered")
|
||||
.put(MessageKey.REGISTRATION_DISABLED, "reg_disabled")
|
||||
.put(MessageKey.SESSION_RECONNECTION, "valid_session")
|
||||
.put(MessageKey.ACCOUNT_NOT_ACTIVATED, "vb_nonActiv")
|
||||
.put(MessageKey.NAME_ALREADY_REGISTERED, "user_regged")
|
||||
.put(MessageKey.NO_PERMISSION, "no_perm")
|
||||
|
||||
@ -54,7 +54,7 @@ public class Management {
|
||||
}
|
||||
|
||||
public void forceLogin(Player player) {
|
||||
runTask(() -> asynchronousLogin.forceLogin(player));
|
||||
runTask(() -> asynchronousLogin.forceLogin(player,0));
|
||||
}
|
||||
|
||||
public void forceLogin(Player player, boolean quiet) {
|
||||
|
||||
@ -19,6 +19,7 @@ import fr.xephi.authme.service.bungeecord.BungeeSender;
|
||||
import fr.xephi.authme.service.bungeecord.MessageType;
|
||||
import fr.xephi.authme.settings.commandconfig.CommandManager;
|
||||
import fr.xephi.authme.settings.properties.HooksSettings;
|
||||
import fr.xephi.authme.settings.properties.PluginSettings;
|
||||
import fr.xephi.authme.settings.properties.RegistrationSettings;
|
||||
import fr.xephi.authme.settings.properties.RestrictionSettings;
|
||||
import fr.xephi.authme.util.InternetProtocolUtils;
|
||||
@ -128,18 +129,16 @@ public class AsynchronousJoin implements AsynchronousProcess {
|
||||
|
||||
// Session logic
|
||||
if (sessionService.canResumeSession(player)) {
|
||||
service.send(player, MessageKey.SESSION_RECONNECTION);
|
||||
// Run commands
|
||||
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
|
||||
() -> commandManager.runCommandsOnSessionLogin(player));
|
||||
bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player));
|
||||
bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player,service.getProperty(PluginSettings.HIDE_SESSIONS_LOGIN) ? 1 : 0));
|
||||
return;
|
||||
} else if (proxySessionManager.shouldResumeSession(name)) {
|
||||
service.send(player, MessageKey.SESSION_RECONNECTION);
|
||||
// Run commands
|
||||
bukkitService.scheduleSyncTaskFromOptionallyAsyncTask(
|
||||
() -> commandManager.runCommandsOnSessionLogin(player));
|
||||
bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player));
|
||||
bukkitService.runTaskOptionallyAsync(() -> asynchronousLogin.forceLogin(player,service.getProperty(PluginSettings.HIDE_SESSIONS_LOGIN) ? 1 : 0));
|
||||
logger.info("The user " + player.getName() + " has been automatically logged in, "
|
||||
+ "as present in autologin queue.");
|
||||
return;
|
||||
|
||||
@ -102,7 +102,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
||||
limboService.getLimboPlayer(player.getName()).setState(LimboPlayerState.TOTP_REQUIRED);
|
||||
// TODO #1141: Check if we should check limbo state before processing password
|
||||
} else {
|
||||
performLogin(player, auth);
|
||||
performLogin(player, auth, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -112,10 +112,10 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
||||
*
|
||||
* @param player the player to log in
|
||||
*/
|
||||
public void forceLogin(Player player) {
|
||||
public void forceLogin(Player player,int quiet) {
|
||||
PlayerAuth auth = getPlayerAuth(player);
|
||||
if (auth != null) {
|
||||
performLogin(player, auth);
|
||||
performLogin(player, auth, quiet == 1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -128,7 +128,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
||||
public void forceLogin(Player player, boolean quiet) {
|
||||
PlayerAuth auth = getPlayerAuth(player, quiet);
|
||||
if (auth != null) {
|
||||
performLogin(player, auth);
|
||||
performLogin(player, auth, false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -265,7 +265,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
||||
* @param player the player to log in
|
||||
* @param auth the associated PlayerAuth object
|
||||
*/
|
||||
public void performLogin(Player player, PlayerAuth auth) {
|
||||
public void performLogin(Player player, PlayerAuth auth, boolean quiet) {
|
||||
if (player.isOnline()) {
|
||||
boolean isFirstLogin = (auth.getLastLogin() == null);
|
||||
|
||||
@ -284,7 +284,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
||||
tempbanManager.resetCount(ip, name);
|
||||
player.setNoDamageTicks(0);
|
||||
|
||||
service.send(player, MessageKey.LOGIN_SUCCESS);
|
||||
if (!quiet) {service.send(player, MessageKey.LOGIN_SUCCESS);}
|
||||
|
||||
// Other auths
|
||||
List<String> auths = dataSource.getAllAuthsByIp(auth.getLastIp());
|
||||
|
||||
@ -89,9 +89,9 @@ abstract class AbstractPasswordRegisterExecutor<P extends AbstractPasswordRegist
|
||||
final Player player = params.getPlayer();
|
||||
if (performLoginAfterRegister(params)) {
|
||||
if (commonService.getProperty(PluginSettings.USE_ASYNC_TASKS)) {
|
||||
bukkitService.runTaskAsynchronously(() -> asynchronousLogin.forceLogin(player));
|
||||
bukkitService.runTaskAsynchronously(() -> asynchronousLogin.forceLogin(player,0));
|
||||
} else {
|
||||
bukkitService.scheduleSyncDelayedTask(() -> asynchronousLogin.forceLogin(player), SYNC_LOGIN_DELAY);
|
||||
bukkitService.scheduleSyncDelayedTask(() -> asynchronousLogin.forceLogin(player,0), SYNC_LOGIN_DELAY);
|
||||
}
|
||||
}
|
||||
syncProcessManager.processSyncPasswordRegister(player);
|
||||
|
||||
@ -20,6 +20,12 @@ public final class PluginSettings implements SettingsHolder {
|
||||
public static final Property<Boolean> SESSIONS_ENABLED =
|
||||
newProperty("settings.sessions.enabled", true);
|
||||
|
||||
@Comment({
|
||||
"Do you want to hide login success message to player?"
|
||||
})
|
||||
public static final Property<Boolean> HIDE_SESSIONS_LOGIN =
|
||||
newProperty("settings.sessions.hidelogin", true);
|
||||
|
||||
@Comment({
|
||||
"After how many minutes should a session expire?",
|
||||
"A player's session ends after the timeout or if his IP has changed"
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Сесията е продължена.'
|
||||
|
||||
invalid_session: '&cТвоят IP се е променил и сесията беше прекратена.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -69,7 +69,7 @@ misc:
|
||||
|
||||
# Mensagens de sessão
|
||||
session:
|
||||
valid_session: '&2Você deslogou recentemente, então sua sessão foi retomada!'
|
||||
|
||||
invalid_session: '&fO seu IP foi alterado e sua sessão expirou!'
|
||||
|
||||
# Mensagens de erro ao entrar
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&cAutomatické znovupřihlášení.'
|
||||
|
||||
invalid_session: '&cChyba: Počkej než vyprší tvoje relace.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Erfolgreich eingeloggt!'
|
||||
|
||||
invalid_session: '&cUngültige Session. Bitte starte das Spiel neu oder warte, bis die Session abgelaufen ist.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
# Session messages
|
||||
session:
|
||||
invalid_session: '&cYour IP has been changed and your session data has expired!'
|
||||
valid_session: '&2Logged-in due to Session Reconnection.'
|
||||
|
||||
|
||||
# Error messages when joining
|
||||
on_join_validation:
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Ensalutantojn pro Sesio Rekonektas.'
|
||||
|
||||
invalid_session: '&cVia IP estis ŝanĝita kaj via seanco datumoj finiĝis!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -67,7 +67,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&cInicio de sesión'
|
||||
|
||||
invalid_session: '&fLos datos de sesión no corresponden. Por favor espera a terminar la sesión.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
# Session messages
|
||||
session:
|
||||
invalid_session: '&cSinu IP-aadress muutus, seega sinu sessioon aegus!'
|
||||
valid_session: '&2Sisse logitud sessiooni jätkumise tõttu.'
|
||||
|
||||
|
||||
# Error messages when joining
|
||||
on_join_validation:
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&cSesioa mantendu eta beraz ez daukazu saioa hasi beharrik.'
|
||||
|
||||
invalid_session: '&cZure IP helbidea aldatu da, eta horregatik zure sesioa iraungi da!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&cIstunto jatkettu!'
|
||||
|
||||
invalid_session: '&fIstunto ei täsmää! Ole hyvä ja odota istunnon loppuun'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -69,7 +69,7 @@ misc:
|
||||
|
||||
# Session
|
||||
session:
|
||||
valid_session: '&aVous avez été automatiquement connecté !'
|
||||
|
||||
invalid_session: 'Session expirée suite à un changement d''IP.'
|
||||
|
||||
# Erreurs lors d'une tentative connexion
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&cIdentificado mediante a sesión'
|
||||
|
||||
invalid_session: '&fOs datos de sesión non corresponden, por favor, espere a que remate a sesión'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2A megadott időkereten belül csatlakoztál vissza, így a rendszer automatikusan beléptetett.'
|
||||
|
||||
invalid_session: '&cAz IP címed megváltozott, ezért a visszacsatlakozási időkereted lejárt.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Otomatis login, karena sesi masih terhubung.'
|
||||
|
||||
invalid_session: '&cIP kamu telah berubah, dan sesi kamu telah berakhir!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -67,7 +67,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Autenticato automaticamente attraverso la precedente sessione!'
|
||||
|
||||
invalid_session: '&cIl tuo indirizzo IP è cambiato e la tua sessione è stata terminata!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -68,7 +68,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2세션 재 연결로 인해 로그인 되었습니다.'
|
||||
|
||||
invalid_session: '&cIP가 변경되어 세션이 만료되었습니다!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&aSesijos prisijungimas'
|
||||
|
||||
invalid_session: '&cSesijos laikai nesutampa, prasome palaukti kol secija baigsis.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Ingelogd wegens sessie-herverbinding.'
|
||||
|
||||
invalid_session: '&cJouw IP-adres is veranderd en je sessie is verlopen!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&aZalogowano automatycznie z powodu sesji logowania.'
|
||||
|
||||
invalid_session: '&fSesja logowania zakończona!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&cSessão válida'
|
||||
|
||||
invalid_session: '&fDados de sessão não correspondem. Por favor aguarde o fim da sessão'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
# Session messages
|
||||
session:
|
||||
invalid_session: '&cIP-ul tau a fost schimbat si sesiunea ta a expirat!'
|
||||
valid_session: '&2Conectat datorita reconectarii sesiunii.'
|
||||
|
||||
|
||||
# Error messages when joining
|
||||
on_join_validation:
|
||||
|
||||
@ -61,7 +61,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Вы автоматически авторизовались!'
|
||||
|
||||
invalid_session: '&cСессия некорректна. Дождитесь, пока она закончится.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -65,7 +65,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Uspešna povezava.'
|
||||
|
||||
invalid_session: '&cVas IP je bil spremenjen in vasa seja je potekla!'
|
||||
|
||||
# Error messages when joining
|
||||
@ -154,4 +154,3 @@ time:
|
||||
hours: 'ure'
|
||||
day: 'dan'
|
||||
days: 'dni'
|
||||
|
||||
@ -72,7 +72,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&cAutomatické prihlásenie z dôvodu pokračovania relácie.'
|
||||
|
||||
invalid_session: '&fTvoja IP sa zmenila a tvoje prihlásenie(relácia) vypršalo(/a).'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Ulogovani ste zbog ponovnog povezivanja sesije.'
|
||||
|
||||
invalid_session: '&cVaš IP je promenjen i vaši podaci o sesiji su istekli!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Oturuma girisiniz otomatikmen yapilmistir.'
|
||||
|
||||
invalid_session: '&cIP adresin degistirildi ve oturum suren doldu!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Сесію відновлено.'
|
||||
|
||||
invalid_session: '&cСесію було розірвано внаслідок зміни IP.'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2Phiên đăng nhập đã được kết nối trở lại.'
|
||||
|
||||
invalid_session: '&cIP của bạn đã bị thay đổi và phiên đăng nhập của bạn đã hết hạn!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -68,7 +68,6 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: ''
|
||||
invalid_session: '&c*** 请重新登录 ***'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -69,7 +69,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&8[&6用戶系統&8] &b嗨 ！ 歡迎回來喔～'
|
||||
|
||||
invalid_session: '&8[&6用戶系統&8] &f登入階段資料已損壞，請等待登入階段結束。'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -66,7 +66,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&2由於會話重新連接而登錄.'
|
||||
|
||||
invalid_session: '&c您的IP已更改，並且您的會話數據已過期！'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
@ -68,7 +68,7 @@ misc:
|
||||
|
||||
# Session messages
|
||||
session:
|
||||
valid_session: '&b【AuthMe】&6您已經成功登入!'
|
||||
|
||||
invalid_session: '&b【AuthMe】&6Session驗證不相符!'
|
||||
|
||||
# Error messages when joining
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user