Merge pull request #4 from josephspurrier/usercase-branch

Usecase branch

.travis.yml

@@ -3,10 +3,10 @@ language: go
 go:
   #- 1.0
   #- 1.1
-  - 1.2
-  - 1.3
-  - 1.4
-  - 1.5
+  #- 1.2
+  #- 1.3
+  #- 1.4
+  #- 1.5
   - 1.6
   - 1.7
   - 1.8

controller/login.go

@@ -10,7 +10,7 @@ import (
 
 // LoginHandler represents the services required for this controller.
 type LoginHandler struct {
-	UserService domain.UserService
+	UserService domain.UserCase
 	ViewService view.Service
 }
 

controller/login_test.go

@@ -7,9 +7,11 @@ import (
 	"testing"
 
 	"github.com/josephspurrier/gocleanarchitecture/controller"
-	"github.com/josephspurrier/gocleanarchitecture/database"
 	"github.com/josephspurrier/gocleanarchitecture/domain"
+	"github.com/josephspurrier/gocleanarchitecture/lib/passhash"
 	"github.com/josephspurrier/gocleanarchitecture/lib/view"
+	"github.com/josephspurrier/gocleanarchitecture/repository"
+	"github.com/josephspurrier/gocleanarchitecture/usecase"
 )
 
 // TestLoginIndex ensures the index function returns a 200 code.
@@ -41,8 +43,9 @@ func TestLoginStoreMissingRequiredFields(t *testing.T) {
 
 	// Call the handler.
 	h := new(controller.LoginHandler)
-	db := new(database.MockService)
-	h.UserService = database.NewUserService(db)
+	h.UserService = usecase.NewUserCase(
+		repository.NewUserRepo(new(repository.MockService)),
+		new(passhash.Item))
 	h.ViewService = view.New("../view", "tmpl")
 	h.Index(w, r)
 
@@ -67,8 +70,9 @@ func TestLoginStoreAuthenticateOK(t *testing.T) {
 
 	// Call the handler.
 	h := new(controller.LoginHandler)
-	db := new(database.MockService)
-	h.UserService = database.NewUserService(db)
+	h.UserService = usecase.NewUserCase(
+		repository.NewUserRepo(new(repository.MockService)),
+		new(passhash.Item))
 	h.ViewService = view.New("../view", "tmpl")
 
 	// Create a new user.
@@ -100,8 +104,9 @@ func TestLoginStoreAuthenticateFail(t *testing.T) {
 
 	// Call the handler.
 	h := new(controller.LoginHandler)
-	db := new(database.MockService)
-	h.UserService = database.NewUserService(db)
+	h.UserService = usecase.NewUserCase(
+		repository.NewUserRepo(new(repository.MockService)),
+		new(passhash.Item))
 	h.ViewService = view.New("../view", "tmpl")
 
 	// Create a new user.

controller/register.go

@@ -10,7 +10,7 @@ import (
 
 // RegisterHandler represents the services required for this controller.
 type RegisterHandler struct {
-	UserService domain.UserService
+	UserService domain.UserCase
 	ViewService view.Service
 }
 

controller/register_test.go

@@ -7,8 +7,10 @@ import (
 	"testing"
 
 	"github.com/josephspurrier/gocleanarchitecture/controller"
-	"github.com/josephspurrier/gocleanarchitecture/database"
+	"github.com/josephspurrier/gocleanarchitecture/lib/passhash"
 	"github.com/josephspurrier/gocleanarchitecture/lib/view"
+	"github.com/josephspurrier/gocleanarchitecture/repository"
+	"github.com/josephspurrier/gocleanarchitecture/usecase"
 )
 
 // TestRegisterIndex ensures the index function returns a 200 code.
@@ -48,8 +50,9 @@ func TestRegisterStoreCreateOK(t *testing.T) {
 
 	// Call the handler.
 	h := new(controller.RegisterHandler)
-	db := new(database.MockService)
-	h.UserService = database.NewUserService(db)
+	h.UserService = usecase.NewUserCase(
+		repository.NewUserRepo(new(repository.MockService)),
+		new(passhash.Item))
 	h.ViewService = view.New("../view", "tmpl")
 	h.Index(w, r)
 
@@ -73,8 +76,9 @@ func TestRegisterStoreCreateNoFieldFail(t *testing.T) {
 
 	// Call the handler.
 	h := new(controller.RegisterHandler)
-	db := new(database.MockService)
-	h.UserService = database.NewUserService(db)
+	h.UserService = usecase.NewUserCase(
+		repository.NewUserRepo(new(repository.MockService)),
+		new(passhash.Item))
 	h.ViewService = view.New("../view", "tmpl")
 	h.Index(w, r)
 
@@ -102,8 +106,9 @@ func TestRegisterStoreCreateOneMissingFieldFail(t *testing.T) {
 
 	// Call the handler.
 	h := new(controller.RegisterHandler)
-	db := new(database.MockService)
-	h.UserService = database.NewUserService(db)
+	h.UserService = usecase.NewUserCase(
+		repository.NewUserRepo(new(repository.MockService)),
+		new(passhash.Item))
 	h.ViewService = view.New("../view", "tmpl")
 	h.Index(w, r)
 

domain/passhash.go

@@ -0,0 +1,19 @@
+package domain
+
+import (
+	"errors"
+)
+
+var (
+	// ErrPasswordHash is when a password hash operation fails.
+	ErrPasswordHash = errors.New("Password hash failed.")
+)
+
+// Passhash represents a password hashing system.
+type Passhash struct{}
+
+// PasshashCase represents a service for managing hashed passwords.
+type PasshashCase interface {
+	Hash(password string) (string, error)
+	Match(hash, password string) bool
+}

domain/user.go

@@ -19,9 +19,15 @@ type User struct {
 	Password  string `json:"password"`
 }
 
-// UserService represents a service for managing users.
-type UserService interface {
+// UserCase represents a service for managing users.
+type UserCase interface {
 	User(email string) (*User, error)
-	CreateUser(user *User) error
-	Authenticate(user *User) error
+	CreateUser(item *User) error
+	Authenticate(item *User) error
+}
+
+// UserRepo represents a service for storage of users.
+type UserRepo interface {
+	FindByEmail(email string) (*User, error)
+	Store(item *User) error
 }

lib/boot/service.go

@@ -1,14 +1,16 @@
 package boot
 
 import (
-	"github.com/josephspurrier/gocleanarchitecture/database"
 	"github.com/josephspurrier/gocleanarchitecture/domain"
+	"github.com/josephspurrier/gocleanarchitecture/lib/passhash"
 	"github.com/josephspurrier/gocleanarchitecture/lib/view"
+	"github.com/josephspurrier/gocleanarchitecture/repository"
+	"github.com/josephspurrier/gocleanarchitecture/usecase"
 )
 
 // Service represents all the services that the application uses.
 type Service struct {
-	UserService domain.UserService
+	UserService domain.UserCase
 	ViewService view.Service
 }
 
@@ -18,10 +20,12 @@ func RegisterServices() *Service {
 	s := new(Service)
 
 	// Initialize the clients.
-	db := database.NewClient("db.json")
+	db := repository.NewClient("db.json")
 
 	// Store all the services for the application.
-	s.UserService = database.NewUserService(db)
+	s.UserService = usecase.NewUserCase(
+		repository.NewUserRepo(db),
+		new(passhash.Item))
 	s.ViewService = view.New("../../view", "tmpl")
 
 	return s

lib/passhash/implement.go

@@ -0,0 +1,14 @@
+package passhash
+
+// Item represents a password hashing system.
+type Item struct{}
+
+// Hash returns a hashed string and an error.
+func (s *Item) Hash(password string) (string, error) {
+	return HashString(password)
+}
+
+// Match returns true if the hash matches the password.
+func (s *Item) Match(hash, password string) bool {
+	return MatchString(hash, password)
+}

lib/passhash/passhash.go

@@ -0,0 +1,46 @@
+// Package passhash provides password hashing functionality using bcrypt.
+package passhash
+
+import (
+	"golang.org/x/crypto/bcrypt"
+)
+
+// HashString returns a hashed string and an error.
+func HashString(password string) (string, error) {
+	key, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+	if err != nil {
+		return "", err
+	}
+
+	return string(key), nil
+}
+
+// HashBytes returns a hashed byte array and an error.
+func HashBytes(password []byte) ([]byte, error) {
+	key, err := bcrypt.GenerateFromPassword(password, bcrypt.DefaultCost)
+	if err != nil {
+		return nil, err
+	}
+
+	return key, nil
+}
+
+// MatchString returns true if the hash matches the password.
+func MatchString(hash, password string) bool {
+	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
+	if err == nil {
+		return true
+	}
+
+	return false
+}
+
+// MatchBytes returns true if the hash matches the password.
+func MatchBytes(hash, password []byte) bool {
+	err := bcrypt.CompareHashAndPassword(hash, []byte(password))
+	if err == nil {
+		return true
+	}
+
+	return false
+}