Removed oauth logic

Author: Aristat

README.md

@@ -14,7 +14,6 @@
   * [Start in docker](#start-in-docker)
 - [Getting started](#getting-started)  
   * [Jaeger](#jaeger)
-  * [Oauth2 client](#oauth2-client)
   * [Http with gRPC](#http-example-with-grpc)
   * [Graphql with gRPC](#graphql-example-with-grpc)
 - [Deprecate version](#deprecated-version)  
@@ -27,9 +26,8 @@ Commands list:
 1. Daemon - main service
 2. Product service - service that returns Product, an example of gRPC client/server interaction
 3. Health check service - this service is needed to show how convenient to understand on which of the services an error occurred in jaeger
-4. Oauth client - this service is needed to show a simple example of http client and server, for example oauth2 server
-5. Migrate - commands for migration
-6. JWT - commands for generate JWT token
+4. Migrate - commands for migration
+5. JWT - commands for generate JWT token
 
 # Package list
 
@@ -43,15 +41,14 @@ Packages which use in this example project
 6. [gorm](https://github.com/jinzhu/gorm) - database ORM
 7. [zap](https://github.com/uber-go/zap) - logger
 8. [mux](https://github.com/gorilla/mux) - http router
-9. [oauth2](https://github.com/go-oauth2/oauth2) - simple oauth2 server
+9. [nats-streaming](https://github.com/nats-io/stan.go) - NATS Streaming System
 10. [gqlgen](https://github.com/99designs/gqlgen) - graphql server library
 11. [protobuf](https://github.com/golang/protobuf) - Google's data interchange format
 12. [grpc](google.golang.org/grpc) - RPC framework
 13. [jaeger](https://github.com/uber/jaeger-client-go) - Jaeger Bindings for Go OpenTracing API
 14. [casbin](https://github.com/casbin/casbin) - Supports access control
 15. [dataloaden](https://github.com/vektah/dataloaden) - DataLoader for graphql
 16. [nats](https://github.com/nats-io/nats.go) - Golang client for NATS, the cloud native messaging system
-17. [nats-streaming](https://github.com/nats-io/stan.go) - NATS Streaming System
 
 # Installing
 
@@ -142,12 +139,6 @@ or
 ./artifacts/bin daemon -c ./artifacts/configs/development.yaml -d
 ```
 
-Start client 
-
-```$xslt
-./artifacts/bin oauth-client -c ./artifacts/configs/development.yaml -d
-```
-
 Start product service 
 
 ```$xslt
@@ -177,12 +168,6 @@ docker-compose up
 http://localhost:16686
 ```
 
-## Oauth2 client
-
-```$xslt
-http://localhost:9094/login
-```
-
 ## Http example with gRPC
 
 ```$xslt
@@ -265,6 +250,7 @@ mutation createUser {
 
 # Testing
 ```
-export APP_WD=go_path to project_path/resources or project_path/artifacts - needed for load templates
+Set APP_WD for load templates as example if you use html pages in a project
+export APP_WD=go_path to project_path/resources or project_path/artifacts
 ➜  make test
 ```

app/auth/middleware.go

@@ -50,7 +50,7 @@ type keys struct {
 }
 
 // Handler for check Bearer token
-func (m Middleware) Handler(next http.Handler) http.Handler {
+func (m Middleware) JWTHandler(next http.Handler) http.Handler {
 	fn := func(w http.ResponseWriter, r *http.Request) {
 		var (
 			token       string

app/http/http.go

@@ -60,12 +60,11 @@ func (m *Http) ListenAndServe(wg *sync.WaitGroup, bind ...string) (server *http.
 }
 
 // New
-func New(ctx context.Context, mux *chi.Mux, log logger.Logger, cfg Config, managers Managers) *Http {
+func New(ctx context.Context, mux *chi.Mux, log logger.Logger, cfg Config) *Http {
 	return &Http{
-		ctx:     ctx,
-		cfg:     cfg,
-		session: managers.session,
-		mux:     mux,
-		log:     log.WithFields(logger.Fields{"service": prefix}),
+		ctx: ctx,
+		cfg: cfg,
+		mux: mux,
+		log: log.WithFields(logger.Fields{"service": prefix}),
 	}
 }

app/http/injector.go

@@ -7,11 +7,8 @@ import (
 	"github.com/aristat/golang-example-app/app/db"
 	"github.com/aristat/golang-example-app/app/db/repo"
 	"github.com/aristat/golang-example-app/app/graphql"
-	oauth_router "github.com/aristat/golang-example-app/app/http_routers/oauth-router"
 	products_router "github.com/aristat/golang-example-app/app/http_routers/products-router"
-	users_router "github.com/aristat/golang-example-app/app/http_routers/users-router"
 	"github.com/aristat/golang-example-app/app/provider"
-	"github.com/aristat/golang-example-app/app/session"
 	"github.com/google/wire"
 )
 
@@ -21,10 +18,7 @@ func Build() (*Http, func(), error) {
 		ProviderProductionSet,
 		auth.ProviderProductionSet,
 		graphql.ProviderProductionSet,
-		users_router.ProviderProductionSet,
 		products_router.ProviderProductionSet,
-		oauth_router.ProviderProductionSet,
-		session.ProviderProductionSet,
 		repo.ProviderProductionSet,
 		db.ProviderProductionSet,
 		provider.AwareProductionSet,

app/http/provider.go

@@ -10,16 +10,12 @@ import (
 	"github.com/aristat/golang-example-app/app/auth"
 
 	"github.com/aristat/golang-example-app/app/graphql"
-	users_router "github.com/aristat/golang-example-app/app/http_routers/users-router"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
 	"github.com/opentracing/opentracing-go"
 
-	"github.com/go-session/session"
-
 	"github.com/aristat/golang-example-app/app/logger"
 
-	oauth_router "github.com/aristat/golang-example-app/app/http_routers/oauth-router"
 	"github.com/google/wire"
 	"github.com/spf13/viper"
 )
@@ -54,19 +50,14 @@ func Mux(managers Managers, log logger.Logger, tracer opentracing.Tracer) (*chi.
 	mux.Use(Tracer(tracer))
 	mux.Use(dataloader.LoaderMiddleware)
 
-	managers.users.Router.Run(mux)
-	managers.oauth.Router.Run(mux)
 	managers.products.Router.Run(mux)
-	managers.graphql.Routers(mux.With(managers.authMiddleware.Handler))
+	managers.graphql.Routers(mux.With(managers.authMiddleware.JWTHandler))
 
 	return mux, func() {}, nil
 }
 
 // ServiceManagers
 type Managers struct {
-	session        *session.Manager
-	users          *users_router.Manager
-	oauth          *oauth_router.Manager
 	products       *products_router.Manager
 	authMiddleware *auth.Middleware
 	graphql        *graphql.GraphQL
@@ -77,8 +68,8 @@ var ProviderManagers = wire.NewSet(
 )
 
 // Provider
-func Provider(ctx context.Context, mux *chi.Mux, log logger.Logger, cfg Config, managers Managers) (*Http, func(), error) {
-	g := New(ctx, mux, log, cfg, managers)
+func Provider(ctx context.Context, mux *chi.Mux, log logger.Logger, cfg Config) (*Http, func(), error) {
+	g := New(ctx, mux, log, cfg)
 	return g, func() {}, nil
 }