feat(wire): add dependency injection with wire (#2)

* feat(wire): add dependency injection with wire

* fix(auth/signup): prevent nil pointer exception

* fix(auth/login): panic on error during session creation

* fix: use pointer to mutation resolver

* fix: add wire dependency to Gopkg.lock

* refactor(wire): bundle api providers in a provider set

* refactor(auth): move cookie ops and password hashing to auth pkg

* feat(prisma) load prisma config from env vars

* refactor(prisma): rename prisma config struct

* refactor(wire): move server and router into providers

* refactor(wire): remove unused config module (replaced by env pkg)

Author: robojones

.gitignore

@@ -1,5 +1,6 @@
 gqlgen/gqlgen.go
 gqlgen/models.go
 prisma/prisma.go
+*_gen.go
 vendor/
 .idea/

Gopkg.lock

@@ -0,0 +1,32 @@
+package api
+
+import (
+	"github.com/99designs/gqlgen/handler"
+	"github.com/robojones/graphql/api/resolver/root"
+	"github.com/robojones/graphql/gqlgen"
+	"github.com/robojones/graphql/lib/auth"
+	"github.com/robojones/graphql/lib/handler_adapter"
+	"github.com/robojones/graphql/prisma"
+	"net/http"
+)
+
+type Handler struct {
+	Next http.Handler
+}
+
+func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	h.Next.ServeHTTP(w, r)
+}
+
+func New(client *prisma.Client, resolver *root.Resolver) *Handler {
+	schema := gqlgen.NewExecutableSchema(gqlgen.Config{Resolvers: resolver})
+
+	return &Handler{
+		Next: &auth.Handler{
+			Prisma: client,
+			Next: &handler_adapter.HandlerFuncAdapter{
+				NextFunc: handler.GraphQL(schema),
+			},
+		},
+	}
+}

api/handler.go

@@ -0,0 +1,15 @@
+package auth
+
+import (
+	"github.com/robojones/graphql/prisma"
+)
+
+type Auth struct {
+	Prisma *prisma.Client
+}
+
+func New(client *prisma.Client) *Auth {
+	return &Auth{
+		Prisma: client,
+	}
+}

api/mutation/auth/auth.go

@@ -4,10 +4,8 @@ import (
 	"context"
 	"github.com/robojones/graphql/gqlgen"
 	"github.com/robojones/graphql/lib/auth"
-	"github.com/robojones/graphql/lib/session_cookie"
 	"github.com/robojones/graphql/prisma"
 	"github.com/vektah/gqlparser/gqlerror"
-	"golang.org/x/crypto/bcrypt"
 )
 
 var UserNotFoundError = &gqlerror.Error{
@@ -38,7 +36,7 @@ func (a *Auth) Login(ctx context.Context, email string, password string) (gqlgen
 		panic(err)
 	}
 
-	err = bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(password))
+	err = auth.VerifyPassword(user.PasswordHash, password)
 	if err != nil {
 		return gqlgen.LoginResult{}, IncorrectPasswordError
 	}
@@ -52,7 +50,11 @@ func (a *Auth) Login(ctx context.Context, email string, password string) (gqlgen
 		Token: auth.GenerateToken(),
 	}).Exec(ctx)
 
-	session_cookie.Set(ctx, session)
+	if err != nil {
+		panic(err)
+	}
+
+	auth.SetCookie(ctx, session)
 
 	return gqlgen.LoginResult{
 		Session: *session,

api/mutation/mutation.go

@@ -3,14 +3,14 @@ package auth
 import (
 	"context"
 	"github.com/robojones/graphql/gqlgen"
+	"github.com/robojones/graphql/lib/auth"
 	"github.com/robojones/graphql/lib/session_context"
-	"github.com/robojones/graphql/lib/session_cookie"
 	"github.com/robojones/graphql/prisma"
 )
 
 func (a *Auth) Logout(ctx context.Context) (gqlgen.LogoutResult, error) {
 
-	session_cookie.Unset(ctx)
+	auth.UnsetCookie(ctx)
 
 	token, err := session_context.Token(ctx)
 

api/resolver.go

@@ -3,9 +3,9 @@ package auth
 import (
 	"context"
 	"github.com/robojones/graphql/gqlgen"
+	"github.com/robojones/graphql/lib/auth"
 	"github.com/robojones/graphql/prisma"
 	"github.com/vektah/gqlparser/gqlerror"
-	"golang.org/x/crypto/bcrypt"
 )
 
 const duplicateEmailErrorMessage = "graphql: A unique constraint would be violated on User. Details: Field name = email"
@@ -18,28 +18,18 @@ var DuplicateEmailError = &gqlerror.Error{
 	},
 }
 
-func hashPassword(password string) string {
-	hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
-
-	if err != nil {
-		panic(err)
-	}
-
-	return string(hash)
-}
-
 func (a *Auth) Signup(ctx context.Context, email string, name string, password string) (gqlgen.LoginResult, error) {
 	_, err := a.Prisma.CreateUser(prisma.UserCreateInput{
 		Name:         name,
 		Email:        email,
-		PasswordHash: hashPassword(password),
+		PasswordHash: auth.HashPassword(password),
 	}).Exec(ctx)
 
-	if err.Error() == duplicateEmailErrorMessage {
-		return gqlgen.LoginResult{}, DuplicateEmailError
-	}
-
 	if err != nil {
+		if err.Error() == duplicateEmailErrorMessage {
+			return gqlgen.LoginResult{}, DuplicateEmailError
+		}
+
 		panic(err)
 	}
 

api/resolver/mutation/auth/auth.go

@@ -0,0 +1,18 @@
+package mutation
+
+import (
+	"github.com/robojones/graphql/api/resolver/mutation/auth"
+	"github.com/robojones/graphql/prisma"
+)
+
+type Resolver struct {
+	Prisma *prisma.Client
+	*auth.Auth
+}
+
+func New(client *prisma.Client, auth *auth.Auth) *Resolver {
+	return &Resolver{
+		Prisma: client,
+		Auth:   auth,
+	}
+}

api/mutation/auth/login.go renamed to api/resolver/mutation/auth/login.go

@@ -2,18 +2,17 @@ package query
 
 import (
 	"context"
-	"github.com/robojones/graphql/api/super"
 	"github.com/robojones/graphql/lib/session_context"
 	"github.com/robojones/graphql/prisma"
 )
 
 type Resolver struct {
-	*super.Resolver
+	Prisma *prisma.Client
 }
 
-func New(super *super.Resolver) *Resolver {
+func New(client *prisma.Client) *Resolver {
 	return &Resolver{
-		Resolver: super,
+		Prisma: client,
 	}
 }
 

api/mutation/auth/logout.go renamed to api/resolver/mutation/auth/logout.go

@@ -0,0 +1,32 @@
+//go:generate wire
+
+package root
+
+import (
+	"github.com/robojones/graphql/api/resolver/mutation"
+	"github.com/robojones/graphql/api/resolver/query"
+	"github.com/robojones/graphql/gqlgen"
+	"github.com/robojones/graphql/prisma"
+)
+
+type Resolver struct {
+	Prisma           *prisma.Client
+	MutationResolver *mutation.Resolver
+	QueryResolver    *query.Resolver
+}
+
+func New(client *prisma.Client, mutation *mutation.Resolver, query *query.Resolver) *Resolver {
+	return &Resolver{
+		Prisma:           client,
+		MutationResolver: mutation,
+		QueryResolver:    query,
+	}
+}
+
+func (r *Resolver) Mutation() gqlgen.MutationResolver {
+	return r.MutationResolver
+}
+
+func (r *Resolver) Query() gqlgen.QueryResolver {
+	return r.QueryResolver
+}

api/mutation/auth/signup.go renamed to api/resolver/mutation/auth/signup.go

@@ -0,0 +1,17 @@
+package api
+
+import (
+	"github.com/google/wire"
+	"github.com/robojones/graphql/api/resolver/mutation"
+	"github.com/robojones/graphql/api/resolver/mutation/auth"
+	"github.com/robojones/graphql/api/resolver/query"
+	"github.com/robojones/graphql/api/resolver/root"
+)
+
+var Providers = wire.NewSet(
+	auth.New,
+	mutation.New,
+	query.New,
+	root.New,
+	New,
+)

api/resolver/mutation/mutation.go

@@ -1,4 +1,4 @@
-package session_cookie
+package auth
 
 import (
 	"context"
@@ -10,8 +10,8 @@ import (
 
 const CookieKey = "session"
 
-// Set the cookie for the session
-func Set(ctx context.Context, session *prisma.Session) {
+// SetCookie the cookie for the session
+func SetCookie(ctx context.Context, session *prisma.Session) {
 	w := session_context.Writer(ctx)
 
 	cookie := &http.Cookie{
@@ -25,3 +25,15 @@ func Set(ctx context.Context, session *prisma.Session) {
 
 	http.SetCookie(w, cookie)
 }
+
+// UnsetCookie the session cookie
+func UnsetCookie(ctx context.Context) {
+	w := session_context.Writer(ctx)
+
+	cookie := &http.Cookie{
+		Name:   CookieKey,
+		MaxAge: -1,
+	}
+
+	http.SetCookie(w, cookie)
+}