Added logging to loginform and added loading feedback for user on submit
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
||||
"projectreshoot/view/page"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/rs/zerolog"
|
||||
)
|
||||
|
||||
// Validates the username matches a user in the database and the password
|
||||
@@ -18,7 +19,6 @@ import (
|
||||
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")
|
||||
@@ -44,13 +44,20 @@ func checkRememberMe(r *http.Request) bool {
|
||||
// Handles an attempted login request. On success will return a HTMX redirect
|
||||
// and on fail will return the login form again, passing the error to the
|
||||
// template for user feedback
|
||||
func HandleLoginRequest(conn *sql.DB, secretKey string) http.Handler {
|
||||
func HandleLoginRequest(
|
||||
logger *zerolog.Logger,
|
||||
conn *sql.DB,
|
||||
secretKey string,
|
||||
) http.Handler {
|
||||
return http.HandlerFunc(
|
||||
func(w http.ResponseWriter, r *http.Request) {
|
||||
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")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user