upd(all): close request bodies

This commit is contained in:
Tit Petric
2018-09-02 21:33:39 +02:00
parent c0866c7d94
commit 4e4670ff40
8 changed files with 51 additions and 0 deletions
+2
View File
@@ -40,12 +40,14 @@ type Field struct {
func NewField(fh FieldAPI) *Field {
return &Field{
List: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewFieldList()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return fh.List(r.Context(), params)
})
},
Type: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewFieldType()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return fh.Type(r.Context(), params)
+10
View File
@@ -56,60 +56,70 @@ type Module struct {
func NewModule(mh ModuleAPI) *Module {
return &Module{
List: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleList()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.List(r.Context(), params)
})
},
Create: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleCreate()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Create(r.Context(), params)
})
},
Read: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleRead()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Read(r.Context(), params)
})
},
Edit: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleEdit()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Edit(r.Context(), params)
})
},
Delete: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleDelete()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Delete(r.Context(), params)
})
},
ContentList: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleContentList()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.ContentList(r.Context(), params)
})
},
ContentCreate: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleContentCreate()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.ContentCreate(r.Context(), params)
})
},
ContentRead: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleContentRead()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.ContentRead(r.Context(), params)
})
},
ContentEdit: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleContentEdit()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.ContentEdit(r.Context(), params)
})
},
ContentDelete: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewModuleContentDelete()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.ContentDelete(r.Context(), params)
+2
View File
@@ -40,12 +40,14 @@ type Auth struct {
func NewAuth(ah AuthAPI) *Auth {
return &Auth{
Login: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewAuthLogin()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ah.Login(r.Context(), params)
})
},
Create: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewAuthCreate()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ah.Create(r.Context(), params)
+9
View File
@@ -54,54 +54,63 @@ type Channel struct {
func NewChannel(ch ChannelAPI) *Channel {
return &Channel{
List: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelList()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.List(r.Context(), params)
})
},
Create: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelCreate()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Create(r.Context(), params)
})
},
Edit: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelEdit()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Edit(r.Context(), params)
})
},
Read: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelRead()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Read(r.Context(), params)
})
},
Delete: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelDelete()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Delete(r.Context(), params)
})
},
Members: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelMembers()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Members(r.Context(), params)
})
},
Join: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelJoin()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Join(r.Context(), params)
})
},
Part: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelPart()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Part(r.Context(), params)
})
},
Invite: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewChannelInvite()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return ch.Invite(r.Context(), params)
+12
View File
@@ -60,72 +60,84 @@ type Message struct {
func NewMessage(mh MessageAPI) *Message {
return &Message{
Create: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageCreate()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Create(r.Context(), params)
})
},
History: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageHistory()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.History(r.Context(), params)
})
},
Edit: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageEdit()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Edit(r.Context(), params)
})
},
Delete: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageDelete()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Delete(r.Context(), params)
})
},
Attach: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageAttach()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Attach(r.Context(), params)
})
},
Search: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageSearch()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Search(r.Context(), params)
})
},
Pin: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessagePin()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Pin(r.Context(), params)
})
},
Unpin: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageUnpin()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Unpin(r.Context(), params)
})
},
Flag: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageFlag()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Flag(r.Context(), params)
})
},
Unflag: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageUnflag()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Unflag(r.Context(), params)
})
},
React: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageReact()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.React(r.Context(), params)
})
},
Unreact: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewMessageUnreact()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return mh.Unreact(r.Context(), params)
+6
View File
@@ -48,36 +48,42 @@ type Organisation struct {
func NewOrganisation(oh OrganisationAPI) *Organisation {
return &Organisation{
List: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewOrganisationList()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return oh.List(r.Context(), params)
})
},
Create: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewOrganisationCreate()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return oh.Create(r.Context(), params)
})
},
Edit: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewOrganisationEdit()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return oh.Edit(r.Context(), params)
})
},
Remove: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewOrganisationRemove()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return oh.Remove(r.Context(), params)
})
},
Read: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewOrganisationRead()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return oh.Read(r.Context(), params)
})
},
Archive: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewOrganisationArchive()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return oh.Archive(r.Context(), params)
+8
View File
@@ -52,48 +52,56 @@ type Team struct {
func NewTeam(th TeamAPI) *Team {
return &Team{
List: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamList()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.List(r.Context(), params)
})
},
Create: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamCreate()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.Create(r.Context(), params)
})
},
Edit: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamEdit()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.Edit(r.Context(), params)
})
},
Read: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamRead()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.Read(r.Context(), params)
})
},
Remove: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamRemove()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.Remove(r.Context(), params)
})
},
Archive: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamArchive()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.Archive(r.Context(), params)
})
},
Move: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamMove()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.Move(r.Context(), params)
})
},
Merge: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewTeamMerge()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return th.Merge(r.Context(), params)
+2
View File
@@ -40,12 +40,14 @@ type User struct {
func NewUser(uh UserAPI) *User {
return &User{
Search: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewUserSearch()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return uh.Search(r.Context(), params)
})
},
Message: func(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
params := request.NewUserMessage()
resputil.JSON(w, params.Fill(r), func() (interface{}, error) {
return uh.Message(r.Context(), params)