Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Encapsulate account creation in AccountService

Browse Source
This commit is contained in:
P0nk
2024-09-29 19:33:20 +02:00
parent 99006c2dda
commit c0ee1f8ffe
2 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/server/handlers/login/LoginPasswordHandler.java
View File

@@ -23,7 +23,6 @@ package net.server.handlers.login;
import client.Character;
import client.Client;
import client.DefaultDates;
import client.LoginState;
import config.YamlConfig;
import constants.game.GameConstants;
@@ -39,15 +38,9 @@ import org.slf4j.LoggerFactory;
import service.AccountService;
import service.TransitionService;
import tools.BCrypt;
import tools.DatabaseConnection;
import tools.HexTool;
import tools.PacketCreator;
import java.sql.Connection;
import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.Objects;
import java.util.Optional;
@@ -91,7 +84,7 @@ public final class LoginPasswordHandler implements PacketHandler {
Optional<Account> foundAccount = accountService.getAccount(login);
if (foundAccount.isEmpty()) {
if (YamlConfig.config.server.AUTOMATIC_REGISTER) {
Account newAccount = createAccount(login, pwd);
Account newAccount = accountService.createAccount(login, pwd);
foundAccount = Optional.of(newAccount);
} else {
c.sendPacket(PacketCreator.getLoginFailed(5));
@@ -149,30 +142,6 @@ public final class LoginPasswordHandler implements PacketHandler {
Server.getInstance().registerLoginState(c);
}
private Account createAccount(String name, String password) {
Account account = createAccountPostgres(name, password);
createAccountMysql(account.id(), name, password);
return account;
}
private Account createAccountPostgres(String name, String password) {
return accountService.createNew(name, password);
}
private void createAccountMysql(int id, String name, String password) {
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("INSERT INTO accounts (id, name, password, birthday, tempban) VALUES (?, ?, ?, ?, ?);")) {
ps.setInt(1, id);
ps.setString(2, name);
ps.setString(3, BCrypt.hashpw(password, BCrypt.gensalt()));
ps.setDate(4, Date.valueOf(DefaultDates.getBirthday()));
ps.setTimestamp(5, Timestamp.valueOf(DefaultDates.getTempban()));
ps.executeUpdate();
} catch (SQLException e) {
throw new RuntimeException(e);
}
}
private boolean correctPassword(String input, Account account) {
return BCrypt.checkpw(input, account.password());
}

25
src/main/java/service/AccountService.java
View File

@@ -1,6 +1,7 @@
package service;
import client.Client;
import client.DefaultDates;
import client.LoginState;
import database.account.Account;
import database.account.AccountRepository;
@@ -11,9 +12,11 @@ import tools.BCrypt;
import tools.DatabaseConnection;
import java.sql.Connection;
import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
@@ -33,7 +36,13 @@ public class AccountService {
this.accountRepository = accountRepository;
}
public Account createNew(String name, String password) {
public Account createAccount(String name, String password) {
Account account = createAccountPostgres(name, password);
createAccountMysql(account.id(), name, password);
return account;
}
private Account createAccountPostgres(String name, String password) {
Account newAccount = Account.builder()
.name(name)
.password(hashPassword(password))
@@ -55,6 +64,20 @@ public class AccountService {
.orElseThrow(() -> new RuntimeException("Failed to get account after insert, id: " + accountId));
}
private void createAccountMysql(int id, String name, String password) {
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("INSERT INTO accounts (id, name, password, birthday, tempban) VALUES (?, ?, ?, ?, ?);")) {
ps.setInt(1, id);
ps.setString(2, name);
ps.setString(3, BCrypt.hashpw(password, BCrypt.gensalt()));
ps.setDate(4, Date.valueOf(DefaultDates.getBirthday()));
ps.setTimestamp(5, Timestamp.valueOf(DefaultDates.getTempban()));
ps.executeUpdate();
} catch (SQLException e) {
throw new RuntimeException(e);
}
}
private String hashPassword(String password) {
return BCrypt.hashpw(password, BCrypt.gensalt());
}