establishing initial auth middleware and routes

This commit is contained in:
juancwu 2025-12-17 11:26:10 -05:00
commit 5c5ba78a32
6 changed files with 92 additions and 1 deletions

View file

@ -0,0 +1,14 @@
package handler
import "net/http"
type dashboardHandler struct{}
func NewDashboardHandler() *dashboardHandler {
return &dashboardHandler{}
}
func (h *dashboardHandler) DashboardPage(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(200)
w.Write([]byte("Dashboard page"))
}

View file

@ -4,8 +4,23 @@ import (
"net/http"
"git.juancwu.dev/juancwu/budgit/internal/ctxkeys"
"git.juancwu.dev/juancwu/budgit/internal/service"
)
// TODO: implement clearing jwt token in auth service
// AuthMiddleware checks for JWT token and adds user + profile + subscription to context if valid
func AuthMiddleware(authService *service.AuthService, userService *service.UserService) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO: get auth cookie and verify value
// TODO: fetch user information from database if cookie value is valid
// TODO: add user to context if valid
next.ServeHTTP(w, r)
})
}
}
// RequireGuest ensures request is not authenticated
func RequireGuest(next http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
@ -22,3 +37,37 @@ func RequireGuest(next http.HandlerFunc) http.HandlerFunc {
next.ServeHTTP(w, r)
}
}
// RequireAuth ensures the user is authenticated and has completed onboarding
func RequireAuth(next http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
user := ctxkeys.User(r.Context())
if user == nil {
// For HTMX requests, use HX-Redirect header to force full page redirect
if r.Header.Get("HX-Request") == "true" {
w.Header().Set("HX-Redirect", "/auth")
w.WriteHeader(http.StatusSeeOther)
return
}
// For regular requests, use standard redirect
http.Redirect(w, r, "/auth", http.StatusSeeOther)
return
}
// Check if user has completed onboarding
// Uses profile.Name as indicator (empty = incomplete onboarding)
profile := ctxkeys.Profile(r.Context())
if profile.Name == "" && r.URL.Path != "/auth/onboarding" {
// User hasn't completed onboarding, redirect to onboarding
if r.Header.Get("HX-Request") == "true" {
w.Header().Set("HX-Redirect", "/auth/onboarding")
w.WriteHeader(http.StatusSeeOther)
return
}
http.Redirect(w, r, "/auth/onboarding", http.StatusSeeOther)
return
}
next.ServeHTTP(w, r)
}
}

View file

@ -0,0 +1,14 @@
package middleware
import "net/http"
func Redirect(path string) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Header.Get("HX-Request") == "true" {
w.Header().Set("HX-Redirect", path)
w.WriteHeader(http.StatusSeeOther)
return
}
http.Redirect(w, r, path, http.StatusSeeOther)
})
}

View file

@ -13,6 +13,7 @@ import (
func SetupRoutes(a *app.App) http.Handler {
auth := handler.NewAuthHandler()
home := handler.NewHomeHandler()
dashboard := handler.NewDashboardHandler()
mux := http.NewServeMux()
@ -28,6 +29,12 @@ func SetupRoutes(a *app.App) http.Handler {
mux.HandleFunc("GET /auth", middleware.RequireGuest(auth.AuthPage))
mux.HandleFunc("GET /auth/password", middleware.RequireGuest(auth.PasswordPage))
// ====================================================================================
// PRIVATE ROUTES
// ====================================================================================
mux.HandleFunc("GET /app/dashboard", middleware.RequireAuth(dashboard.DashboardPage))
// 404
mux.HandleFunc("/{path...}", home.NotFoundPage)
@ -37,6 +44,7 @@ func SetupRoutes(a *app.App) http.Handler {
middleware.Config(a.Cfg),
middleware.RequestLogging,
middleware.CSRFProtection,
middleware.AuthMiddleware(a.AuthService, a.UserService),
middleware.WithURLPath,
)

View file

@ -8,6 +8,7 @@ import (
"git.juancwu.dev/juancwu/budgit/internal/model"
"git.juancwu.dev/juancwu/budgit/internal/repository"
"github.com/alexedwards/argon2id"
"github.com/golang-jwt/jwt/v5"
)
var (
@ -73,3 +74,7 @@ func (s *AuthService) ComparePassword(password, hash string) error {
}
return nil
}
func (s *AuthService) VerifyJWT(value string) (jwt.MapClaims, error) {
return nil, nil
}