Skip to content

Commit

Permalink
fix: Fixing httputils usage
Browse files Browse the repository at this point in the history 
Signed-off-by: Vincent Boutour <[email protected]>
  • Loading branch information
@ViBiOh
ViBiOh committed Oct 24, 2021
1 parent 9c5f5e4 commit e2db70e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
4 changes: 0 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/ViBiOh/auth/v2 v2.11.16 h1:WQMFJQ0MV0wfWrl5Vzp6n9x/+6xKIDZIEL/5NAkYUMo=
github.com/ViBiOh/auth/v2 v2.11.16/go.mod h1:yJYxlSM+kExx/6lFt8tvWLVa0UEL8itqoN4H8XW0DZo=
github.com/ViBiOh/httputils/v4 v4.27.0/go.mod h1:/3tDDPDH7DyT/Fd9ulT/F46Cbcawc+TLs6e54sDewrg=
github.com/ViBiOh/httputils/v4 v4.27.1 h1:A1fcp/Brv7y0OzF2xDid9vdPGSOo9tLqVjb3GG7Q66U=
github.com/ViBiOh/httputils/v4 v4.27.1/go.mod h1:r4OWjqIH9F9UG0irKIeNSHMWtdk/AzlXpnMHtpKQ7yo=
github.com/ViBiOh/mailer v1.26.4 h1:KIdb4KXly9SP7Mkg6Jl8Na9vhR5fLiWA2P/LxWFP9yw=
Expand Down Expand Up @@ -156,7 +155,6 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
Expand All @@ -177,7 +175,6 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
Expand Down Expand Up @@ -272,7 +269,6 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
Expand Down
24 changes: 12 additions & 12 deletions pkg/ketchup/ketchups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
func (a App) ketchups() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
a.rendererApp.Error(w, httpModel.WrapMethodNotAllowed(fmt.Errorf("invalid method %s", r.Method)))
a.rendererApp.Error(w, r, httpModel.WrapMethodNotAllowed(fmt.Errorf("invalid method %s", r.Method)))
return
}

if err := r.ParseForm(); err != nil {
a.rendererApp.Error(w, httpModel.WrapInvalid(err))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(err))
return
}

Expand All @@ -33,21 +33,21 @@ func (a App) ketchups() http.Handler {
case http.MethodDelete:
a.handleDelete(w, r)
default:
a.rendererApp.Error(w, httpModel.WrapInvalid(fmt.Errorf("invalid method %s", method)))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(fmt.Errorf("invalid method %s", method)))
}
})
}

func (a App) handleCreate(w http.ResponseWriter, r *http.Request) {
repositoryKind, err := model.ParseRepositoryKind(r.FormValue("kind"))
if err != nil {
a.rendererApp.Error(w, httpModel.WrapInvalid(err))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(err))
return
}

ketchupFrequency, err := model.ParseKetchupFrequency(r.FormValue("frequency"))
if err != nil {
a.rendererApp.Error(w, httpModel.WrapInvalid(err))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(err))
return
}

Expand All @@ -69,7 +69,7 @@ func (a App) handleCreate(w http.ResponseWriter, r *http.Request) {

created, err := a.ketchupService.Create(r.Context(), item)
if err != nil {
a.rendererApp.Error(w, err)
a.rendererApp.Error(w, r, err)
return
}

Expand All @@ -80,7 +80,7 @@ func (a App) handleUpdate(w http.ResponseWriter, r *http.Request) {
rawID := strings.Trim(r.URL.Path, "/")
if rawID == "all" {
if err := a.ketchupService.UpdateAll(r.Context()); err != nil {
a.rendererApp.Error(w, err)
a.rendererApp.Error(w, r, err)
} else {
a.rendererApp.Redirect(w, r, fmt.Sprintf("%s/", appPath), renderer.NewSuccessMessage("All ketchups are up-to-date!"))
}
Expand All @@ -90,13 +90,13 @@ func (a App) handleUpdate(w http.ResponseWriter, r *http.Request) {

id, err := strconv.ParseUint(strings.Trim(r.URL.Path, "/"), 10, 64)
if err != nil {
a.rendererApp.Error(w, httpModel.WrapInvalid(err))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(err))
return
}

ketchupFrequency, err := model.ParseKetchupFrequency(r.FormValue("frequency"))
if err != nil {
a.rendererApp.Error(w, httpModel.WrapInvalid(err))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(err))
return
}

Expand All @@ -106,7 +106,7 @@ func (a App) handleUpdate(w http.ResponseWriter, r *http.Request) {

updated, err := a.ketchupService.Update(r.Context(), r.FormValue("old-pattern"), item)
if err != nil {
a.rendererApp.Error(w, err)
a.rendererApp.Error(w, r, err)
return
}

Expand All @@ -116,14 +116,14 @@ func (a App) handleUpdate(w http.ResponseWriter, r *http.Request) {
func (a App) handleDelete(w http.ResponseWriter, r *http.Request) {
id, err := strconv.ParseUint(strings.Trim(r.URL.Path, "/"), 10, 64)
if err != nil {
a.rendererApp.Error(w, httpModel.WrapInvalid(err))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(err))
return
}

item := model.NewKetchup(r.FormValue("pattern"), "", model.Daily, false, model.NewGithubRepository(id, "")).WithID()

if err := a.ketchupService.Delete(r.Context(), item); err != nil {
a.rendererApp.Error(w, err)
a.rendererApp.Error(w, r, err)
return
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/ketchup/signup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ import (
func (a App) Signup() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost {
a.rendererApp.Error(w, httpModel.WrapMethodNotAllowed(fmt.Errorf("invalid method %s", r.Method)))
a.rendererApp.Error(w, r, httpModel.WrapMethodNotAllowed(fmt.Errorf("invalid method %s", r.Method)))
return
}

if err := r.ParseForm(); err != nil {
a.rendererApp.Error(w, httpModel.WrapInvalid(err))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(err))
return
}

token := r.FormValue("token")
if !a.validateToken(r.Context(), token, r.FormValue("answer")) {
a.rendererApp.Error(w, httpModel.WrapInvalid(errors.New("unable to validate security question")))
a.rendererApp.Error(w, r, httpModel.WrapInvalid(errors.New("unable to validate security question")))
return
}

Expand All @@ -37,7 +37,7 @@ func (a App) Signup() http.Handler {
})

if _, err := a.userService.Create(r.Context(), user); err != nil {
a.rendererApp.Error(w, err)
a.rendererApp.Error(w, r, err)
return
}

Expand Down

0 comments on commit e2db70e

Please sign in to comment.