CPunch/gopenfusion
1
0
Fork 0
mirror of https://github.com/CPunch/gopenfusion.git synced 2024-11-14 03:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

db/account: match the DB usage of others

Browse Source
This commit is contained in:
CPunch 2023-03-09 15:37:41 -06:00
parent c4ce7ae6c2
commit 294e83d533
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/account.go
View File

@ -22,7 +22,7 @@ type Account struct {
BanReason string BanReason string
} }
func NewAccount(db DBQuery, Login, Password string) (*Account, error) { func (db *DBHandler) NewAccount(Login, Password string) (*Account, error) {
hash, err := bcrypt.GenerateFromPassword([]byte(Password), 12) hash, err := bcrypt.GenerateFromPassword([]byte(Password), 12)
if err != nil { if err != nil {
return nil, err return nil, err
@ -46,7 +46,7 @@ var (
LoginErrorInvalidPassword = fmt.Errorf("Invalid ID && Password combo!") LoginErrorInvalidPassword = fmt.Errorf("Invalid ID && Password combo!")
) )
func TryLogin(db DBQuery, Login, Password string) (*Account, error) { func (db *DBHandler) TryLogin(Login, Password string) (*Account, error) {
row, err := db.Query("SELECT * FROM Accounts WHERE Login=?", Login) row, err := db.Query("SELECT * FROM Accounts WHERE Login=?", Login)
if err != nil { if err != nil {
return nil, err return nil, err

4
server/login.go
View File

@ -71,10 +71,10 @@ func (server *LoginServer) Login(client *Client, pkt *protocol.Packet) {
} }
// attempt login // attempt login
account, err := db.TryLogin(db.DefaultDB, loginPkt.SzID, loginPkt.SzPassword) account, err := db.DefaultDB.TryLogin(loginPkt.SzID, loginPkt.SzPassword)
if err == db.LoginErrorInvalidID { if err == db.LoginErrorInvalidID {
// this is the default behavior, auto create the account if the ID isn't in use // this is the default behavior, auto create the account if the ID isn't in use
account, err = db.NewAccount(db.DefaultDB, loginPkt.SzID, loginPkt.SzPassword) account, err = db.DefaultDB.NewAccount(loginPkt.SzID, loginPkt.SzPassword)
if err != nil { if err != nil {
// respond with a dummy login error packet so the client doesn't get softlocked // respond with a dummy login error packet so the client doesn't get softlocked
SendError(LOGIN_DATABASE_ERROR) SendError(LOGIN_DATABASE_ERROR)