migrated out more modules and refactored db system

internal/httpserver/routes.go

@@ -1,23 +1,25 @@
 package httpserver
 
 import (
+	"database/sql"
 	"net/http"
 
 	"projectreshoot/internal/handler"
 	"projectreshoot/internal/middleware"
 	"projectreshoot/internal/view/page"
 	"projectreshoot/pkg/config"
-	"projectreshoot/pkg/db"
 
-	"github.com/rs/zerolog"
+	"git.haelnorr.com/h/golib/hlog"
+	"git.haelnorr.com/h/golib/jwt"
 )
 
 // Add all the handled routes to the mux
 func addRoutes(
 	mux *http.ServeMux,
-	logger *zerolog.Logger,
+	logger *hlog.Logger,
 	config *config.Config,
-	conn *db.SafeConn,
+	tokenGen *jwt.TokenGenerator,
+	conn *sql.DB,
 	staticFS *http.FileSystem,
 ) {
 	route := mux.Handle
@@ -39,17 +41,17 @@ func addRoutes(
 
 	// Login page and handlers
 	route("GET /login", loggedOut(handler.LoginPage(config.TrustedHost)))
-	route("POST /login", loggedOut(handler.LoginRequest(config, logger, conn)))
+	route("POST /login", loggedOut(handler.LoginRequest(config, logger, conn, tokenGen)))
 
 	// Register page and handlers
 	route("GET /register", loggedOut(handler.RegisterPage(config.TrustedHost)))
-	route("POST /register", loggedOut(handler.RegisterRequest(config, logger, conn)))
+	route("POST /register", loggedOut(handler.RegisterRequest(config, tokenGen, logger, conn)))
 
 	// Logout
-	route("POST /logout", handler.Logout(config, logger, conn))
+	route("POST /logout", handler.Logout(conn, tokenGen, logger))
 
 	// Reauthentication request
-	route("POST /reauthenticate", loggedIn(handler.Reauthenticate(logger, config, conn)))
+	route("POST /reauthenticate", loggedIn(handler.Reauthenticate(logger, config, conn, tokenGen)))
 
 	// Profile page
 	route("GET /profile", loggedIn(handler.ProfilePage()))