IAmChrisAMA
/
rogueserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass struct to handleAccountLogin and handleAccountRegister

fasthttp
maru 2024-04-10 02:49:41 -04:00
parent 422a850354
commit 5893350784
No known key found for this signature in database
GPG Key ID: 37689350E9CD0F0D
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/account.go
View File

@ -58,12 +58,12 @@ func handleAccountInfo(username string, uuid []byte) (AccountInfoResponse, error
type AccountRegisterRequest GenericAuthRequest type AccountRegisterRequest GenericAuthRequest
// /account/register - register account // /account/register - register account
func handleAccountRegister(username, password string) error { func handleAccountRegister(request AccountRegisterRequest) error {
if !isValidUsername(username) { if !isValidUsername(request.Username) {
return fmt.Errorf("invalid username") return fmt.Errorf("invalid username")
} }
if len(password) < 6 { if len(request.Password) < 6 {
return fmt.Errorf("invalid password") return fmt.Errorf("invalid password")
} }
@ -79,7 +79,7 @@ func handleAccountRegister(username, password string) error {
return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err)) return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err))
} }
err = db.AddAccountRecord(uuid, username, argon2.IDKey([]byte(password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize), salt) err = db.AddAccountRecord(uuid, request.Username, argon2.IDKey([]byte(request.Password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize), salt)
if err != nil { if err != nil {
return fmt.Errorf("failed to add account record: %s", err) return fmt.Errorf("failed to add account record: %s", err)
} }
@ -91,16 +91,16 @@ type AccountLoginRequest GenericAuthRequest
type AccountLoginResponse GenericAuthResponse type AccountLoginResponse GenericAuthResponse
// /account/login - log into account // /account/login - log into account
func handleAccountLogin(username, password string) (AccountLoginResponse, error) { func handleAccountLogin(request AccountLoginRequest) (AccountLoginResponse, error) {
if !isValidUsername(username) { if !isValidUsername(request.Username) {
return AccountLoginResponse{}, fmt.Errorf("invalid username") return AccountLoginResponse{}, fmt.Errorf("invalid username")
} }
if len(password) < 6 { if len(request.Password) < 6 {
return AccountLoginResponse{}, fmt.Errorf("invalid password") return AccountLoginResponse{}, fmt.Errorf("invalid password")
} }
key, salt, err := db.FetchAccountKeySaltFromUsername(username) key, salt, err := db.FetchAccountKeySaltFromUsername(request.Username)
if err != nil { if err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return AccountLoginResponse{}, fmt.Errorf("account doesn't exist") return AccountLoginResponse{}, fmt.Errorf("account doesn't exist")
@ -109,7 +109,7 @@ func handleAccountLogin(username, password string) (AccountLoginResponse, error)
return AccountLoginResponse{}, err return AccountLoginResponse{}, err
} }
if !bytes.Equal(key, argon2.IDKey([]byte(password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize)) { if !bytes.Equal(key, argon2.IDKey([]byte(request.Password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize)) {
return AccountLoginResponse{}, fmt.Errorf("password doesn't match") return AccountLoginResponse{}, fmt.Errorf("password doesn't match")
} }
@ -119,7 +119,7 @@ func handleAccountLogin(username, password string) (AccountLoginResponse, error)
return AccountLoginResponse{}, fmt.Errorf("failed to generate token: %s", err) return AccountLoginResponse{}, fmt.Errorf("failed to generate token: %s", err)
} }
err = db.AddAccountSession(username, token) err = db.AddAccountSession(request.Username, token)
if err != nil { if err != nil {
return AccountLoginResponse{}, fmt.Errorf("failed to add account session") return AccountLoginResponse{}, fmt.Errorf("failed to add account session")
} }

4
api/generic.go
View File

@ -71,7 +71,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
err = handleAccountRegister(request.Username, request.Password) err = handleAccountRegister(request)
if err != nil { if err != nil {
httpError(w, r, err, http.StatusInternalServerError) httpError(w, r, err, http.StatusInternalServerError)
return return
@ -86,7 +86,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
response, err := handleAccountLogin(request.Username, request.Password) response, err := handleAccountLogin(request)
if err != nil { if err != nil {
httpError(w, r, err, http.StatusInternalServerError) httpError(w, r, err, http.StatusInternalServerError)
return return