diff options
author | Gabriel A. Giovanini <mail@gabrielgio.me> | 2025-06-04 12:51:47 +0200 |
---|---|---|
committer | Gabriel A. Giovanini <mail@gabrielgio.me> | 2025-06-04 12:51:47 +0200 |
commit | 3739c9e14b0c65a59a520dbfefa459e43af3bf20 (patch) | |
tree | 3731016eb12180f12817ed1094eee8cb0f67b49b /pkg/handler | |
parent | 90b2a890096ee9ab3ff84c57542b5220aa9ebe4c (diff) | |
download | cerrado-3739c9e14b0c65a59a520dbfefa459e43af3bf20.tar.gz cerrado-3739c9e14b0c65a59a520dbfefa459e43af3bf20.tar.bz2 cerrado-3739c9e14b0c65a59a520dbfefa459e43af3bf20.zip |
feat: Wrap request
Since request is not a interface I need to create a wraper for it so I
can extend it later.
Diffstat (limited to 'pkg/handler')
-rw-r--r-- | pkg/handler/about/handler.go | 3 | ||||
-rw-r--r-- | pkg/handler/auth/login.go | 4 | ||||
-rw-r--r-- | pkg/handler/git/handler.go | 22 | ||||
-rw-r--r-- | pkg/handler/static/handler.go | 4 |
4 files changed, 17 insertions, 16 deletions
diff --git a/pkg/handler/about/handler.go b/pkg/handler/about/handler.go index ee084cd..b3a1593 100644 --- a/pkg/handler/about/handler.go +++ b/pkg/handler/about/handler.go @@ -9,6 +9,7 @@ import ( "github.com/gomarkdown/markdown/html" "github.com/gomarkdown/markdown/parser" + "git.gabrielgio.me/cerrado/pkg/ext" "git.gabrielgio.me/cerrado/templates" ) @@ -26,7 +27,7 @@ func NewAboutHandler(configRepo configurationRepository) *AboutHandler { return &AboutHandler{configRepo.GetRootReadme()} } -func (g *AboutHandler) About(w http.ResponseWriter, r *http.Request) error { +func (g *AboutHandler) About(w http.ResponseWriter, r *ext.Request) error { f, err := os.Open(g.readmePath) if err != nil { return err diff --git a/pkg/handler/auth/login.go b/pkg/handler/auth/login.go index 89fd87b..9cc13cc 100644 --- a/pkg/handler/auth/login.go +++ b/pkg/handler/auth/login.go @@ -26,7 +26,7 @@ func NewLoginHandler(auth authService) *LoginHandler { } } -func (g *LoginHandler) Logout(w http.ResponseWriter, r *http.Request) error { +func (g *LoginHandler) Logout(w http.ResponseWriter, r *ext.Request) error { cookie := &http.Cookie{ Name: "auth", Value: "", @@ -44,7 +44,7 @@ func (g *LoginHandler) Logout(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *LoginHandler) Login(w http.ResponseWriter, r *http.Request) error { +func (g *LoginHandler) Login(w http.ResponseWriter, r *ext.Request) error { referer := r.URL.Query().Get("referer") // if query value is empty tries to get from header diff --git a/pkg/handler/git/handler.go b/pkg/handler/git/handler.go index e409ed7..cb202a2 100644 --- a/pkg/handler/git/handler.go +++ b/pkg/handler/git/handler.go @@ -48,7 +48,7 @@ func NewGitHandler(gitService *service.GitService, confRepo configurationReposit } } -func (g *GitHandler) List(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) List(w http.ResponseWriter, r *ext.Request) error { // this is the only handler that needs to handle authentication itself. // everything else relay on name path parameter logged := ext.IsLoggedIn(r.Context()) @@ -90,7 +90,7 @@ func (g *GitHandler) List(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Archive(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Archive(w http.ResponseWriter, r *ext.Request) error { ext.SetGZip(w) name := r.PathValue("name") file := r.PathValue("file") @@ -116,7 +116,7 @@ func (g *GitHandler) Archive(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Multiplex(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Multiplex(w http.ResponseWriter, r *ext.Request) error { path := r.PathValue("rest") name := r.PathValue("name") @@ -160,7 +160,7 @@ func (g *GitHandler) Multiplex(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Summary(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Summary(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") ref, err := g.gitService.GetHead(name) @@ -200,7 +200,7 @@ func (g *GitHandler) Summary(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) About(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) About(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") ref, err := g.gitService.GetHead(name) @@ -244,7 +244,7 @@ func (g *GitHandler) About(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Refs(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Refs(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") @@ -275,7 +275,7 @@ func (g *GitHandler) Refs(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Tree(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Tree(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") ref := r.PathValue("ref") @@ -304,7 +304,7 @@ func (g *GitHandler) Tree(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Blob(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Blob(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") ref := r.PathValue("ref") @@ -372,7 +372,7 @@ func (g *GitHandler) Blob(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Log(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Log(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") ref := r.PathValue("ref") @@ -395,7 +395,7 @@ func (g *GitHandler) Log(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Ref(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Ref(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") ref := r.PathValue("ref") @@ -417,7 +417,7 @@ func (g *GitHandler) Ref(w http.ResponseWriter, r *http.Request) error { return nil } -func (g *GitHandler) Commit(w http.ResponseWriter, r *http.Request) error { +func (g *GitHandler) Commit(w http.ResponseWriter, r *ext.Request) error { ext.SetHTML(w) name := r.PathValue("name") ref := r.PathValue("ref") diff --git a/pkg/handler/static/handler.go b/pkg/handler/static/handler.go index 361f690..cdb2ae6 100644 --- a/pkg/handler/static/handler.go +++ b/pkg/handler/static/handler.go @@ -16,7 +16,7 @@ func ServeStaticHandler() (ext.ErrorRequestHandler, error) { return nil, err } - return func(w http.ResponseWriter, r *http.Request) error { + return func(w http.ResponseWriter, r *ext.Request) error { var ( f = r.PathValue("file") e = filepath.Ext(f) @@ -24,7 +24,7 @@ func ServeStaticHandler() (ext.ErrorRequestHandler, error) { ) ext.SetMIME(w, m) w.Header().Add("Cache-Control", "max-age=31536000") - http.ServeFileFS(w, r, staticFs, f) + http.ServeFileFS(w, r.Request, staticFs, f) return nil }, nil } |