Added user registration
This commit is contained in:
@@ -16,17 +16,17 @@ import (
|
||||
|
||||
// Validates the username matches a user in the database and the password
|
||||
// is correct. Returns the corresponding user
|
||||
func validateLogin(conn *sql.DB, r *http.Request) (db.User, error) {
|
||||
func validateLogin(conn *sql.DB, r *http.Request) (*db.User, error) {
|
||||
formUsername := r.FormValue("username")
|
||||
formPassword := r.FormValue("password")
|
||||
user, err := db.GetUserFromUsername(conn, formUsername)
|
||||
if err != nil {
|
||||
return db.User{}, errors.Wrap(err, "db.GetUserFromUsername")
|
||||
return nil, errors.Wrap(err, "db.GetUserFromUsername")
|
||||
}
|
||||
|
||||
err = user.CheckPassword(formPassword)
|
||||
if err != nil {
|
||||
return db.User{}, errors.New("Username or password incorrect")
|
||||
return nil, errors.New("Username or password incorrect")
|
||||
}
|
||||
return user, nil
|
||||
}
|
||||
@@ -54,17 +54,19 @@ func HandleLoginRequest(
|
||||
r.ParseForm()
|
||||
user, err := validateLogin(conn, r)
|
||||
if err != nil {
|
||||
form.LoginForm(err.Error()).Render(r.Context(), w)
|
||||
if err.Error() != "Username or password incorrect" {
|
||||
logger.Warn().Caller().Err(err).Msg("Login request failed")
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
} else {
|
||||
form.LoginForm(err.Error()).Render(r.Context(), w)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
rememberMe := checkRememberMe(r)
|
||||
err = cookies.SetTokenCookies(w, r, config, &user, true, rememberMe)
|
||||
err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
|
||||
if err != nil {
|
||||
form.LoginForm(err.Error()).Render(r.Context(), w)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user