From 6f0639fdff8968214107061b71783ba4f264b8ca Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.eu>
Date: Thu, 17 Oct 2024 21:58:36 +0200
Subject: Revamp error handling

---
 pages/login.go | 6 +++---
 pages/page.go  | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'pages')

diff --git a/pages/login.go b/pages/login.go
index d433937..bd1ab46 100644
--- a/pages/login.go
+++ b/pages/login.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"database/sql"
 	"errors"
+	"fmt"
 	"gosten/csrf"
 	"gosten/form"
 	"gosten/model"
 	"gosten/session"
-	"log"
 	"net/http"
 	"net/url"
 
@@ -102,7 +102,7 @@ func checkLogin(ctx context.Context, user user) (bool, int32) {
 	} else if errors.Is(err, sql.ErrNoRows) {
 		return false, 0
 	} else {
-		log.Panicf("Could not load user '%s': %v", user.Name, err)
+		panic(fmt.Sprintf("Could not load user '%s': %v", user.Name, err))
 	}
 
 	return true, dbUser.ID
@@ -115,7 +115,7 @@ func handleLogin(w http.ResponseWriter, r *http.Request) {
 	ok, userId := checkLogin(r.Context(), u)
 
 	if !ok {
-		u.Errors = []error{form.FieldError{Field: "Password", Issue: "Invalid"}}
+		u.AddError("Password", "Username oder Passwort falsch.")
 		showLoginPage(r, w, u)
 		return
 	}
diff --git a/pages/page.go b/pages/page.go
index c10fb21..f606205 100644
--- a/pages/page.go
+++ b/pages/page.go
@@ -3,7 +3,6 @@ package pages
 import (
 	"context"
 	"gosten/model"
-	"log"
 	"net/http"
 
 	"github.com/a-h/templ"
@@ -43,7 +42,7 @@ func simpleByQuery[T any](tpl tplFunc[T], query func(context.Context, int32) (T,
 	dataFn := func(ctx context.Context) T {
 		d, err := query(ctx, getUser(ctx).ID)
 		if err != nil {
-			log.Panic(err.Error())
+			panic(err.Error())
 		}
 		return d
 	}
@@ -56,7 +55,7 @@ func render(c templ.Component) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := context.WithValue(r.Context(), ctxPath{}, r.URL.Path)
 		if err := c.Render(ctx, w); err != nil {
-			log.Panic(err.Error())
+			panic(err.Error())
 		}
 	}
 }
-- 
cgit v1.2.3-70-g09d2