From fdd2ecc7fcf0bc0bb2d94e55168c52078d7e0148 Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Mon, 3 Feb 2025 21:35:58 +1100 Subject: [PATCH] Upgraded to Fiber v3 --- handlers/auth.go | 21 +++++++------- handlers/ctx.go | 25 ++++++----------- handlers/index.go | 7 ++--- handlers/mimeselectors.go | 20 ++++++------- handlers/post.go | 59 ++++++++++++++++++++------------------- handlers/site.go | 44 ++++++++++++++--------------- main.go | 37 ++++++++++++------------ 7 files changed, 102 insertions(+), 111 deletions(-) diff --git a/handlers/auth.go b/handlers/auth.go index 64da6c1..1420282 100644 --- a/handlers/auth.go +++ b/handlers/auth.go @@ -3,31 +3,30 @@ package handlers import ( "encoding/json" "errors" - "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v3" "lmika.dev/lmika/hugo-cms/models" "lmika.dev/lmika/hugo-cms/services/users" - "net/http" ) type AuthHandler struct { UserService *users.Service } -func (h *AuthHandler) ShowLogin(c *fiber.Ctx) error { +func (h *AuthHandler) ShowLogin(c fiber.Ctx) error { return c.Render("auth/login", fiber.Map{}, "layouts/login") } -func (h *AuthHandler) Login(c *fiber.Ctx) error { +func (h *AuthHandler) Login(c fiber.Ctx) error { var req struct { Email string `form:"email"` Password string `form:"password"` } - if err := c.BodyParser(&req); err != nil { + if err := c.Bind().Body(&req); err != nil { return errors.New("invalid email or password") } - user, err := h.UserService.VerifyLogin(c.UserContext(), req.Email, req.Password) + user, err := h.UserService.VerifyLogin(c.Context(), req.Email, req.Password) if err != nil { return errors.New("invalid email or password") } @@ -41,20 +40,20 @@ func (h *AuthHandler) Login(c *fiber.Ctx) error { Name: models.AuthCookieName, Value: string(bts), }) - return c.Redirect("/", http.StatusFound) + return c.Redirect().To("/") } -func (h *AuthHandler) RequireAuth(c *fiber.Ctx) error { +func (h *AuthHandler) RequireAuth(c fiber.Ctx) error { user, err := h.readAuthCookie(c) if err != nil { - return c.Redirect("/auth/login", http.StatusFound) + return c.Redirect().To("/auth/login") } c.Locals("user", user) return c.Next() } -func (h *AuthHandler) readAuthCookie(c *fiber.Ctx) (user models.User, err error) { +func (h *AuthHandler) readAuthCookie(c fiber.Ctx) (user models.User, err error) { authData := c.Cookies(models.AuthCookieName) if authData == "" { return models.User{}, errors.New("no auth cookie") @@ -65,5 +64,5 @@ func (h *AuthHandler) readAuthCookie(c *fiber.Ctx) (user models.User, err error) return models.User{}, err } - return h.UserService.GetUserByID(c.UserContext(), ac.UserID) + return h.UserService.GetUserByID(c.Context(), ac.UserID) } diff --git a/handlers/ctx.go b/handlers/ctx.go index 9a18d63..260aca9 100644 --- a/handlers/ctx.go +++ b/handlers/ctx.go @@ -2,35 +2,26 @@ package handlers import ( "encoding/json" - "errors" - "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v3" "lmika.dev/lmika/hugo-cms/models" "log" ) -func GetUser(c *fiber.Ctx) models.User { - u, ok := c.Locals("user").(models.User) - if !ok { - panic(errors.New("user not found in context")) - } - return u +func GetUser(c fiber.Ctx) models.User { + return fiber.Locals[models.User](c, "user") } -func GetSite(c *fiber.Ctx) models.Site { - s, ok := c.Locals("site").(models.Site) - if !ok { - panic(errors.New("no site in context")) - } - return s +func GetSite(c fiber.Ctx) models.Site { + return fiber.Locals[models.Site](c, "site") } -func UpdatePrefCookie(c *fiber.Ctx, update func(prefs *models.PrefCookie)) { +func UpdatePrefCookie(c fiber.Ctx, update func(prefs *models.PrefCookie)) { cookie := GetPrefCookie(c) update(&cookie) setPrefCookie(c, cookie) } -func GetPrefCookie(c *fiber.Ctx) models.PrefCookie { +func GetPrefCookie(c fiber.Ctx) models.PrefCookie { prefCookieValue := c.Cookies(models.PrefCookieName) if prefCookieValue == "" { return models.PrefCookie{} @@ -45,7 +36,7 @@ func GetPrefCookie(c *fiber.Ctx) models.PrefCookie { return prefCookie } -func setPrefCookie(c *fiber.Ctx, prefCookie models.PrefCookie) { +func setPrefCookie(c fiber.Ctx, prefCookie models.PrefCookie) { if prefJson, err := json.Marshal(prefCookie); err == nil { c.Cookie(&fiber.Cookie{ Name: models.PrefCookieName, diff --git a/handlers/index.go b/handlers/index.go index dfd4aad..354614e 100644 --- a/handlers/index.go +++ b/handlers/index.go @@ -2,17 +2,16 @@ package handlers import ( "fmt" - "github.com/gofiber/fiber/v2" - "net/http" + "github.com/gofiber/fiber/v3" ) type IndexHandler struct { } -func (h IndexHandler) Index(c *fiber.Ctx) error { +func (h IndexHandler) Index(c fiber.Ctx) error { prefs := GetPrefCookie(c) if prefs.SiteID > 0 { - return c.Redirect(fmt.Sprintf("/sites/%v/posts", prefs.SiteID), http.StatusFound) + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", prefs.SiteID)) } return c.Render("index", fiber.Map{}, "layouts/main") diff --git a/handlers/mimeselectors.go b/handlers/mimeselectors.go index 6a47e8b..ac675ed 100644 --- a/handlers/mimeselectors.go +++ b/handlers/mimeselectors.go @@ -1,33 +1,33 @@ package handlers -import "github.com/gofiber/fiber/v2" +import "github.com/gofiber/fiber/v3" type mimeTypeHandler interface { - CanHandle(c *fiber.Ctx) bool - Handle(c *fiber.Ctx) error + CanHandle(c fiber.Ctx) bool + Handle(c fiber.Ctx) error } -type HTMX func(c *fiber.Ctx) error +type HTMX func(c fiber.Ctx) error -func (h HTMX) CanHandle(c *fiber.Ctx) bool { +func (h HTMX) CanHandle(c fiber.Ctx) bool { return c.Get("Hx-request") == "true" } -func (h HTMX) Handle(c *fiber.Ctx) error { +func (h HTMX) Handle(c fiber.Ctx) error { return h(c) } -type Otherwise func(c *fiber.Ctx) error +type Otherwise func(c fiber.Ctx) error -func (h Otherwise) CanHandle(c *fiber.Ctx) bool { +func (h Otherwise) CanHandle(c fiber.Ctx) bool { return true } -func (h Otherwise) Handle(c *fiber.Ctx) error { +func (h Otherwise) Handle(c fiber.Ctx) error { return h(c) } -func Select(c *fiber.Ctx, mimeTypes ...mimeTypeHandler) error { +func Select(c fiber.Ctx, mimeTypes ...mimeTypeHandler) error { for _, mt := range mimeTypes { if mt.CanHandle(c) { return mt.Handle(c) diff --git a/handlers/post.go b/handlers/post.go index cf5bff5..999f2ad 100644 --- a/handlers/post.go +++ b/handlers/post.go @@ -1,8 +1,9 @@ package handlers import ( + "errors" "fmt" - "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v3" "lmika.dev/lmika/hugo-cms/models" "lmika.dev/lmika/hugo-cms/services/posts" "net/http" @@ -12,10 +13,10 @@ type Post struct { Post *posts.Service } -func (h *Post) Posts(c *fiber.Ctx) error { +func (h *Post) Posts(c fiber.Ctx) error { site := GetSite(c) - posts, err := h.Post.ListPostOfSite(c.UserContext(), site) + posts, err := h.Post.ListPostOfSite(c.Context(), site) if err != nil { return err } @@ -25,24 +26,24 @@ func (h *Post) Posts(c *fiber.Ctx) error { }, "layouts/site") } -func (h *Post) New(c *fiber.Ctx) error { +func (h *Post) New(c fiber.Ctx) error { return c.Render("posts/new", fiber.Map{ "post": models.Post{}, }, "layouts/site") } -func (h *Post) Create(c *fiber.Ctx) error { +func (h *Post) Create(c fiber.Ctx) error { site := GetSite(c) var req struct { Title string `json:"title" form:"title"` Body string `json:"body" form:"body"` } - if err := c.BodyParser(&req); err != nil { + if err := c.Bind().Body(&req); err != nil { return err } - _, err := h.Post.Create(c.UserContext(), site, posts.NewPost{ + _, err := h.Post.Create(c.Context(), site, posts.NewPost{ Title: req.Title, Body: req.Body, }) @@ -50,18 +51,18 @@ func (h *Post) Create(c *fiber.Ctx) error { return err } - return c.Redirect(fmt.Sprintf("/sites/%v/posts", site.ID)) + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", site.ID)) } -func (h *Post) Edit(c *fiber.Ctx) error { +func (h *Post) Edit(c fiber.Ctx) error { site := GetSite(c) - postID, err := c.ParamsInt("postId") - if err != nil { - return err + postID := fiber.Params[int](c, "postId") + if postID == 0 { + return errors.New("postId is required") } - post, err := h.Post.GetPost(c.UserContext(), postID) + post, err := h.Post.GetPost(c.Context(), postID) if err != nil { return err } else if post.SiteID != site.ID { @@ -73,23 +74,23 @@ func (h *Post) Edit(c *fiber.Ctx) error { }, "layouts/site") } -func (h *Post) Update(c *fiber.Ctx) error { +func (h *Post) Update(c fiber.Ctx) error { site := GetSite(c) - postID, err := c.ParamsInt("postId") - if err != nil { - return err + postID := fiber.Params[int](c, "postId") + if postID == 0 { + return errors.New("postId is required") } var req struct { Title string `json:"title" form:"title"` Body string `json:"body" form:"body"` } - if err := c.BodyParser(&req); err != nil { + if err := c.Bind().Body(&req); err != nil { return err } - post, err := h.Post.GetPost(c.UserContext(), postID) + post, err := h.Post.GetPost(c.Context(), postID) if err != nil { return err } else if post.SiteID != site.ID { @@ -99,31 +100,31 @@ func (h *Post) Update(c *fiber.Ctx) error { post.Title = req.Title post.Body = req.Body - if err := h.Post.Save(c.UserContext(), site, &post); err != nil { + if err := h.Post.Save(c.Context(), site, &post); err != nil { return err } - return c.Redirect(fmt.Sprintf("/sites/%v/posts", site.ID)) + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", site.ID)) } -func (h *Post) Delete(c *fiber.Ctx) error { +func (h *Post) Delete(c fiber.Ctx) error { site := GetSite(c) - postID, err := c.ParamsInt("postId") - if err != nil { - return err + postID := fiber.Params[int](c, "postId") + if postID == 0 { + return errors.New("postId is required") } - if err := h.Post.DeletePost(c.UserContext(), site, postID); err != nil { + if err := h.Post.DeletePost(c.Context(), site, postID); err != nil { return err } return Select(c, - HTMX(func(c *fiber.Ctx) error { + HTMX(func(c fiber.Ctx) error { return c.Status(http.StatusOK).SendString("") }), - Otherwise(func(c *fiber.Ctx) error { - return c.Redirect(fmt.Sprintf("/sites/%v/posts", site.ID), http.StatusSeeOther) + Otherwise(func(c fiber.Ctx) error { + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", site.ID)) }), ) } diff --git a/handlers/site.go b/handlers/site.go index cc4ceee..422b4a4 100644 --- a/handlers/site.go +++ b/handlers/site.go @@ -3,7 +3,7 @@ package handlers import ( "errors" "fmt" - "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v3" "github.com/jackc/pgx/v5" "lmika.dev/lmika/hugo-cms/models" "lmika.dev/lmika/hugo-cms/services/sites" @@ -15,10 +15,10 @@ type Site struct { Site *sites.Service } -func (s *Site) Create(c *fiber.Ctx) error { +func (s *Site) Create(c fiber.Ctx) error { user := GetUser(c) - site, err := s.Site.CreateSite(c.UserContext(), user, "New Site "+time.Now().Format("2006-01-02 15:04:05")) + site, err := s.Site.CreateSite(c.Context(), user, "New Site "+time.Now().Format("2006-01-02 15:04:05")) if err != nil { return err } @@ -27,16 +27,16 @@ func (s *Site) Create(c *fiber.Ctx) error { prefs.SiteID = site.ID }) - return c.Redirect(fmt.Sprintf("/sites/%v/posts", site.ID)) + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", site.ID)) } -func (s *Site) Show(c *fiber.Ctx) error { - id, err := c.ParamsInt("siteId") - if err != nil { - return err +func (s *Site) Show(c fiber.Ctx) error { + id := fiber.Params[int](c, "siteId") + if id == 0 { + return errors.New("siteId is required") } - site, err := s.Site.GetSite(c.UserContext(), id) + site, err := s.Site.GetSite(c.Context(), id) if err != nil { return err } @@ -46,17 +46,17 @@ func (s *Site) Show(c *fiber.Ctx) error { }, "layouts/main") } -func (s *Site) Settings(c *fiber.Ctx) error { +func (s *Site) Settings(c fiber.Ctx) error { return c.Render("sites/settings", fiber.Map{ "themes": s.Site.Themes(), }, "layouts/site") } -func (s *Site) SaveSettings(c *fiber.Ctx) error { +func (s *Site) SaveSettings(c fiber.Ctx) error { site := GetSite(c) var req sites.NewSettings - if err := c.BodyParser(&req); err != nil { + if err := c.Bind().Body(&req); err != nil { return err } @@ -64,25 +64,25 @@ func (s *Site) SaveSettings(c *fiber.Ctx) error { return err } - return c.Redirect(fmt.Sprintf("/sites/%v/settings", site.ID)) + return c.Redirect().To(fmt.Sprintf("/sites/%v/settings", site.ID)) } -func (s *Site) Rebuild(c *fiber.Ctx) error { - if err := s.Site.Rebuild(c.UserContext(), GetSite(c)); err != nil { +func (s *Site) Rebuild(c fiber.Ctx) error { + if err := s.Site.Rebuild(c.Context(), GetSite(c)); err != nil { return err } - return c.Redirect(fmt.Sprintf("/sites/%v/posts", GetSite(c).ID)) + return c.Redirect().To(fmt.Sprintf("/sites/%v/posts", GetSite(c).ID)) } func (s *Site) WithSite() fiber.Handler { - return func(c *fiber.Ctx) (err error) { - id, err := c.ParamsInt("siteId") - if err != nil { - return err + return func(c fiber.Ctx) (err error) { + id := fiber.Params[int](c, "siteId") + if id == 0 { + return errors.New("siteId is required") } - site, err := s.Site.GetSite(c.UserContext(), id) + site, err := s.Site.GetSite(c.Context(), id) if err != nil { return err } @@ -94,7 +94,7 @@ func (s *Site) WithSite() fiber.Handler { c.Locals("site", site) - if prodTarget, err := s.Site.GetProdTargetOfSite(c.UserContext(), int(site.ID)); err == nil { + if prodTarget, err := s.Site.GetProdTargetOfSite(c.Context(), int(site.ID)); err == nil { c.Locals("prodTarget", prodTarget) } else if !errors.Is(err, pgx.ErrNoRows) { return err diff --git a/main.go b/main.go index 76cc66a..9fff438 100644 --- a/main.go +++ b/main.go @@ -5,9 +5,9 @@ import ( "context" "flag" "fmt" - "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/encryptcookie" - "github.com/gofiber/fiber/v2/middleware/filesystem" + "github.com/gofiber/fiber/v3" + "github.com/gofiber/fiber/v3/middleware/encryptcookie" + "github.com/gofiber/fiber/v3/middleware/static" "github.com/gofiber/template/html/v2" "github.com/yuin/goldmark" "html/template" @@ -36,7 +36,7 @@ func main() { flag.Parse() if *flagGenKey { - fmt.Println(encryptcookie.GenerateKey()) + fmt.Println(encryptcookie.GenerateKey(32)) return } @@ -100,7 +100,7 @@ func main() { if cfg.EncryptedCookieKey == "" { log.Println("No encrypt cookie key defined. Generating random key") - cfg.EncryptedCookieKey = encryptcookie.GenerateKey() + cfg.EncryptedCookieKey = encryptcookie.GenerateKey(32) } app := fiber.New(fiber.Config{ @@ -109,7 +109,9 @@ func main() { }) app.Use(encryptcookie.New(encryptcookie.Config{Key: cfg.EncryptedCookieKey})) - app.Use("/assets", filesystem.New(filesystem.Config{Root: http.FS(assets.FS)})) + app.Use("/assets", static.New("", static.Config{ + FS: assets.FS, + })) app.Get("/auth/login", authHandlers.ShowLogin) app.Post("/auth/login", authHandlers.Login) @@ -119,20 +121,19 @@ func main() { app.Post("/sites", siteHandlers.Create) app.Get("/sites/:siteId", siteHandlers.Show) - app.Route("/sites/:siteId", func(r fiber.Router) { - r.Use(siteHandlers.WithSite()) - r.Post("/rebuild", siteHandlers.Rebuild) + sr := app.Group("/sites/:siteId") + sr.Use(siteHandlers.WithSite()) + sr.Post("/rebuild", siteHandlers.Rebuild) - r.Get("/posts", postHandlers.Posts) - r.Get("/posts/new", postHandlers.New) - r.Post("/posts", postHandlers.Create) - r.Get("/posts/:postId", postHandlers.Edit) - r.Post("/posts/:postId", postHandlers.Update) - r.Delete("/posts/:postId", postHandlers.Delete) + sr.Get("/posts", postHandlers.Posts) + sr.Get("/posts/new", postHandlers.New) + sr.Post("/posts", postHandlers.Create) + sr.Get("/posts/:postId", postHandlers.Edit) + sr.Post("/posts/:postId", postHandlers.Update) + sr.Delete("/posts/:postId", postHandlers.Delete) - r.Get("/settings", siteHandlers.Settings) - r.Post("/settings", siteHandlers.SaveSettings) - }) + sr.Get("/settings", siteHandlers.Settings) + sr.Post("/settings", siteHandlers.SaveSettings) jobService.Start() defer jobService.Stop()