From 85b5811d3f71928f6f243e039a8bf112c0142b12 Mon Sep 17 00:00:00 2001 From: mdxd44 Date: Fri, 20 May 2022 02:46:31 +0900 Subject: Massive code refactor, update dependencies, etc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Лень фулл писать. Closes #26 --- .../limboauth/command/ChangePasswordCommand.java | 81 +++++++++++----------- 1 file changed, 40 insertions(+), 41 deletions(-) (limited to 'src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java') diff --git a/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java b/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java index 806add0..f280053 100644 --- a/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java +++ b/src/main/java/net/elytrium/limboauth/command/ChangePasswordCommand.java @@ -24,36 +24,38 @@ import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.permission.Tristate; import com.velocitypowered.api.proxy.Player; import java.sql.SQLException; +import net.elytrium.java.commons.mc.serialization.Serializer; +import net.elytrium.limboauth.LimboAuth; import net.elytrium.limboauth.Settings; import net.elytrium.limboauth.handler.AuthSessionHandler; import net.elytrium.limboauth.model.RegisteredPlayer; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; public class ChangePasswordCommand implements SimpleCommand { private final Dao playerDao; - private final Component notPlayer; private final boolean needOldPass; private final Component notRegistered; + private final Component crackedCommand; private final Component wrongPassword; private final Component successful; private final Component errorOccurred; private final Component usage; - private final Component crackedCommand; + private final Component notPlayer; public ChangePasswordCommand(Dao playerDao) { this.playerDao = playerDao; - this.notPlayer = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.NOT_PLAYER); + Serializer serializer = LimboAuth.getSerializer(); this.needOldPass = Settings.IMP.MAIN.CHANGE_PASSWORD_NEED_OLD_PASSWORD; - this.notRegistered = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.NOT_REGISTERED); - this.wrongPassword = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.WRONG_PASSWORD); - this.successful = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.CHANGE_PASSWORD_SUCCESSFUL); - this.errorOccurred = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.ERROR_OCCURRED); - this.usage = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.CHANGE_PASSWORD_USAGE); - this.crackedCommand = LegacyComponentSerializer.legacyAmpersand().deserialize(Settings.IMP.MAIN.STRINGS.CRACKED_COMMAND); + this.notRegistered = serializer.deserialize(Settings.IMP.MAIN.STRINGS.NOT_REGISTERED); + this.crackedCommand = serializer.deserialize(Settings.IMP.MAIN.STRINGS.CRACKED_COMMAND); + this.wrongPassword = serializer.deserialize(Settings.IMP.MAIN.STRINGS.WRONG_PASSWORD); + this.successful = serializer.deserialize(Settings.IMP.MAIN.STRINGS.CHANGE_PASSWORD_SUCCESSFUL); + this.errorOccurred = serializer.deserialize(Settings.IMP.MAIN.STRINGS.ERROR_OCCURRED); + this.usage = serializer.deserialize(Settings.IMP.MAIN.STRINGS.CHANGE_PASSWORD_USAGE); + this.notPlayer = serializer.deserialize(Settings.IMP.MAIN.STRINGS.NOT_PLAYER); } @Override @@ -61,45 +63,42 @@ public class ChangePasswordCommand implements SimpleCommand { CommandSource source = invocation.source(); String[] args = invocation.arguments(); - if (!(source instanceof Player)) { - source.sendMessage(this.notPlayer); - return; - } - - if (this.needOldPass ? args.length == 2 : args.length == 1) { - if (this.needOldPass) { - RegisteredPlayer player = AuthSessionHandler.fetchInfo(this.playerDao, ((Player) source).getUsername()); - if (player == null) { - source.sendMessage(this.notRegistered); - return; - } else if (player.getHash().isEmpty()) { - source.sendMessage(this.crackedCommand); - } else if (!AuthSessionHandler.checkPassword(args[0], player, this.playerDao)) { - source.sendMessage(this.wrongPassword); - return; + if (source instanceof Player) { + if (this.needOldPass ? args.length == 2 : args.length == 1) { + if (this.needOldPass) { + RegisteredPlayer player = AuthSessionHandler.fetchInfo(this.playerDao, ((Player) source).getUsername()); + if (player == null) { + source.sendMessage(this.notRegistered); + return; + } else if (player.getHash().isEmpty()) { + source.sendMessage(this.crackedCommand); + } else if (!AuthSessionHandler.checkPassword(args[0], player, this.playerDao)) { + source.sendMessage(this.wrongPassword); + return; + } } - } - try { - UpdateBuilder updateBuilder = this.playerDao.updateBuilder(); - updateBuilder.where().eq("NICKNAME", ((Player) source).getUsername()); - updateBuilder.updateColumnValue("HASH", AuthSessionHandler.genHash(this.needOldPass ? args[1] : args[0])); - updateBuilder.update(); + try { + UpdateBuilder updateBuilder = this.playerDao.updateBuilder(); + updateBuilder.where().eq("NICKNAME", ((Player) source).getUsername()); + updateBuilder.updateColumnValue("HASH", AuthSessionHandler.genHash(this.needOldPass ? args[1] : args[0])); + updateBuilder.update(); - source.sendMessage(this.successful); - } catch (SQLException e) { - source.sendMessage(this.errorOccurred); - e.printStackTrace(); + source.sendMessage(this.successful); + } catch (SQLException e) { + source.sendMessage(this.errorOccurred); + e.printStackTrace(); + } + } else { + source.sendMessage(this.usage); } - - return; + } else { + source.sendMessage(this.notPlayer); } - - source.sendMessage(this.usage); } @Override public boolean hasPermission(SimpleCommand.Invocation invocation) { - return invocation.source().getPermissionValue("limboauth.commands.changepassword") != Tristate.FALSE; + return invocation.source().getPermissionValue("limboauth.commands.changepassword") == Tristate.TRUE; } } -- cgit