From 5168a9476f0e83264ecafc85bc9145e8bdcbb8dc Mon Sep 17 00:00:00 2001 From: Gabriel Arakaki Giovanini Date: Sat, 5 Aug 2023 19:26:29 +0200 Subject: ref: Move net/http I was young and naive, fasthttp does not fit my needs and make development slower. I'll move to net/http since it has a wider support and will spare some time on implementation detail things (like CSRF). It will allow me to reduce a bit of the code since there may be lib for handling cookie encryption and auth in general. --- pkg/view/settings.go | 57 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'pkg/view/settings.go') diff --git a/pkg/view/settings.go b/pkg/view/settings.go index 5131362..bf2dca6 100644 --- a/pkg/view/settings.go +++ b/pkg/view/settings.go @@ -1,10 +1,9 @@ package view import ( + "net/http" "strconv" - "github.com/valyala/fasthttp" - "git.sr.ht/~gabrielgio/img/pkg/database/repository" "git.sr.ht/~gabrielgio/img/pkg/ext" "git.sr.ht/~gabrielgio/img/pkg/service" @@ -29,18 +28,18 @@ func NewSettingsView( } } -func (self *SettingsView) Index(ctx *fasthttp.RequestCtx) error { - s, err := self.settingsRepository.Load(ctx) +func (self *SettingsView) Index(w http.ResponseWriter, r *http.Request) error { + s, err := self.settingsRepository.Load(r.Context()) if err != nil { return err } - users, err := self.userController.List(ctx) + users, err := self.userController.List(r.Context()) if err != nil { return err } - templates.WritePageTemplate(ctx, &templates.SettingsPage{ + templates.WritePageTemplate(w, &templates.SettingsPage{ Settings: s, Users: users, }) @@ -48,22 +47,22 @@ func (self *SettingsView) Index(ctx *fasthttp.RequestCtx) error { return nil } -func (self *SettingsView) User(ctx *fasthttp.RequestCtx) error { - id := string(ctx.FormValue("userId")) +func (self *SettingsView) User(w http.ResponseWriter, r *http.Request) error { + id := r.FormValue("userId") idValue, err := ParseUint(id) if err != nil { return err } if idValue == nil { - templates.WritePageTemplate(ctx, &templates.UserPage{}) + templates.WritePageTemplate(w, &templates.UserPage{}) } else { - user, err := self.userController.Get(ctx, *idValue) + user, err := self.userController.Get(r.Context(), *idValue) if err != nil { return err } - templates.WritePageTemplate(ctx, &templates.UserPage{ + templates.WritePageTemplate(w, &templates.UserPage{ ID: idValue, Username: user.Username, Path: user.Path, @@ -74,13 +73,13 @@ func (self *SettingsView) User(ctx *fasthttp.RequestCtx) error { return nil } -func (self *SettingsView) UpsertUser(ctx *fasthttp.RequestCtx) error { +func (self *SettingsView) UpsertUser(w http.ResponseWriter, r *http.Request) error { var ( - username = string(ctx.FormValue("username")) - password = ctx.FormValue("password") - path = string(ctx.FormValue("path")) - isAdmin = string(ctx.FormValue("isAdmin")) == "on" - id = string(ctx.FormValue("userId")) + username = r.FormValue("username") + password = []byte(r.FormValue("password")) + path = r.FormValue("path") + isAdmin = r.FormValue("isAdmin") == "on" + id = r.FormValue("userId") ) idValue, err := ParseUint(id) @@ -88,18 +87,18 @@ func (self *SettingsView) UpsertUser(ctx *fasthttp.RequestCtx) error { return err } - err = self.userController.Upsert(ctx, idValue, username, "", password, isAdmin, path) + err = self.userController.Upsert(r.Context(), idValue, username, "", password, isAdmin, path) if err != nil { return err } - ctx.Redirect("/settings", 307) + http.Redirect(w, r, "/settings", http.StatusTemporaryRedirect) return nil } -func (self *SettingsView) Delete(ctx *fasthttp.RequestCtx) error { +func (self *SettingsView) Delete(w http.ResponseWriter, r *http.Request) error { var ( - id = string(ctx.FormValue("userId")) + id = r.FormValue("userId") ) idValue, err := ParseUint(id) @@ -108,24 +107,24 @@ func (self *SettingsView) Delete(ctx *fasthttp.RequestCtx) error { } if idValue != nil { - err = self.userController.Delete(ctx, *idValue) + err = self.userController.Delete(r.Context(), *idValue) if err != nil { return err } } - ctx.Redirect("/settings", 307) + http.Redirect(w, r, "/settings", http.StatusTemporaryRedirect) return nil } -func (self *SettingsView) Save(ctx *fasthttp.RequestCtx) error { +func (self *SettingsView) Save(w http.ResponseWriter, r *http.Request) error { var ( - showMode = string(ctx.FormValue("showMode")) == "on" - showOwner = string(ctx.FormValue("showOwner")) == "on" - preloadVideoMetadata = string(ctx.FormValue("preloadVideoMetadata")) == "on" + showMode = r.FormValue("showMode") == "on" + showOwner = r.FormValue("showOwner") == "on" + preloadVideoMetadata = r.FormValue("preloadVideoMetadata") == "on" ) - err := self.settingsRepository.Save(ctx, &repository.Settings{ + err := self.settingsRepository.Save(r.Context(), &repository.Settings{ ShowMode: showMode, ShowOwner: showOwner, PreloadVideoMetadata: preloadVideoMetadata, @@ -134,7 +133,7 @@ func (self *SettingsView) Save(ctx *fasthttp.RequestCtx) error { return err } - return self.Index(ctx) + return self.Index(w, r) } func (self *SettingsView) SetMyselfIn(r *ext.Router) { -- cgit v1.2.3