melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: check render errors and handle htmx redirect in auth

Browse Source
This commit is contained in:
mkelvers
2026-04-21 01:20:36 +02:00
parent 06b36382a6
commit c3a2285834
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
api/auth/handler.go
View File

@@ -1,6 +1,7 @@
package auth package auth
import ( import (
"log"
"net/http" "net/http"
"mal/web/templates" "mal/web/templates"
@@ -26,7 +27,10 @@ func rateLimitErrorFromQuery(r *http.Request) string {
func (h *Handler) HandleLogin(w http.ResponseWriter, r *http.Request) { func (h *Handler) HandleLogin(w http.ResponseWriter, r *http.Request) {
if err := r.ParseForm(); err != nil { if err := r.ParseForm(); err != nil {
templates.Login("Something went wrong. Please try again.", "").Render(r.Context(), w) if renderErr := templates.Login("Something went wrong. Please try again.", "").Render(r.Context(), w); renderErr != nil {
log.Printf("render error: %v", renderErr)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
}
return return
} }
@@ -34,23 +38,34 @@ func (h *Handler) HandleLogin(w http.ResponseWriter, r *http.Request) {
password := r.FormValue("password") password := r.FormValue("password")
if username == "" || password == "" { if username == "" || password == "" {
templates.Login("The email or password is wrong.", username).Render(r.Context(), w) if renderErr := templates.Login("The email or password is wrong.", username).Render(r.Context(), w); renderErr != nil {
log.Printf("render error: %v", renderErr)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
}
return return
} }
session, err := h.authService.Login(r.Context(), username, password) session, err := h.authService.Login(r.Context(), username, password)
if err != nil { if err != nil {
templates.Login("The email or password is wrong.", username).Render(r.Context(), w) if renderErr := templates.Login("The email or password is wrong.", username).Render(r.Context(), w); renderErr != nil {
log.Printf("render error: %v", renderErr)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
}
return return
} }
SetSessionCookie(w, session.ID, session.ExpiresAt) SetSessionCookie(w, session.ID, session.ExpiresAt)
// HTMX-friendly redirect to root or previous page if r.Header.Get("HX-Request") == "true" {
w.Header().Set("HX-Redirect", "/") w.Header().Set("HX-Redirect", "/")
return
}
http.Redirect(w, r, "/", http.StatusFound) http.Redirect(w, r, "/", http.StatusFound)
} }
func (h *Handler) HandleLoginPage(w http.ResponseWriter, r *http.Request) { func (h *Handler) HandleLoginPage(w http.ResponseWriter, r *http.Request) {
templates.Login(rateLimitErrorFromQuery(r), "").Render(r.Context(), w) if err := templates.Login(rateLimitErrorFromQuery(r), "").Render(r.Context(), w); err != nil {
log.Printf("render error: %v", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
}
} }