From 6770c192794969ce0de7a4698362aa24ce4f0964 Mon Sep 17 00:00:00 2001 From: Manuel Imperiale Date: Tue, 30 Mar 2021 11:32:28 +0200 Subject: [PATCH] NOISSUE - Rm content-type check from list endpoint (#1400) * NOISSUE - Rm content-type check from list endpoint Signed-off-by: Manuel Imperiale * Fix decode func naming Signed-off-by: Manuel Imperiale --- auth/api/http/groups/transport.go | 12 ------------ things/api/things/http/transport.go | 6 +++--- users/api/responses.go | 2 +- users/api/transport.go | 4 ++-- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/auth/api/http/groups/transport.go b/auth/api/http/groups/transport.go index d5d67f44..beccc316 100644 --- a/auth/api/http/groups/transport.go +++ b/auth/api/http/groups/transport.go @@ -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) { - if !strings.Contains(r.Header.Get("Content-Type"), contentType) { - return nil, auth.ErrUnsupportedContentType - } - l, err := httputil.ReadUintQuery(r, levelKey, defLevel) if err != nil { 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) { - if !strings.Contains(r.Header.Get("Content-Type"), contentType) { - return nil, auth.ErrUnsupportedContentType - } - o, err := httputil.ReadUintQuery(r, offsetKey, defOffset) if err != nil { return nil, err @@ -195,10 +187,6 @@ func decodeListMembersRequest(_ context.Context, r *http.Request) (interface{}, } 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) if err != nil { return nil, err diff --git a/things/api/things/http/transport.go b/things/api/things/http/transport.go index 07fc4549..a9324408 100644 --- a/things/api/things/http/transport.go +++ b/things/api/things/http/transport.go @@ -177,8 +177,8 @@ func MakeHandler(tracer opentracing.Tracer, svc things.Service) http.Handler { )) r.Get("/groups/:groupId", kithttp.NewServer( - kitot.TraceServer(tracer, "list_things")(listMembersEndpoint(svc)), - decodeListThingsGroupRequest, + kitot.TraceServer(tracer, "list_members")(listMembersEndpoint(svc)), + decodeListMembersRequest, encodeResponse, opts..., )) @@ -418,7 +418,7 @@ func decodeCreateConnections(_ context.Context, r *http.Request) (interface{}, e 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) if err != nil { return nil, err diff --git a/users/api/responses.go b/users/api/responses.go index 739725df..90238680 100644 --- a/users/api/responses.go +++ b/users/api/responses.go @@ -109,7 +109,7 @@ func (res viewUserRes) Empty() bool { type userPageRes struct { pageRes - Users []viewUserRes + Users []viewUserRes `json:"users"` } func (res userPageRes) Code() int { diff --git a/users/api/transport.go b/users/api/transport.go index c3821052..3716f4a1 100644 --- a/users/api/transport.go +++ b/users/api/transport.go @@ -97,7 +97,7 @@ func MakeHandler(svc users.Service, tracer opentracing.Tracer) http.Handler { mux.Get("/groups/:groupId", kithttp.NewServer( kitot.TraceServer(tracer, "list_members")(listMembersEndpoint(svc)), - decodeListMemberGroupRequest, + decodeListMembersRequest, encodeResponse, opts..., )) @@ -230,7 +230,7 @@ func decodePasswordChange(_ context.Context, r *http.Request) (interface{}, erro 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) if err != nil && err != errors.ErrNotFoundParam { return nil, err