OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-28 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity

NOISSUE - Rm content-type check from list endpoint (#1400)

Browse Source 
* NOISSUE - Rm content-type check from list endpoint

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>

* Fix decode func naming

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
This commit is contained in:
Manuel Imperiale 2021-03-30 11:32:28 +02:00 committed by GitHub
parent 4efd25eed5
commit 6770c19279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
auth/api/http/groups/transport.go
View File

@ -123,10 +123,6 @@ func MakeHandler(svc auth.Service, mux *bone.Mux, tracer opentracing.Tracer) *bo
} }
func decodeListGroupsRequest(_ context.Context, r *http.Request) (interface{}, error) { func decodeListGroupsRequest(_ context.Context, r *http.Request) (interface{}, error) {
if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
return nil, auth.ErrUnsupportedContentType
}
l, err := httputil.ReadUintQuery(r, levelKey, defLevel) l, err := httputil.ReadUintQuery(r, levelKey, defLevel)
if err != nil { if err != nil {
return nil, err return nil, err
@ -153,10 +149,6 @@ func decodeListGroupsRequest(_ context.Context, r *http.Request) (interface{}, e
} }
func decodeListMembersRequest(_ context.Context, r *http.Request) (interface{}, error) { func decodeListMembersRequest(_ context.Context, r *http.Request) (interface{}, error) {
if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
return nil, auth.ErrUnsupportedContentType
}
o, err := httputil.ReadUintQuery(r, offsetKey, defOffset) o, err := httputil.ReadUintQuery(r, offsetKey, defOffset)
if err != nil { if err != nil {
return nil, err return nil, err
@ -195,10 +187,6 @@ func decodeListMembersRequest(_ context.Context, r *http.Request) (interface{},
} }
func decodeListMembershipsRequest(_ context.Context, r *http.Request) (interface{}, error) { func decodeListMembershipsRequest(_ context.Context, r *http.Request) (interface{}, error) {
if !strings.Contains(r.Header.Get("Content-Type"), contentType) {
return nil, auth.ErrUnsupportedContentType
}
o, err := httputil.ReadUintQuery(r, offsetKey, defOffset) o, err := httputil.ReadUintQuery(r, offsetKey, defOffset)
if err != nil { if err != nil {
return nil, err return nil, err

6
things/api/things/http/transport.go
View File

@ -177,8 +177,8 @@ func MakeHandler(tracer opentracing.Tracer, svc things.Service) http.Handler {
)) ))
r.Get("/groups/:groupId", kithttp.NewServer( r.Get("/groups/:groupId", kithttp.NewServer(
kitot.TraceServer(tracer, "list_things")(listMembersEndpoint(svc)), kitot.TraceServer(tracer, "list_members")(listMembersEndpoint(svc)),
decodeListThingsGroupRequest, decodeListMembersRequest,
encodeResponse, encodeResponse,
opts..., opts...,
)) ))
@ -418,7 +418,7 @@ func decodeCreateConnections(_ context.Context, r *http.Request) (interface{}, e
return req, nil return req, nil
} }
func decodeListThingsGroupRequest(_ context.Context, r *http.Request) (interface{}, error) { func decodeListMembersRequest(_ context.Context, r *http.Request) (interface{}, error) {
o, err := httputil.ReadUintQuery(r, offsetKey, defOffset) o, err := httputil.ReadUintQuery(r, offsetKey, defOffset)
if err != nil { if err != nil {
return nil, err return nil, err

2
users/api/responses.go
View File

@ -109,7 +109,7 @@ func (res viewUserRes) Empty() bool {
type userPageRes struct { type userPageRes struct {
pageRes pageRes
Users []viewUserRes Users []viewUserRes `json:"users"`
} }
func (res userPageRes) Code() int { func (res userPageRes) Code() int {

4
users/api/transport.go
View File

@ -97,7 +97,7 @@ func MakeHandler(svc users.Service, tracer opentracing.Tracer) http.Handler {
mux.Get("/groups/:groupId", kithttp.NewServer( mux.Get("/groups/:groupId", kithttp.NewServer(
kitot.TraceServer(tracer, "list_members")(listMembersEndpoint(svc)), kitot.TraceServer(tracer, "list_members")(listMembersEndpoint(svc)),
decodeListMemberGroupRequest, decodeListMembersRequest,
encodeResponse, encodeResponse,
opts..., opts...,
)) ))
@ -230,7 +230,7 @@ func decodePasswordChange(_ context.Context, r *http.Request) (interface{}, erro
return req, nil return req, nil
} }
func decodeListMemberGroupRequest(_ context.Context, r *http.Request) (interface{}, error) { func decodeListMembersRequest(_ context.Context, r *http.Request) (interface{}, error) {
o, err := httputil.ReadUintQuery(r, offsetKey, defOffset) o, err := httputil.ReadUintQuery(r, offsetKey, defOffset)
if err != nil && err != errors.ErrNotFoundParam { if err != nil && err != errors.ErrNotFoundParam {
return nil, err return nil, err