mirror of
https://github.com/CPunch/gopenfusion.git
synced 2024-11-21 23:10:06 +00:00
db/account: match the DB usage of others
This commit is contained in:
parent
c4ce7ae6c2
commit
294e83d533
@ -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
|
||||||
|
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user