From 96b766f47b3d1c3665b719ea22d3d8d8381f9321 Mon Sep 17 00:00:00 2001
From: Atridad Lahiji <me@atri.dad>
Date: Fri, 5 Jul 2024 23:14:21 -0600
Subject: [PATCH] Added some rad new helpers, comments, and cleaned up the
 route group definitions!

---
 lib/user.go |  1 +
 main.go     | 57 ++++++++++++++++++++++++++++++++---------------------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/lib/user.go b/lib/user.go
index 196b3f3..e70aacd 100644
--- a/lib/user.go
+++ b/lib/user.go
@@ -74,6 +74,7 @@ func SaveUser(dbPool *pgxpool.Pool, user *User) error {
 	}
 	return nil
 }
+
 func AuthenticatedMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		isSignedIn := IsSignedIn(c)
diff --git a/main.go b/main.go
index d4322f6..a545c2d 100755
--- a/main.go
+++ b/main.go
@@ -51,13 +51,20 @@ func main() {
 		log.Fatalf("Failed to initialize schema: %v", err)
 	}
 
-	// Initialize Echo router
+	// Initialize Echo router and route groups
 	e := echo.New()
+	publicPageRoute := e.Group("")
+	protectedPageRoute := e.Group("", lib.AuthenticatedPageMiddleware)
+	publicApiRoute := e.Group("/api")
+	protectedApiRoute := e.Group("/api", lib.AuthenticatedEndpointMiddleware)
+	webhookGroup := e.Group("/webhook")
 
 	// Initialize the session store
 	e.Use(lib.InitSessionMiddleware())
 
-	// Middleware
+	// ------------------------------
+	// Middleware:
+	// ------------------------------
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())
 	e.Pre(middleware.RemoveTrailingSlash())
@@ -68,35 +75,41 @@ func main() {
 	}))
 	e.Use(middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(50)))
 
-	// Static server
+	// ------------------------------
+	// Static Server:
+	// ------------------------------
 	fs := http.FS(PublicFS)
 	e.GET("/public/*", echo.WrapHandler(http.FileServer(fs)))
 
-	// Page routes
-	e.GET("/", pages.Home)
-	e.GET("/signin", pages.SignIn)
-	e.GET("/register", pages.Register)
-	e.GET("/dashboard", pages.Dashboard, lib.AuthenticatedMiddleware)
-	e.GET("/room/:id", pages.Room, lib.AuthenticatedMiddleware)
+	// ------------------------------
+	// Page Routes:
+	// ------------------------------
+	publicPageRoute.GET("/", pages.Home)
+	publicPageRoute.GET("/signin", pages.SignIn)
+	publicPageRoute.GET("/register", pages.Register)
+	protectedPageRoute.GET("/dashboard", pages.Dashboard)
+	protectedPageRoute.GET("/room/:id", pages.Room)
 
+	// ------------------------------
 	// API Routes:
-	apiGroup := e.Group("/api")
-	apiGroup.GET("/ping", api.Ping)
-
-	apiGroup.GET("/sse", func(c echo.Context) error {
+	// ------------------------------
+	// Generic API routes (public)
+	publicApiRoute.GET("/ping", api.Ping)
+	publicApiRoute.GET("/sse", func(c echo.Context) error {
 		return api.SSE(c)
 	})
-	// Public routes
-	apiGroup.POST("/register", api.RegisterUserHandler)
-	apiGroup.POST("/signin", api.SignInUserHandler)
-	apiGroup.POST("/signout", api.SignOutUserHandler)
-	// Rooms routes
-	apiGroup.POST("/room", api.CreateRoomHandler)
-	apiGroup.GET("/room", api.GetAllRoomsHandler)
-	apiGroup.DELETE("/room/:id", api.DeleteRoomHandler)
+
+	// Auth routes (public)
+	publicApiRoute.POST("/register", api.RegisterUserHandler)
+	publicApiRoute.POST("/signin", api.SignInUserHandler)
+	publicApiRoute.POST("/signout", api.SignOutUserHandler)
+
+	// Rooms routes (protected)
+	protectedApiRoute.POST("/room", api.CreateRoomHandler)
+	protectedApiRoute.GET("/room", api.GetAllRoomsHandler)
+	protectedApiRoute.DELETE("/room/:id", api.DeleteRoomHandler)
 
 	// Webhook Routes:
-	webhookGroup := e.Group("/webhook")
 	webhookGroup.POST("/clerk", webhooks.ClerkWebhookHandler)
 
 	// Parse command-line arguments for IP and port