From 19264a3737e882fc0958dde70d7a2988b24b563d Mon Sep 17 00:00:00 2001
From: Bastean <bastean@pm.me>
Date: Sun, 18 Aug 2024 17:34:19 +0000
Subject: [PATCH] refactor(server): use a direct implementation of gin handlers

---
 .../page/dashboard/form.delete.templ          |  8 ++-
 .../page/dashboard/form.update.templ          |  8 ++-
 .../page/dashboard/page.dashboard.templ       |  2 +-
 .../component/page/home/form.login.templ      |  8 ++-
 .../component/page/home/form.register.templ   |  8 ++-
 .../component/page/home/modal.terms.templ     |  4 +-
 .../component/page/home/page.home.templ       |  2 +-
 .../component/scripts/fomantic/fomantic.templ | 12 ++--
 internal/app/server/handler/health/check.go   |  6 +-
 internal/app/server/handler/page/dashboard.go | 34 +++++-----
 internal/app/server/handler/page/default.go   | 13 ----
 internal/app/server/handler/page/home.go      |  8 +--
 .../app/server/handler/redirect/default.go    | 11 +++
 internal/app/server/handler/user/create.go    | 34 +++++-----
 internal/app/server/handler/user/delete.go    | 68 +++++++++----------
 internal/app/server/handler/user/login.go     | 64 +++++++++--------
 internal/app/server/handler/user/update.go    | 46 ++++++-------
 internal/app/server/handler/user/verify.go    | 30 ++++----
 .../app/server/middleware/authentication.go   | 38 +++++------
 internal/app/server/middleware/cookie.go      |  9 ++-
 internal/app/server/middleware/error.go       | 50 +++++++-------
 internal/app/server/middleware/header.go      | 23 +++----
 internal/app/server/middleware/limiter.go     | 37 +++++-----
 internal/app/server/router/api/api.go         | 19 +++---
 internal/app/server/router/router.go          | 16 +++--
 internal/app/server/router/view/view.go       |  8 +--
 internal/app/server/server.go                 |  2 +-
 internal/pkg/service/errors/errors.go         |  4 ++
 internal/pkg/service/service.go               |  1 +
 29 files changed, 281 insertions(+), 292 deletions(-)
 delete mode 100644 internal/app/server/handler/page/default.go
 create mode 100644 internal/app/server/handler/redirect/default.go

diff --git a/internal/app/server/component/page/dashboard/form.delete.templ b/internal/app/server/component/page/dashboard/form.delete.templ
index 81cbd5d6..5701097f 100644
--- a/internal/app/server/component/page/dashboard/form.delete.templ
+++ b/internal/app/server/component/page/dashboard/form.delete.templ
@@ -1,6 +1,8 @@
 package dashboard
 
-var DeleteFormTagId = "delete"
+const (
+	DeleteFormTagId = "delete"
+)
 
 script DeleteFormInit(formTagId string) {
     $(`#${formTagId}`)
@@ -35,13 +37,13 @@ script DeleteFormInit(formTagId string) {
             }
         })
         .api({
-            action: "delete user", 
+            action: "user_delete", 
             method: "DELETE",
             onSuccess: function(response, element, xhr) {
                 $.toast({
                     class: "success",
                     message: response.Message,
-                    showProgress: "top",
+                    showProgress: "top"
                 });
 
                  _.delay(function() {
diff --git a/internal/app/server/component/page/dashboard/form.update.templ b/internal/app/server/component/page/dashboard/form.update.templ
index 374322c9..1b5d0801 100644
--- a/internal/app/server/component/page/dashboard/form.update.templ
+++ b/internal/app/server/component/page/dashboard/form.update.templ
@@ -1,6 +1,8 @@
 package dashboard
 
-var UpdateFormTagId = "update"
+const (
+	UpdateFormTagId = "update"
+)
 
 script UpdateFormInit(formTagId string) {
     $(`#${formTagId}`)
@@ -72,13 +74,13 @@ script UpdateFormInit(formTagId string) {
             }
         })
         .api({
-            action: "update user", 
+            action: "user_update", 
             method: "PATCH",
             onSuccess: function(response, element, xhr) {
                 $.toast({
                     class: "success",
                     message: response.Message,
-                    showProgress: "top",
+                    showProgress: "top"
                 });
 
                  _.delay(function() {
diff --git a/internal/app/server/component/page/dashboard/page.dashboard.templ b/internal/app/server/component/page/dashboard/page.dashboard.templ
index b5efec86..eacce0c2 100644
--- a/internal/app/server/component/page/dashboard/page.dashboard.templ
+++ b/internal/app/server/component/page/dashboard/page.dashboard.templ
@@ -26,7 +26,7 @@ script PageInit() {
         })
     ;
 
-     $(".ui.green.nag")
+    $(".ui.green.nag")
         .nag({
             key: "account-confirmed",
             value: true
diff --git a/internal/app/server/component/page/home/form.login.templ b/internal/app/server/component/page/home/form.login.templ
index 1394c176..f38d75d0 100644
--- a/internal/app/server/component/page/home/form.login.templ
+++ b/internal/app/server/component/page/home/form.login.templ
@@ -1,6 +1,8 @@
 package home
 
-var LoginFormTagId = "login"
+const (
+	LoginFormTagId = "login"
+)
 
 script LoginFormInit(formTagId string) {
     $(`#${formTagId}`)
@@ -31,13 +33,13 @@ script LoginFormInit(formTagId string) {
             }
         })
         .api({
-            action: "login user", 
+            action: "user_login", 
             method: "POST",
             onSuccess: function(response, element, xhr) {
                 $.toast({
                     class: "success",
                     message: response.Message,
-                    showProgress: "top",
+                    showProgress: "top"
                 });
 
                 _.delay(function() {
diff --git a/internal/app/server/component/page/home/form.register.templ b/internal/app/server/component/page/home/form.register.templ
index 932be7f5..60d1633b 100644
--- a/internal/app/server/component/page/home/form.register.templ
+++ b/internal/app/server/component/page/home/form.register.templ
@@ -1,6 +1,8 @@
 package home
 
-var RegisterFormTagId = "register"
+const (
+	RegisterFormTagId = "register"
+)
 
 script RegisterFormInit(formTagId, loginTabTagId string) {
     $(`#${formTagId}`)
@@ -61,7 +63,7 @@ script RegisterFormInit(formTagId, loginTabTagId string) {
             }
         })
         .api({
-            action: "create user", 
+            action: "user_create", 
             method: "PUT",
             beforeSend: function(settings) {
                 settings.data.Id = crypto.randomUUID();
@@ -74,7 +76,7 @@ script RegisterFormInit(formTagId, loginTabTagId string) {
                 $.toast({
                     class: "success",
                     message: response.Message,
-                    showProgress: "top",
+                    showProgress: "top"
                 });
 
                 _.delay(function() {
diff --git a/internal/app/server/component/page/home/modal.terms.templ b/internal/app/server/component/page/home/modal.terms.templ
index c2a9a6af..51bd7145 100644
--- a/internal/app/server/component/page/home/modal.terms.templ
+++ b/internal/app/server/component/page/home/modal.terms.templ
@@ -1,6 +1,8 @@
 package home
 
-var TermsModalTagId = "terms"
+const (
+	TermsModalTagId = "terms"
+)
 
 templ TermsModal() {
 	<div id={ TermsModalTagId } class="ui basic modal">
diff --git a/internal/app/server/component/page/home/page.home.templ b/internal/app/server/component/page/home/page.home.templ
index 8f97eeac..4ef76555 100644
--- a/internal/app/server/component/page/home/page.home.templ
+++ b/internal/app/server/component/page/home/page.home.templ
@@ -5,7 +5,7 @@ import (
 	"github.com/bastean/codexgo/v4/internal/app/server/component/scripts"
 )
 
-var (
+const (
 	RegisterTabTagId = "tab-register"
 	LoginTabTagId    = "tab-login"
 )
diff --git a/internal/app/server/component/scripts/fomantic/fomantic.templ b/internal/app/server/component/scripts/fomantic/fomantic.templ
index eb85d4c2..b8695489 100644
--- a/internal/app/server/component/scripts/fomantic/fomantic.templ
+++ b/internal/app/server/component/scripts/fomantic/fomantic.templ
@@ -1,11 +1,15 @@
 package fomantic
 
 script Init() {
+    user = {
+        "user_create" : "/v4/account",
+        "user_login"  : "/v4/account",
+        "user_update" : "/v4/account",
+        "user_delete" : "/v4/account",
+    };
+
     $.api.settings.api = {
-        "create user" : "/v4/account",
-        "login user" : "/v4/account",
-        "update user" : "/v4/account",
-        "delete user" : "/v4/account",
+        ...user,
     };
     
     $.api.settings.serializeForm = true;
diff --git a/internal/app/server/handler/health/check.go b/internal/app/server/handler/health/check.go
index cf062724..1285c678 100644
--- a/internal/app/server/handler/health/check.go
+++ b/internal/app/server/handler/health/check.go
@@ -6,8 +6,6 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Check() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.Status(http.StatusOK)
-	}
+func Check(c *gin.Context) {
+	c.Status(http.StatusOK)
 }
diff --git a/internal/app/server/handler/page/dashboard.go b/internal/app/server/handler/page/dashboard.go
index 28099bac..0983edea 100644
--- a/internal/app/server/handler/page/dashboard.go
+++ b/internal/app/server/handler/page/dashboard.go
@@ -9,30 +9,28 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Dashboard() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		id, exists := c.Get(key.UserId)
+func Dashboard(c *gin.Context) {
+	id, exists := c.Get(key.UserId)
 
-		if !exists {
-			errs.AbortErrWithRedirect(c, errs.MissingKey(key.UserId, "Dashboard"), "/")
-			return
-		}
+	if !exists {
+		errs.AbortErrWithRedirect(c, errs.MissingKey(key.UserId, "Dashboard"), "/")
+		return
+	}
 
-		query := new(user.ReadQuery)
+	query := new(user.ReadQuery)
 
-		query.Id = id.(string)
+	query.Id = id.(string)
 
-		found, err := user.Read.Handle(query)
+	found, err := user.Read.Handle(query)
 
-		if err != nil {
-			errs.AbortErrWithRedirect(c, errors.BubbleUp(err, "Dashboard"), "/")
-			return
-		}
+	if err != nil {
+		errs.AbortErrWithRedirect(c, errors.BubbleUp(err, "Dashboard"), "/")
+		return
+	}
 
-		err = dashboard.Page(found).Render(c.Request.Context(), c.Writer)
+	err = dashboard.Page(found).Render(c.Request.Context(), c.Writer)
 
-		if err != nil {
-			errs.AbortErr(c, errs.Render(err, "Dashboard"))
-		}
+	if err != nil {
+		errs.AbortErr(c, errs.Render(err, "Dashboard"))
 	}
 }
diff --git a/internal/app/server/handler/page/default.go b/internal/app/server/handler/page/default.go
deleted file mode 100644
index 208b2425..00000000
--- a/internal/app/server/handler/page/default.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package page
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-)
-
-func Default() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.Redirect(http.StatusFound, "/")
-	}
-}
diff --git a/internal/app/server/handler/page/home.go b/internal/app/server/handler/page/home.go
index 117566de..95e55045 100644
--- a/internal/app/server/handler/page/home.go
+++ b/internal/app/server/handler/page/home.go
@@ -6,10 +6,8 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Home() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		if err := home.Page().Render(c.Request.Context(), c.Writer); err != nil {
-			errs.AbortErr(c, errs.Render(err, "Home"))
-		}
+func Home(c *gin.Context) {
+	if err := home.Page().Render(c.Request.Context(), c.Writer); err != nil {
+		errs.AbortErr(c, errs.Render(err, "Home"))
 	}
 }
diff --git a/internal/app/server/handler/redirect/default.go b/internal/app/server/handler/redirect/default.go
new file mode 100644
index 00000000..706f1c24
--- /dev/null
+++ b/internal/app/server/handler/redirect/default.go
@@ -0,0 +1,11 @@
+package redirect
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+func Default(c *gin.Context) {
+	c.Redirect(http.StatusFound, "/")
+}
diff --git a/internal/app/server/handler/user/create.go b/internal/app/server/handler/user/create.go
index 1beee55f..6a2c37db 100644
--- a/internal/app/server/handler/user/create.go
+++ b/internal/app/server/handler/user/create.go
@@ -10,27 +10,25 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Create() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		command := new(user.CreateCommand)
+func Create(c *gin.Context) {
+	command := new(user.CreateCommand)
 
-		err := c.BindJSON(command)
+	err := c.BindJSON(command)
 
-		if err != nil {
-			errs.AbortErr(c, errs.BindingJSON(err, "Create"))
-			return
-		}
-
-		err = user.Create.Handle(command)
+	if err != nil {
+		errs.AbortErr(c, errs.BindingJSON(err, "Create"))
+		return
+	}
 
-		if err != nil {
-			errs.AbortErr(c, errors.BubbleUp(err, "Create"))
-			return
-		}
+	err = user.Create.Handle(command)
 
-		c.JSON(http.StatusCreated, &reply.JSON{
-			Success: true,
-			Message: "Account created",
-		})
+	if err != nil {
+		errs.AbortErr(c, errors.BubbleUp(err, "Create"))
+		return
 	}
+
+	c.JSON(http.StatusCreated, &reply.JSON{
+		Success: true,
+		Message: "Account created",
+	})
 }
diff --git a/internal/app/server/handler/user/delete.go b/internal/app/server/handler/user/delete.go
index c9d90c08..a157af14 100644
--- a/internal/app/server/handler/user/delete.go
+++ b/internal/app/server/handler/user/delete.go
@@ -12,52 +12,50 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Delete() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		id, exists := c.Get(key.UserId)
+func Delete(c *gin.Context) {
+	id, exists := c.Get(key.UserId)
 
-		if !exists {
-			errs.AbortErr(c, errs.MissingKey(key.UserId, "Delete"))
-			return
-		}
-
-		command := new(user.DeleteCommand)
+	if !exists {
+		errs.AbortErr(c, errs.MissingKey(key.UserId, "Delete"))
+		return
+	}
 
-		err := c.BindJSON(command)
+	command := new(user.DeleteCommand)
 
-		if err != nil {
-			errs.AbortErr(c, errs.BindingJSON(err, "Delete"))
-			return
-		}
+	err := c.BindJSON(command)
 
-		command.Id = id.(string)
+	if err != nil {
+		errs.AbortErr(c, errs.BindingJSON(err, "Delete"))
+		return
+	}
 
-		err = user.Delete.Handle(command)
+	command.Id = id.(string)
 
-		if err != nil {
-			errs.AbortErr(c, errors.BubbleUp(err, "Delete"))
-			return
-		}
+	err = user.Delete.Handle(command)
 
-		session := sessions.Default(c)
+	if err != nil {
+		errs.AbortErr(c, errors.BubbleUp(err, "Delete"))
+		return
+	}
 
-		session.Clear()
+	session := sessions.Default(c)
 
-		session.Options(sessions.Options{
-			Path:   "/",
-			MaxAge: -1,
-		})
+	session.Clear()
 
-		err = session.Save()
+	session.Options(sessions.Options{
+		Path:   "/",
+		MaxAge: -1,
+	})
 
-		if err != nil {
-			errs.AbortErr(c, errs.SessionSave(err, "Delete"))
-			return
-		}
+	err = session.Save()
 
-		c.JSON(http.StatusOK, &reply.JSON{
-			Success: true,
-			Message: "Account deleted",
-		})
+	if err != nil {
+		errs.AbortErr(c, errs.SessionSave(err, "Delete"))
+		return
 	}
+
+	c.JSON(http.StatusOK, &reply.JSON{
+		Success: true,
+		Message: "Account deleted",
+	})
 }
diff --git a/internal/app/server/handler/user/login.go b/internal/app/server/handler/user/login.go
index 79da1915..2541df7b 100644
--- a/internal/app/server/handler/user/login.go
+++ b/internal/app/server/handler/user/login.go
@@ -14,48 +14,46 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Login() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		query := new(user.LoginQuery)
+func Login(c *gin.Context) {
+	query := new(user.LoginQuery)
 
-		err := c.BindJSON(query)
+	err := c.BindJSON(query)
 
-		if err != nil {
-			errs.AbortErr(c, errs.BindingJSON(err, "Login"))
-			return
-		}
-
-		found, err := user.Login.Handle(query)
+	if err != nil {
+		errs.AbortErr(c, errs.BindingJSON(err, "Login"))
+		return
+	}
 
-		if err != nil {
-			errs.AbortErr(c, errors.BubbleUp(err, "Login"))
-			return
-		}
+	found, err := user.Login.Handle(query)
 
-		token, err := jwt.Generate(jwt.Payload{
-			key.Exp:    time.Now().Add((24 * time.Hour) * 7).Unix(),
-			key.UserId: found.Id,
-		})
+	if err != nil {
+		errs.AbortErr(c, errors.BubbleUp(err, "Login"))
+		return
+	}
 
-		if err != nil {
-			errs.AbortErr(c, errors.BubbleUp(err, "Login"))
-			return
-		}
+	token, err := jwt.Generate(jwt.Payload{
+		key.Exp:    time.Now().Add((24 * time.Hour) * 7).Unix(),
+		key.UserId: found.Id,
+	})
 
-		session := sessions.Default(c)
+	if err != nil {
+		errs.AbortErr(c, errors.BubbleUp(err, "Login"))
+		return
+	}
 
-		session.Set(key.Authorization, "Bearer "+token)
+	session := sessions.Default(c)
 
-		err = session.Save()
+	session.Set(key.Authorization, "Bearer "+token)
 
-		if err != nil {
-			errs.AbortErr(c, errs.SessionSave(err, "Login"))
-			return
-		}
+	err = session.Save()
 
-		c.JSON(http.StatusOK, &reply.JSON{
-			Success: true,
-			Message: "Logged in",
-		})
+	if err != nil {
+		errs.AbortErr(c, errs.SessionSave(err, "Login"))
+		return
 	}
+
+	c.JSON(http.StatusOK, &reply.JSON{
+		Success: true,
+		Message: "Logged in",
+	})
 }
diff --git a/internal/app/server/handler/user/update.go b/internal/app/server/handler/user/update.go
index a15770c2..8bf561b0 100644
--- a/internal/app/server/handler/user/update.go
+++ b/internal/app/server/handler/user/update.go
@@ -11,36 +11,34 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Update() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		id, exists := c.Get(key.UserId)
+func Update(c *gin.Context) {
+	id, exists := c.Get(key.UserId)
 
-		if !exists {
-			errs.AbortErr(c, errs.MissingKey(key.UserId, "Update"))
-			return
-		}
-
-		command := new(user.UpdateCommand)
+	if !exists {
+		errs.AbortErr(c, errs.MissingKey(key.UserId, "Update"))
+		return
+	}
 
-		err := c.BindJSON(command)
+	command := new(user.UpdateCommand)
 
-		if err != nil {
-			errs.AbortErr(c, errs.BindingJSON(err, "Update"))
-			return
-		}
+	err := c.BindJSON(command)
 
-		command.Id = id.(string)
+	if err != nil {
+		errs.AbortErr(c, errs.BindingJSON(err, "Update"))
+		return
+	}
 
-		err = user.Update.Handle(command)
+	command.Id = id.(string)
 
-		if err != nil {
-			errs.AbortErr(c, errors.BubbleUp(err, "Update"))
-			return
-		}
+	err = user.Update.Handle(command)
 
-		c.JSON(http.StatusOK, &reply.JSON{
-			Success: true,
-			Message: "Account updated",
-		})
+	if err != nil {
+		errs.AbortErr(c, errors.BubbleUp(err, "Update"))
+		return
 	}
+
+	c.JSON(http.StatusOK, &reply.JSON{
+		Success: true,
+		Message: "Account updated",
+	})
 }
diff --git a/internal/app/server/handler/user/verify.go b/internal/app/server/handler/user/verify.go
index debcae1d..f335c218 100644
--- a/internal/app/server/handler/user/verify.go
+++ b/internal/app/server/handler/user/verify.go
@@ -10,26 +10,24 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Verify() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		id := c.Param(key.Id)
+func Verify(c *gin.Context) {
+	id := c.Param(key.Id)
 
-		if id == "" {
-			errs.AbortErrWithRedirect(c, errs.MissingKey(key.Id, "Verify"), "/")
-			return
-		}
-
-		command := new(user.VerifyCommand)
+	if id == "" {
+		errs.AbortErrWithRedirect(c, errs.MissingKey(key.Id, "Verify"), "/")
+		return
+	}
 
-		command.Id = id
+	command := new(user.VerifyCommand)
 
-		err := user.Verify.Handle(command)
+	command.Id = id
 
-		if err != nil {
-			errs.AbortErr(c, errors.BubbleUp(err, "Verify"))
-			return
-		}
+	err := user.Verify.Handle(command)
 
-		c.Redirect(http.StatusFound, "/dashboard")
+	if err != nil {
+		errs.AbortErr(c, errors.BubbleUp(err, "Verify"))
+		return
 	}
+
+	c.Redirect(http.StatusFound, "/dashboard")
 }
diff --git a/internal/app/server/middleware/authentication.go b/internal/app/server/middleware/authentication.go
index da2fe30b..375e7067 100644
--- a/internal/app/server/middleware/authentication.go
+++ b/internal/app/server/middleware/authentication.go
@@ -11,31 +11,29 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Authentication() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		session := sessions.Default(c)
+func Authentication(c *gin.Context) {
+	session := sessions.Default(c)
 
-		token := session.Get(key.Authorization)
+	token := session.Get(key.Authorization)
 
-		if token == nil {
-			errs.AbortWithRedirect(c, "/")
-			return
-		}
+	if token == nil {
+		errs.AbortWithRedirect(c, "/")
+		return
+	}
 
-		signature := strings.Split(token.(string), " ")[1]
+	signature := strings.Split(token.(string), " ")[1]
 
-		claims, err := jwt.Validate(signature)
+	claims, err := jwt.Validate(signature)
 
-		if err != nil {
-			errs.AbortErrWithRedirect(c, errors.BubbleUp(err, "Authentication"), "/")
-			return
-		}
+	if err != nil {
+		errs.AbortErrWithRedirect(c, errors.BubbleUp(err, "Authentication"), "/")
+		return
+	}
 
-		if value, exists := claims[key.UserId]; exists {
-			c.Set(key.UserId, value)
-			c.Next()
-		} else {
-			errs.AbortErrWithRedirect(c, errs.MissingKey(key.UserId, "Authentication"), "/")
-		}
+	if value, exists := claims[key.UserId]; exists {
+		c.Set(key.UserId, value)
+		c.Next()
+	} else {
+		errs.AbortErrWithRedirect(c, errs.MissingKey(key.UserId, "Authentication"), "/")
 	}
 }
diff --git a/internal/app/server/middleware/cookie.go b/internal/app/server/middleware/cookie.go
index cc28e5ad..ca3203a4 100644
--- a/internal/app/server/middleware/cookie.go
+++ b/internal/app/server/middleware/cookie.go
@@ -4,10 +4,9 @@ import (
 	"github.com/bastean/codexgo/v4/internal/pkg/service/env"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
-	"github.com/gin-gonic/gin"
 )
 
-func CookieSession() gin.HandlerFunc {
-	store := cookie.NewStore([]byte(env.ServerGinCookieSecretKey))
-	return sessions.Sessions(env.ServerGinCookieSessionName, store)
-}
+var CookieSession = sessions.Sessions(
+	env.ServerGinCookieSessionName,
+	cookie.NewStore([]byte(env.ServerGinCookieSecretKey)),
+)
diff --git a/internal/app/server/middleware/error.go b/internal/app/server/middleware/error.go
index 435717c3..77c56811 100644
--- a/internal/app/server/middleware/error.go
+++ b/internal/app/server/middleware/error.go
@@ -9,34 +9,32 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func Error() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		c.Next()
+func ErrorHandler(c *gin.Context) {
+	c.Next()
 
-		var (
-			errInvalidValue *errors.ErrInvalidValue
-			errAlreadyExist *errors.ErrAlreadyExist
-			errNotExist     *errors.ErrNotExist
-			errFailure      *errors.ErrFailure
-			errInternal     *errors.ErrInternal
-		)
+	var (
+		errInvalidValue *errors.ErrInvalidValue
+		errAlreadyExist *errors.ErrAlreadyExist
+		errNotExist     *errors.ErrNotExist
+		errFailure      *errors.ErrFailure
+		errInternal     *errors.ErrInternal
+	)
 
-		for _, err := range c.Errors {
-			switch {
-			case errors.As(err, &errInvalidValue):
-				c.JSON(http.StatusUnprocessableEntity, &reply.JSON{Message: errInvalidValue.What, Data: errInvalidValue.Why})
-			case errors.As(err, &errAlreadyExist):
-				c.JSON(http.StatusConflict, &reply.JSON{Message: errAlreadyExist.What, Data: errAlreadyExist.Why})
-			case errors.As(err, &errNotExist):
-				c.JSON(http.StatusNotFound, &reply.JSON{Message: errNotExist.What, Data: errNotExist.Why})
-			case errors.As(err, &errFailure):
-				c.JSON(http.StatusBadRequest, &reply.JSON{Message: errFailure.What, Data: errFailure.Why})
-			case errors.As(err, &errInternal):
-				c.JSON(http.StatusInternalServerError, &reply.JSON{Message: "Server error. Try again later."})
-				fallthrough
-			default:
-				log.Error(err.Error())
-			}
+	for _, err := range c.Errors {
+		switch {
+		case errors.As(err, &errInvalidValue):
+			c.JSON(http.StatusUnprocessableEntity, &reply.JSON{Message: errInvalidValue.What, Data: errInvalidValue.Why})
+		case errors.As(err, &errAlreadyExist):
+			c.JSON(http.StatusConflict, &reply.JSON{Message: errAlreadyExist.What, Data: errAlreadyExist.Why})
+		case errors.As(err, &errNotExist):
+			c.JSON(http.StatusNotFound, &reply.JSON{Message: errNotExist.What, Data: errNotExist.Why})
+		case errors.As(err, &errFailure):
+			c.JSON(http.StatusBadRequest, &reply.JSON{Message: errFailure.What, Data: errFailure.Why})
+		case errors.As(err, &errInternal):
+			c.JSON(http.StatusInternalServerError, &reply.JSON{Message: "Server error. Try again later."})
+			fallthrough
+		case err != nil:
+			log.Error(err.Error())
 		}
 	}
 }
diff --git a/internal/app/server/middleware/header.go b/internal/app/server/middleware/header.go
index 28094cc2..57a7ad88 100644
--- a/internal/app/server/middleware/header.go
+++ b/internal/app/server/middleware/header.go
@@ -5,18 +5,15 @@ import (
 
 	"github.com/bastean/codexgo/v4/internal/pkg/service/env"
 	"github.com/gin-contrib/secure"
-	"github.com/gin-gonic/gin"
 )
 
-func Headers() gin.HandlerFunc {
-	return secure.New(secure.Config{
-		AllowedHosts:         strings.Split(env.ServerGinAllowedHosts, ", "),
-		STSSeconds:           315360000,
-		STSIncludeSubdomains: true,
-		FrameDeny:            true,
-		ContentTypeNosniff:   true,
-		BrowserXssFilter:     true,
-		IENoOpen:             true,
-		ReferrerPolicy:       "strict-origin-when-cross-origin",
-	})
-}
+var SecureHeaders = secure.New(secure.Config{
+	AllowedHosts:         strings.Split(env.ServerGinAllowedHosts, ", "),
+	STSSeconds:           315360000,
+	STSIncludeSubdomains: true,
+	FrameDeny:            true,
+	ContentTypeNosniff:   true,
+	BrowserXssFilter:     true,
+	IENoOpen:             true,
+	ReferrerPolicy:       "strict-origin-when-cross-origin",
+})
diff --git a/internal/app/server/middleware/limiter.go b/internal/app/server/middleware/limiter.go
index ba42343a..d67f4013 100644
--- a/internal/app/server/middleware/limiter.go
+++ b/internal/app/server/middleware/limiter.go
@@ -8,24 +8,19 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-func keyFunc(c *gin.Context) string {
-	return c.ClientIP()
-}
-
-func errorHandler(c *gin.Context, info ratelimit.Info) {
-	c.Status(http.StatusTooManyRequests)
-}
-
-func RateLimiter() gin.HandlerFunc {
-	store := ratelimit.InMemoryStore(&ratelimit.InMemoryOptions{
-		Rate:  time.Second,
-		Limit: 10,
-	})
-
-	limiter := ratelimit.RateLimiter(store, &ratelimit.Options{
-		ErrorHandler: errorHandler,
-		KeyFunc:      keyFunc,
-	})
-
-	return limiter
-}
+var RateLimiter = ratelimit.RateLimiter(
+	ratelimit.InMemoryStore(
+		&ratelimit.InMemoryOptions{
+			Rate:  time.Second,
+			Limit: 10,
+		},
+	),
+	&ratelimit.Options{
+		ErrorHandler: func(c *gin.Context, info ratelimit.Info) {
+			c.Status(http.StatusTooManyRequests)
+		},
+		KeyFunc: func(c *gin.Context) string {
+			return c.ClientIP()
+		},
+	},
+)
diff --git a/internal/app/server/router/api/api.go b/internal/app/server/router/api/api.go
index bc1359cb..a113c4f2 100644
--- a/internal/app/server/router/api/api.go
+++ b/internal/app/server/router/api/api.go
@@ -1,7 +1,6 @@
 package api
 
 import (
-	"github.com/bastean/codexgo/v4/internal/app/server/handler/health"
 	"github.com/bastean/codexgo/v4/internal/app/server/handler/user"
 	"github.com/bastean/codexgo/v4/internal/app/server/middleware"
 	"github.com/gin-gonic/gin"
@@ -16,28 +15,26 @@ func (api *API) Public() {
 
 	account := public.Group("/account")
 
-	account.PUT("/", user.Create())
-	account.POST("/", user.Login())
+	account.PUT("/", user.Create)
+	account.POST("/", user.Login)
 
-	account.GET("/verify/:id", user.Verify())
+	account.GET("/verify/:id", user.Verify)
 }
 
 func (api *API) Private() {
-	private := api.Group("/", middleware.Authentication())
+	private := api.Group("/", middleware.Authentication)
 
 	account := private.Group("/account")
 
-	account.PATCH("/", user.Update())
-	account.DELETE("/", user.Delete())
+	account.PATCH("/", user.Update)
+	account.DELETE("/", user.Delete)
 }
 
-func Use(router *gin.Engine) {
+func Use(group *gin.RouterGroup) {
 	api := &API{
-		RouterGroup: router.Group("/v4"),
+		RouterGroup: group,
 	}
 
-	router.HEAD("/health", health.Check())
-
 	api.Public()
 
 	api.Private()
diff --git a/internal/app/server/router/router.go b/internal/app/server/router/router.go
index e5d761f5..74edea6b 100644
--- a/internal/app/server/router/router.go
+++ b/internal/app/server/router/router.go
@@ -4,6 +4,8 @@ import (
 	"embed"
 	"net/http"
 
+	"github.com/bastean/codexgo/v4/internal/app/server/handler/health"
+	"github.com/bastean/codexgo/v4/internal/app/server/handler/redirect"
 	"github.com/bastean/codexgo/v4/internal/app/server/middleware"
 	"github.com/bastean/codexgo/v4/internal/app/server/router/api"
 	"github.com/bastean/codexgo/v4/internal/app/server/router/view"
@@ -22,13 +24,13 @@ func New(files *embed.FS) *gin.Engine {
 
 	Router.Use(gin.CustomRecovery(middleware.Recover))
 
-	Router.Use(middleware.Error())
+	Router.Use(middleware.ErrorHandler)
 
-	Router.Use(middleware.Headers())
+	Router.Use(middleware.SecureHeaders)
 
-	Router.Use(middleware.RateLimiter())
+	Router.Use(middleware.RateLimiter)
 
-	Router.Use(middleware.CookieSession())
+	Router.Use(middleware.CookieSession)
 
 	fs := http.FS(files)
 
@@ -36,9 +38,13 @@ func New(files *embed.FS) *gin.Engine {
 
 	Router.StaticFileFS("/robots.txt", "static/robots.txt", fs)
 
-	api.Use(Router)
+	api.Use(Router.Group("/v4"))
 
 	view.Use(Router)
 
+	Router.HEAD("/health", health.Check)
+
+	Router.NoRoute(redirect.Default)
+
 	return Router
 }
diff --git a/internal/app/server/router/view/view.go b/internal/app/server/router/view/view.go
index 69cf4b87..55f55472 100644
--- a/internal/app/server/router/view/view.go
+++ b/internal/app/server/router/view/view.go
@@ -15,15 +15,15 @@ func (view *View) Public() {
 
 	home := public.Group("/")
 
-	home.GET("/", page.Home())
+	home.GET("/", page.Home)
 }
 
 func (view *View) Private() {
-	private := view.Group("/", middleware.Authentication())
+	private := view.Group("/", middleware.Authentication)
 
 	dashboard := private.Group("/dashboard")
 
-	dashboard.GET("/", page.Dashboard())
+	dashboard.GET("/", page.Dashboard)
 }
 
 func Use(router *gin.Engine) {
@@ -31,8 +31,6 @@ func Use(router *gin.Engine) {
 		Engine: router,
 	}
 
-	router.NoRoute(page.Default())
-
 	view.Public()
 
 	view.Private()
diff --git a/internal/app/server/server.go b/internal/app/server/server.go
index 098cfd4f..817fdd5d 100644
--- a/internal/app/server/server.go
+++ b/internal/app/server/server.go
@@ -41,7 +41,7 @@ func Up() error {
 		log.Info(fmt.Sprintf("%s proxy listening on %s", Server.Gin, strings.Replace(env.ServerGinURL, env.ServerGinPort, proxy, 1)))
 	}
 
-	if err := App.ListenAndServe(); err != nil {
+	if err := App.ListenAndServe(); errors.IsNot(err, http.ErrServerClosed) {
 		log.CannotBeStarted(Server.Gin)
 		return errors.BubbleUp(err, "Up")
 	}
diff --git a/internal/pkg/service/errors/errors.go b/internal/pkg/service/errors/errors.go
index 11eabdd4..83a934ee 100644
--- a/internal/pkg/service/errors/errors.go
+++ b/internal/pkg/service/errors/errors.go
@@ -30,3 +30,7 @@ var (
 	As = errors.As
 	Is = errors.Is
 )
+
+func IsNot(err error, target error) bool {
+	return err != nil && !Is(err, target)
+}
diff --git a/internal/pkg/service/service.go b/internal/pkg/service/service.go
index 76eb5205..349ac55c 100644
--- a/internal/pkg/service/service.go
+++ b/internal/pkg/service/service.go
@@ -111,6 +111,7 @@ func Up() error {
 	)
 
 	if err != nil {
+		log.CannotBeStarted(Module.User)
 		return errors.BubbleUp(err, "Up")
 	}