DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Parse JSON from request payload only when is set to

Browse Source
This commit is contained in:
Denis Arh
2018-09-03 07:14:53 +02:00
parent 33887f5859
commit 4f6bf888bb
9 changed files with 633 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
codegen/templates/http_request_inline.tpl
View File

@@ -9,6 +9,7 @@ import (
"github.com/go-chi/chi"
"github.com/pkg/errors"
"github.com/jmoiron/sqlx/types"
"strings"
)
var _ = chi.URLParam
@@ -30,12 +31,18 @@ func New{name|expose}{call.name|capitalize}() *{name|expose}{call.name|capitaliz
func ({self} *{name|expose}{call.name|capitalize}) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode({self})
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode({self})
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

37
crm/rest/request/field.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -37,12 +38,18 @@ func NewFieldList() *FieldList {
func (f *FieldList) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(f)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(f)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -73,12 +80,18 @@ func NewFieldType() *FieldType {
func (f *FieldType) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(f)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(f)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

181
crm/rest/request/module.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -38,12 +39,18 @@ func NewModuleList() *ModuleList {
func (m *ModuleList) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -80,12 +87,18 @@ func NewModuleCreate() *ModuleCreate {
func (m *ModuleCreate) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -127,12 +140,18 @@ func NewModuleRead() *ModuleRead {
func (m *ModuleRead) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -167,12 +186,18 @@ func NewModuleEdit() *ModuleEdit {
func (m *ModuleEdit) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -215,12 +240,18 @@ func NewModuleDelete() *ModuleDelete {
func (m *ModuleDelete) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -253,12 +284,18 @@ func NewModuleContentList() *ModuleContentList {
func (m *ModuleContentList) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -292,12 +329,18 @@ func NewModuleContentCreate() *ModuleContentCreate {
func (m *ModuleContentCreate) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -337,12 +380,18 @@ func NewModuleContentRead() *ModuleContentRead {
func (m *ModuleContentRead) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -378,12 +427,18 @@ func NewModuleContentEdit() *ModuleContentEdit {
func (m *ModuleContentEdit) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -424,12 +479,18 @@ func NewModuleContentDelete() *ModuleContentDelete {
func (m *ModuleContentDelete) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

37
sam/rest/request/auth.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -39,12 +40,18 @@ func NewAuthLogin() *AuthLogin {
func (a *AuthLogin) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(a)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(a)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -87,12 +94,18 @@ func NewAuthCreate() *AuthCreate {
func (a *AuthCreate) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(a)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(a)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

163
sam/rest/request/channel.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -38,12 +39,18 @@ func NewChannelList() *ChannelList {
func (c *ChannelList) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -80,12 +87,18 @@ func NewChannelCreate() *ChannelCreate {
func (c *ChannelCreate) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -129,12 +142,18 @@ func NewChannelEdit() *ChannelEdit {
func (c *ChannelEdit) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -183,12 +202,18 @@ func NewChannelRead() *ChannelRead {
func (c *ChannelRead) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -221,12 +246,18 @@ func NewChannelDelete() *ChannelDelete {
func (c *ChannelDelete) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -259,12 +290,18 @@ func NewChannelMembers() *ChannelMembers {
func (c *ChannelMembers) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -297,12 +334,18 @@ func NewChannelJoin() *ChannelJoin {
func (c *ChannelJoin) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -336,12 +379,18 @@ func NewChannelPart() *ChannelPart {
func (c *ChannelPart) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -376,12 +425,18 @@ func NewChannelInvite() *ChannelInvite {
func (c *ChannelInvite) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(c)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

217
sam/rest/request/message.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -39,12 +40,18 @@ func NewMessageCreate() *MessageCreate {
func (m *MessageCreate) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -82,12 +89,18 @@ func NewMessageHistory() *MessageHistory {
func (m *MessageHistory) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -126,12 +139,18 @@ func NewMessageEdit() *MessageEdit {
func (m *MessageEdit) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -170,12 +189,18 @@ func NewMessageDelete() *MessageDelete {
func (m *MessageDelete) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -209,12 +234,18 @@ func NewMessageAttach() *MessageAttach {
func (m *MessageAttach) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -249,12 +280,18 @@ func NewMessageSearch() *MessageSearch {
func (m *MessageSearch) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -296,12 +333,18 @@ func NewMessagePin() *MessagePin {
func (m *MessagePin) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -336,12 +379,18 @@ func NewMessageUnpin() *MessageUnpin {
func (m *MessageUnpin) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -376,12 +425,18 @@ func NewMessageFlag() *MessageFlag {
func (m *MessageFlag) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -416,12 +471,18 @@ func NewMessageUnflag() *MessageUnflag {
func (m *MessageUnflag) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -457,12 +518,18 @@ func NewMessageReact() *MessageReact {
func (m *MessageReact) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -499,12 +566,18 @@ func NewMessageUnreact() *MessageUnreact {
func (m *MessageUnreact) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(m)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

109
sam/rest/request/organisation.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -38,12 +39,18 @@ func NewOrganisationList() *OrganisationList {
func (o *OrganisationList) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -79,12 +86,18 @@ func NewOrganisationCreate() *OrganisationCreate {
func (o *OrganisationCreate) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -121,12 +134,18 @@ func NewOrganisationEdit() *OrganisationEdit {
func (o *OrganisationEdit) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -163,12 +182,18 @@ func NewOrganisationRemove() *OrganisationRemove {
func (o *OrganisationRemove) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -201,12 +226,18 @@ func NewOrganisationRead() *OrganisationRead {
func (o *OrganisationRead) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -242,12 +273,18 @@ func NewOrganisationArchive() *OrganisationArchive {
func (o *OrganisationArchive) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(o)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

145
sam/rest/request/team.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -38,12 +39,18 @@ func NewTeamList() *TeamList {
func (t *TeamList) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -80,12 +87,18 @@ func NewTeamCreate() *TeamCreate {
func (t *TeamCreate) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -123,12 +136,18 @@ func NewTeamEdit() *TeamEdit {
func (t *TeamEdit) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -165,12 +184,18 @@ func NewTeamRead() *TeamRead {
func (t *TeamRead) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -203,12 +228,18 @@ func NewTeamRemove() *TeamRemove {
func (t *TeamRemove) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -241,12 +272,18 @@ func NewTeamArchive() *TeamArchive {
func (t *TeamArchive) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -280,12 +317,18 @@ func NewTeamMove() *TeamMove {
func (t *TeamMove) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -323,12 +366,18 @@ func NewTeamMerge() *TeamMerge {
func (t *TeamMerge) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(t)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()

37
sam/rest/request/user.go
View File

@@ -22,6 +22,7 @@ import (
"github.com/pkg/errors"
"io"
"net/http"
"strings"
)
var _ = chi.URLParam
@@ -38,12 +39,18 @@ func NewUserSearch() *UserSearch {
func (u *UserSearch) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(u)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(u)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()
@@ -80,12 +87,18 @@ func NewUserMessage() *UserMessage {
func (u *UserMessage) Fill(r *http.Request) error {
var err error
err = json.NewDecoder(r.Body).Decode(u)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
if strings.ToLower(r.Header.Get("content-type")) == "application/json" {
err = json.NewDecoder(r.Body).Decode(u)
switch {
case err == io.EOF:
err = nil
case err != nil:
err = errors.Wrap(err, "error parsing http request body")
}
return err
}
r.ParseForm()