fix: restructure handler.go #181

handler/auth.go

@@ -0,0 +1,27 @@
+package handler
+
+import (
+	"me-fit/service"
+
+	"database/sql"
+	"net/http"
+)
+
+func handleAuth(db *sql.DB, router *http.ServeMux) {
+	// Don't use auth middleware for these routes, as it makes redirecting very difficult, if the mail is not yet verified
+	router.Handle("/auth/signin", service.HandleSignInPage(db))
+	router.Handle("/auth/signup", service.HandleSignUpPage(db))
+	router.Handle("/auth/verify", service.HandleSignUpVerifyPage(db)) // Hint for the user to verify their email
+	router.Handle("/auth/delete-account", service.HandleDeleteAccountPage(db))
+	router.Handle("/auth/verify-email", service.HandleSignUpVerifyResponsePage(db)) // The link contained in the email
+	router.Handle("/auth/change-password", service.HandleChangePasswordPage(db))
+	router.Handle("/auth/reset-password", service.HandleResetPasswordPage(db))
+	router.Handle("/api/auth/signup", service.HandleSignUpComp(db))
+	router.Handle("/api/auth/signin", service.HandleSignInComp(db))
+	router.Handle("/api/auth/signout", service.HandleSignOutComp(db))
+	router.Handle("/api/auth/delete-account", service.HandleDeleteAccountComp(db))
+	router.Handle("/api/auth/verify-resend", service.HandleVerifyResendComp(db))
+	router.Handle("/api/auth/change-password", service.HandleChangePasswordComp(db))
+	router.Handle("/api/auth/reset-password", service.HandleResetPasswordComp(db))
+	router.Handle("/api/auth/reset-password-actual", service.HandleActualResetPasswordComp(db))
+}

handler/default.go

@@ -0,0 +1,28 @@
+package handler
+
+import (
+	"me-fit/middleware"
+	"me-fit/service"
+
+	"database/sql"
+	"net/http"
+)
+
+func GetHandler(db *sql.DB) http.Handler {
+	var router = http.NewServeMux()
+
+	router.HandleFunc("/", service.HandleIndexAnd404(db))
+
+	// Serve static files (CSS, JS and images)
+	router.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("./static/"))))
+
+	handleWorkout(db, router)
+
+	handleAuth(db, router)
+
+	return middleware.Logging(middleware.EnableCors(router))
+}
+
+func auth(db *sql.DB, h http.Handler) http.Handler {
+	return middleware.EnsureValidSession(db, h)
+}

handler/workout.go

@@ -0,0 +1,15 @@
+package handler
+
+import (
+	"me-fit/service"
+
+	"database/sql"
+	"net/http"
+)
+
+func handleWorkout(db *sql.DB, router *http.ServeMux) {
+	router.Handle("/workout", auth(db, service.HandleWorkoutPage(db)))
+	router.Handle("POST /api/workout", auth(db, service.HandleWorkoutNewComp(db)))
+	router.Handle("GET /api/workout", auth(db, service.HandleWorkoutGetComp(db)))
+	router.Handle("DELETE /api/workout/{id}", auth(db, service.HandleWorkoutDeleteComp(db)))
+}