Code consistency
parent
98ecbbb529
commit
f395dc145b
|
@ -15,37 +15,41 @@ type LoginResponse GenericAuthResponse
|
||||||
|
|
||||||
// /account/login - log into account
|
// /account/login - log into account
|
||||||
func Login(request LoginRequest) (LoginResponse, error) {
|
func Login(request LoginRequest) (LoginResponse, error) {
|
||||||
|
var response LoginResponse
|
||||||
|
|
||||||
if !isValidUsername(request.Username) {
|
if !isValidUsername(request.Username) {
|
||||||
return LoginResponse{}, fmt.Errorf("invalid username")
|
return response, fmt.Errorf("invalid username")
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(request.Password) < 6 {
|
if len(request.Password) < 6 {
|
||||||
return LoginResponse{}, fmt.Errorf("invalid password")
|
return response, fmt.Errorf("invalid password")
|
||||||
}
|
}
|
||||||
|
|
||||||
key, salt, err := db.FetchAccountKeySaltFromUsername(request.Username)
|
key, salt, err := db.FetchAccountKeySaltFromUsername(request.Username)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err == sql.ErrNoRows {
|
if err == sql.ErrNoRows {
|
||||||
return LoginResponse{}, fmt.Errorf("account doesn't exist")
|
return response, fmt.Errorf("account doesn't exist")
|
||||||
}
|
}
|
||||||
|
|
||||||
return LoginResponse{}, err
|
return response, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !bytes.Equal(key, deriveArgon2IDKey([]byte(request.Password), salt)) {
|
if !bytes.Equal(key, deriveArgon2IDKey([]byte(request.Password), salt)) {
|
||||||
return LoginResponse{}, fmt.Errorf("password doesn't match")
|
return response, fmt.Errorf("password doesn't match")
|
||||||
}
|
}
|
||||||
|
|
||||||
token := make([]byte, TokenSize)
|
token := make([]byte, TokenSize)
|
||||||
_, err = rand.Read(token)
|
_, err = rand.Read(token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return LoginResponse{}, fmt.Errorf("failed to generate token: %s", err)
|
return response, fmt.Errorf("failed to generate token: %s", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = db.AddAccountSession(request.Username, token)
|
err = db.AddAccountSession(request.Username, token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return LoginResponse{}, fmt.Errorf("failed to add account session")
|
return response, fmt.Errorf("failed to add account session")
|
||||||
}
|
}
|
||||||
|
|
||||||
return LoginResponse{Token: base64.StdEncoding.EncodeToString(token)}, nil
|
response.Token = base64.StdEncoding.EncodeToString(token)
|
||||||
|
|
||||||
|
return response, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue