refac: password and code hashing & checking go through a domain hasher interface used by the use cases instead of bcrypt in the user repository and the auth handler

api/dependecyInjection.go

@@ -5,6 +5,7 @@ import (
 	domainImage "RenewCMS/internal/domain/image"
 	domainMail "RenewCMS/internal/domain/mail"
 	domainUser "RenewCMS/internal/domain/user"
+	"RenewCMS/internal/infrastructure/hashing"
 	"RenewCMS/internal/infrastructure/mailer"
 	"RenewCMS/internal/infrastructure/persistence/models"
 	persistence "RenewCMS/internal/infrastructure/persistence/repositories"
@@ -18,20 +19,21 @@ import (
 )
 
 type UseCases struct {
-	Token                *jwtauth.JWTAuth
-	CreateArticleUseCase *useCases.CreateArticleUseCase
-	GetArticleUseCase    *useCases.GetArticleUseCase
-	ListArticlesUseCase  *useCases.ListArticlesUseCase
-	UpdateArticleUseCase *useCases.UpdateArticleUseCase
-	DeleteArticleUseCase *useCases.DeleteArticleUseCase
-	GetUserUseCase       *useCases.GetUserUseCase
-	CreateUserUseCase    *useCases.CreateUserUseCase
-	UpdateUserUseCase    *useCases.UpdateUserUseCase
-	DeleteUserUseCase    *useCases.DeleteUserUseCase
-	ListUsersUseCase     *useCases.ListUsersUseCase
-	SendMailUseCase      *useCases.SendMailUseCase
-	CreateImageUseCase   *useCases.CreateImageUseCase
-	DeleteImageUseCase   *useCases.DeleteImageUseCase
+	Token                   *jwtauth.JWTAuth
+	CreateArticleUseCase    *useCases.CreateArticleUseCase
+	GetArticleUseCase       *useCases.GetArticleUseCase
+	ListArticlesUseCase     *useCases.ListArticlesUseCase
+	UpdateArticleUseCase    *useCases.UpdateArticleUseCase
+	DeleteArticleUseCase    *useCases.DeleteArticleUseCase
+	GetUserUseCase          *useCases.GetUserUseCase
+	CreateUserUseCase       *useCases.CreateUserUseCase
+	UpdateUserUseCase       *useCases.UpdateUserUseCase
+	AuthenticateUserUseCase *useCases.AuthenticateUserUseCase
+	DeleteUserUseCase       *useCases.DeleteUserUseCase
+	ListUsersUseCase        *useCases.ListUsersUseCase
+	SendMailUseCase         *useCases.SendMailUseCase
+	CreateImageUseCase      *useCases.CreateImageUseCase
+	DeleteImageUseCase      *useCases.DeleteImageUseCase
 }
 
 type Repositories struct {
@@ -68,21 +70,24 @@ func getRepositories(db *gorm.DB) *Repositories {
 }
 
 func getUseCases(repos *Repositories) *UseCases {
+	hasher := hashing.NewBcryptHasher()
+
 	return &UseCases{
-		Token:                jwtauth.New("HS256", []byte(os.Getenv("JWT_SECRET")), nil),
-		CreateArticleUseCase: useCases.NewCreateArticleUseCase(repos.ArticleRepo),
-		GetArticleUseCase:    useCases.NewGetArticleUseCase(repos.ArticleRepo),
-		ListArticlesUseCase:  useCases.NewListArticlesUseCase(repos.ArticleRepo),
-		UpdateArticleUseCase: useCases.NewUpdateArticleUseCase(repos.ArticleRepo),
-		DeleteArticleUseCase: useCases.NewDeleteArticleUseCase(repos.ArticleRepo),
-		GetUserUseCase:       useCases.NewGetUserUseCase(repos.UserRepo),
-		CreateUserUseCase:    useCases.NewCreateUserUseCase(repos.UserRepo),
-		UpdateUserUseCase:    useCases.NewUpdateUserUseCase(repos.UserRepo),
-		DeleteUserUseCase:    useCases.NewDeleteUserUseCase(repos.UserRepo),
-		ListUsersUseCase:     useCases.NewListUsersUseCase(repos.UserRepo),
-		SendMailUseCase:      useCases.NewSendMailUseCase(repos.MailRepo),
-		CreateImageUseCase:   useCases.NewCreateImageUseCase(repos.ImageRepo),
-		DeleteImageUseCase:   useCases.NewDeleteImageUseCase(repos.ImageRepo),
+		Token:                   jwtauth.New("HS256", []byte(os.Getenv("JWT_SECRET")), nil),
+		CreateArticleUseCase:    useCases.NewCreateArticleUseCase(repos.ArticleRepo),
+		GetArticleUseCase:       useCases.NewGetArticleUseCase(repos.ArticleRepo),
+		ListArticlesUseCase:     useCases.NewListArticlesUseCase(repos.ArticleRepo),
+		UpdateArticleUseCase:    useCases.NewUpdateArticleUseCase(repos.ArticleRepo),
+		DeleteArticleUseCase:    useCases.NewDeleteArticleUseCase(repos.ArticleRepo),
+		GetUserUseCase:          useCases.NewGetUserUseCase(repos.UserRepo),
+		CreateUserUseCase:       useCases.NewCreateUserUseCase(repos.UserRepo, hasher),
+		UpdateUserUseCase:       useCases.NewUpdateUserUseCase(repos.UserRepo, hasher),
+		AuthenticateUserUseCase: useCases.NewAuthenticateUserUseCase(repos.UserRepo, hasher),
+		DeleteUserUseCase:       useCases.NewDeleteUserUseCase(repos.UserRepo),
+		ListUsersUseCase:        useCases.NewListUsersUseCase(repos.UserRepo),
+		SendMailUseCase:         useCases.NewSendMailUseCase(repos.MailRepo),
+		CreateImageUseCase:      useCases.NewCreateImageUseCase(repos.ImageRepo),
+		DeleteImageUseCase:      useCases.NewDeleteImageUseCase(repos.ImageRepo),
 	}
 }
 

api/handlers/auth/authHandler.go

@@ -3,7 +3,6 @@ package auth
 import (
 	"RenewCMS/api/pkg/apperr"
 	validator "RenewCMS/api/pkg/validator"
-	"RenewCMS/internal/domain/user"
 	"RenewCMS/internal/infrastructure/useCases"
 	"encoding/json"
 	"net/http"
@@ -11,14 +10,14 @@ import (
 	"time"
 
 	"github.com/go-chi/jwtauth/v5"
-	"golang.org/x/crypto/bcrypt"
 )
 
 type Handler struct {
-	Token         *jwtauth.JWTAuth
-	GetUseCase    *useCases.GetUserUseCase
-	ListUseCase   *useCases.ListUsersUseCase
-	CreateUseCase *useCases.CreateUserUseCase
+	Token               *jwtauth.JWTAuth
+	GetUseCase          *useCases.GetUserUseCase
+	ListUseCase         *useCases.ListUsersUseCase
+	CreateUseCase       *useCases.CreateUserUseCase
+	AuthenticateUseCase *useCases.AuthenticateUserUseCase
 }
 
 type RegisterCredentials struct {
@@ -48,12 +47,13 @@ func removeJwtCookie(w http.ResponseWriter) {
 	})
 }
 
-func NewHandler(token *jwtauth.JWTAuth, get *useCases.GetUserUseCase, list *useCases.ListUsersUseCase, create *useCases.CreateUserUseCase) *Handler {
+func NewHandler(token *jwtauth.JWTAuth, get *useCases.GetUserUseCase, list *useCases.ListUsersUseCase, create *useCases.CreateUserUseCase, authenticate *useCases.AuthenticateUserUseCase) *Handler {
 	return &Handler{
-		Token:         token,
-		GetUseCase:    get,
-		ListUseCase:   list,
-		CreateUseCase: create,
+		Token:               token,
+		GetUseCase:          get,
+		ListUseCase:         list,
+		CreateUseCase:       create,
+		AuthenticateUseCase: authenticate,
 	}
 }
 
@@ -113,20 +113,6 @@ func (h *Handler) IsVerified(r *http.Request) bool {
 	return currentUser.IsVerified
 }
 
-func (h *Handler) GetUserFromCredentials(credentials LoginCredentials) (user.User, error) {
-	dbUser, err := h.GetUseCase.GetUserByUsername(credentials.Username)
-	if err != nil {
-		return user.User{}, err
-	}
-
-	err = bcrypt.CompareHashAndPassword([]byte(dbUser.Password), []byte(credentials.Password))
-	if err != nil {
-		return user.User{}, err
-	}
-
-	return dbUser, nil
-}
-
 func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
 	var credentials LoginCredentials
 
@@ -142,7 +128,7 @@ func (h *Handler) Login(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	dbUser, err := h.GetUserFromCredentials(credentials)
+	dbUser, err := h.AuthenticateUseCase.Authenticate(credentials.Username, credentials.Password)
 	if err != nil {
 		http.Error(w, apperr.LogsErrorMessage, http.StatusForbidden)
 		return

api/router.go

@@ -43,7 +43,7 @@ func NewArticleRouter(container *UseCases) http.Handler {
 func NewAuthRouter(container *UseCases) http.Handler {
 	r := chi.NewRouter()
 
-	authHandler := auth.NewHandler(container.Token, container.GetUserUseCase, container.ListUsersUseCase, container.CreateUserUseCase)
+	authHandler := auth.NewHandler(container.Token, container.GetUserUseCase, container.ListUsersUseCase, container.CreateUserUseCase, container.AuthenticateUserUseCase)
 
 	r.Post("/register", authHandler.Register)
 	r.Post("/login", authHandler.Login)