refactor: add middleware folder

Author: ItsNotGoodName

web/controllers/auth.go

@@ -8,12 +8,6 @@ import (
 	"github.com/gofiber/fiber/v2/middleware/session"
 )
 
-func loginData(flash string) fiber.Map {
-	return fiber.Map{
-		"Flash": flash,
-	}
-}
-
 func Login(c *fiber.Ctx, cc core.Context) error {
 	return h.Render(c, "login", fiber.Map{})
 }
@@ -60,51 +54,8 @@ func Logout(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	return h.Redirect(c, "/login")
 }
 
-func UserRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
-	if procs.AuthHTTPAnonymous(cc) {
-		return NotFound(c)
-	}
-
-	return authRequire(c, cc, store)
-}
-
-func AuthRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
-	if procs.AuthHTTPAnonymous(cc) {
-		c.Locals(h.AnonymousContextKey, true)
-		return c.Next()
-	}
-
-	return authRequire(c, cc, store)
-}
-
-func authRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
-	sess, err := store.Get(c)
-	if err != nil {
-		panic(err)
-	}
-
-	auth := sess.Get("auth")
-	if auth == nil {
-		return h.Redirect(c, "/login")
-	}
-
-	return c.Next()
-}
-
-func AuthRestrict(c *fiber.Ctx, cc core.Context, store *session.Store) error {
-	if procs.AuthHTTPAnonymous(cc) {
-		return h.Redirect(c, "/")
-	}
-
-	sess, err := store.Get(c)
-	if err != nil {
-		return h.Error(c, err)
-	}
-
-	auth := sess.Get("auth")
-	if auth != nil {
-		return h.Redirect(c, "/")
+func loginData(flash string) fiber.Map {
+	return fiber.Map{
+		"Flash": flash,
 	}
-
-	return c.Next()
 }

web/controllers/controllers.go

@@ -117,7 +117,3 @@ func Trim(c *fiber.Ctx, cc core.Context) error {
 func SomethingWentWrong(c *fiber.Ctx) error {
 	return h.Render(c, "something-went-wrong", fiber.Map{"Error": ""})
 }
-
-func NotFound(c *fiber.Ctx) error {
-	return h.Render(c.Status(404), "404", fiber.Map{})
-}

web/helpers/http.go

@@ -29,6 +29,10 @@ func Error(c *fiber.Ctx, err error, codes ...int) error {
 	return Render(c, "something-went-wrong", fiber.Map{"Error": err})
 }
 
+func NotFound(c *fiber.Ctx) error {
+	return Render(c.Status(404), "404", fiber.Map{})
+}
+
 type Meta struct {
 	Anonymous bool
 	CSRF      string

web/http/http.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
 	"github.com/ItsNotGoodName/smtpbridge/web"
-	"github.com/ItsNotGoodName/smtpbridge/web/controllers"
 	h "github.com/ItsNotGoodName/smtpbridge/web/helpers"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/csrf"
@@ -56,7 +55,7 @@ func New(app core.App, shutdown context.CancelFunc, address string, bodyLimit in
 	)
 
 	web.UseAssets(http)
-	http.Use(controllers.NotFound)
+	http.Use(h.NotFound)
 
 	return HTTP{
 		http:     http,

web/http/routes.go

@@ -4,14 +4,15 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/internal/core"
 	"github.com/ItsNotGoodName/smtpbridge/web/controllers"
 	"github.com/ItsNotGoodName/smtpbridge/web/inject"
+	"github.com/ItsNotGoodName/smtpbridge/web/middleware"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/session"
 )
 
 func route(app core.App, store *session.Store, http fiber.Router) {
-	userRequire := inject.AppStore(app, store, controllers.UserRequire)
-	authRequire := inject.AppStore(app, store, controllers.AuthRequire)
-	authSkip := inject.AppStore(app, store, controllers.AuthRestrict)
+	userRequire := inject.AppStore(app, store, middleware.UserRequire)
+	authRequire := inject.AppStore(app, store, middleware.AuthRequire)
+	authSkip := inject.AppStore(app, store, middleware.AuthRestrict)
 
 	http.Get("/login", authSkip, inject.App(app, controllers.Login))
 	http.Post("/login", authSkip, inject.AppStore(app, store, controllers.LoginPost))

web/middleware/auth.go

@@ -0,0 +1,58 @@
+package middleware
+
+import (
+	"github.com/ItsNotGoodName/smtpbridge/internal/core"
+	"github.com/ItsNotGoodName/smtpbridge/internal/procs"
+	h "github.com/ItsNotGoodName/smtpbridge/web/helpers"
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/session"
+)
+
+func UserRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+	if procs.AuthHTTPAnonymous(cc) {
+		return h.NotFound(c)
+	}
+
+	return authRequire(c, cc, store)
+}
+
+func AuthRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+	if procs.AuthHTTPAnonymous(cc) {
+		c.Locals(h.AnonymousContextKey, true)
+		return c.Next()
+	}
+
+	return authRequire(c, cc, store)
+}
+
+func authRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+	sess, err := store.Get(c)
+	if err != nil {
+		panic(err)
+	}
+
+	auth := sess.Get("auth")
+	if auth == nil {
+		return h.Redirect(c, "/login")
+	}
+
+	return c.Next()
+}
+
+func AuthRestrict(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+	if procs.AuthHTTPAnonymous(cc) {
+		return h.Redirect(c, "/")
+	}
+
+	sess, err := store.Get(c)
+	if err != nil {
+		return h.Error(c, err)
+	}
+
+	auth := sess.Get("auth")
+	if auth != nil {
+		return h.Redirect(c, "/")
+	}
+
+	return c.Next()
+}