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

NOISSUE - Rm users http package (#1256)

Browse Source 
* NOISSUE - Mv users http gokit layers to http package

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

* Remove users/api/http dir

Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
This commit is contained in:
Manuel Imperiale 2020-10-16 18:00:24 +02:00 committed by GitHub
parent 86fe3f7cdb
commit 420b598ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/users/main.go
View File

@ -330,9 +330,9 @@ func startHTTPServer(tracer opentracing.Tracer, svc users.Service, port string,
p := fmt.Sprintf(":%s", port) p := fmt.Sprintf(":%s", port)
if certFile != "" || keyFile != "" { if certFile != "" || keyFile != "" {
logger.Info(fmt.Sprintf("Users service started using https, cert %s key %s, exposed port %s", certFile, keyFile, port)) logger.Info(fmt.Sprintf("Users service started using https, cert %s key %s, exposed port %s", certFile, keyFile, port))
errs <- http.ListenAndServeTLS(p, certFile, keyFile, api.MakeHandler(svc, tracer, logger)) errs <- http.ListenAndServeTLS(p, certFile, keyFile, api.MakeHandler(svc, tracer))
} else { } else {
logger.Info(fmt.Sprintf("Users service started using http, exposed port %s", port)) logger.Info(fmt.Sprintf("Users service started using http, exposed port %s", port))
errs <- http.ListenAndServe(p, api.MakeHandler(svc, tracer, logger)) errs <- http.ListenAndServe(p, api.MakeHandler(svc, tracer))
} }
} }

5
pkg/sdk/go/users_test.go
View File

@ -8,11 +8,9 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"testing" "testing"
"github.com/mainflux/mainflux" "github.com/mainflux/mainflux"
log "github.com/mainflux/mainflux/logger"
sdk "github.com/mainflux/mainflux/pkg/sdk/go" sdk "github.com/mainflux/mainflux/pkg/sdk/go"
"github.com/mainflux/mainflux/users" "github.com/mainflux/mainflux/users"
"github.com/mainflux/mainflux/users/api" "github.com/mainflux/mainflux/users/api"
@ -36,8 +34,7 @@ func newUserService() users.Service {
} }
func newUserServer(svc users.Service) *httptest.Server { func newUserServer(svc users.Service) *httptest.Server {
logger, _ := log.New(os.Stdout, log.Info.String()) mux := api.MakeHandler(svc, mocktracer.New())
mux := api.MakeHandler(svc, mocktracer.New(), logger)
return httptest.NewServer(mux) return httptest.NewServer(mux)
} }

8
users/api/endpoint.go
View File

@ -24,7 +24,7 @@ func registrationEndpoint(svc users.Service) endpoint.Endpoint {
ID: uid, ID: uid,
created: true, created: true,
} }
logger.Info("User successfully registered")
return ucr, nil return ucr, nil
} }
} }
@ -51,7 +51,7 @@ func passwordResetRequestEndpoint(svc users.Service) endpoint.Endpoint {
return nil, err return nil, err
} }
res.Msg = MailSent res.Msg = MailSent
logger.Info("User made a password reset request")
return res, nil return res, nil
} }
} }
@ -134,7 +134,7 @@ func loginEndpoint(svc users.Service) endpoint.Endpoint {
if err != nil { if err != nil {
return nil, err return nil, err
} }
logger.Info("User logged in")
return tokenRes{token}, nil return tokenRes{token}, nil
} }
} }
@ -163,7 +163,7 @@ func createGroupEndpoint(svc users.Service) endpoint.Endpoint {
ParentID: saved.ParentID, ParentID: saved.ParentID,
created: true, created: true,
} }
logger.Info("Group: " + res.Name + " is created")
return res, nil return res, nil
} }
} }

5
users/api/endpoint_test.go
View File

@ -11,12 +11,10 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"os"
"strings" "strings"
"testing" "testing"
"github.com/mainflux/mainflux" "github.com/mainflux/mainflux"
log "github.com/mainflux/mainflux/logger"
"github.com/mainflux/mainflux/users" "github.com/mainflux/mainflux/users"
"github.com/mainflux/mainflux/users/api" "github.com/mainflux/mainflux/users/api"
"github.com/mainflux/mainflux/users/bcrypt" "github.com/mainflux/mainflux/users/bcrypt"
@ -77,8 +75,7 @@ func newService() users.Service {
} }
func newServer(svc users.Service) *httptest.Server { func newServer(svc users.Service) *httptest.Server {
logger, _ := log.New(os.Stdout, log.Info.String()) mux := api.MakeHandler(svc, mocktracer.New())
mux := api.MakeHandler(svc, mocktracer.New(), logger)
return httptest.NewServer(mux) return httptest.NewServer(mux)
} }

5
users/api/http/doc.go
View File

@ -1,5 +0,0 @@
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
// Package http contains implementation of users service HTTP API.
package http

6
users/api/transport.go
View File

@ -17,7 +17,6 @@ import (
kithttp "github.com/go-kit/kit/transport/http" kithttp "github.com/go-kit/kit/transport/http"
"github.com/go-zoo/bone" "github.com/go-zoo/bone"
"github.com/mainflux/mainflux" "github.com/mainflux/mainflux"
log "github.com/mainflux/mainflux/logger"
"github.com/mainflux/mainflux/users" "github.com/mainflux/mainflux/users"
opentracing "github.com/opentracing/opentracing-go" opentracing "github.com/opentracing/opentracing-go"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
@ -43,13 +42,10 @@ var (
// ErrFailedDecode indicates failed to decode request body // ErrFailedDecode indicates failed to decode request body
ErrFailedDecode = errors.New("failed to decode request body") ErrFailedDecode = errors.New("failed to decode request body")
logger log.Logger
) )
// MakeHandler returns a HTTP handler for API endpoints. // MakeHandler returns a HTTP handler for API endpoints.
func MakeHandler(svc users.Service, tracer opentracing.Tracer, l log.Logger) http.Handler { func MakeHandler(svc users.Service, tracer opentracing.Tracer) http.Handler {
logger = l
opts := []kithttp.ServerOption{ opts := []kithttp.ServerOption{
kithttp.ServerErrorEncoder(encodeError), kithttp.ServerErrorEncoder(encodeError),
} }