first working server

internal/services/user_service.go

@@ -3,12 +3,16 @@ package services
 import (
 	"GoMembership/internal/models"
 	"GoMembership/internal/repositories"
+	// "GoMembership/pkg/errors"
+	"crypto/rand"
+	"encoding/base64"
 	"golang.org/x/crypto/bcrypt"
 	"time"
 )
 
 type UserService interface {
 	RegisterUser(user *models.User) error
+	// AuthenticateUser(email, password string) (*models.User, error)
 }
 
 type userService struct {
@@ -19,8 +23,14 @@ func NewUserService(repo repositories.UserRepository) UserService {
 	return &userService{repo}
 }
 
-func (s *userService) RegisterUser(user *models.User) error {
-	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
+func (service *userService) RegisterUser(user *models.User) error {
+	salt := make([]byte, 16)
+	if _, err := rand.Read(salt); err != nil {
+		return err
+	}
+	user.Salt = base64.StdEncoding.EncodeToString(salt)
+
+	hashedPassword, err := HashPassword(user.Password, user.Salt)
 	if err != nil {
 		return err
 	}
@@ -28,5 +38,38 @@ func (s *userService) RegisterUser(user *models.User) error {
 	user.CreatedAt = time.Now()
 	user.UpdatedAt = time.Now()
 	user.MandateDateSigned = time.Now()
-	return s.repo.CreateUser(user)
+	return service.repo.CreateUser(user)
 }
+
+func HashPassword(password string, salt string) (string, error) {
+	saltedPassword := password + salt
+	hashedPassword, err := bcrypt.GenerateFromPassword([]byte(saltedPassword), bcrypt.DefaultCost)
+	if err != nil {
+		return "", err
+	}
+	return base64.StdEncoding.EncodeToString(hashedPassword), nil
+}
+
+/* func (s *userService) AuthenticateUser(email, password string) (*models.User, error) {
+	user, err := s.repo.FindUserByEmail(email)
+	if err != nil {
+		return nil, errors.ErrUserNotFound
+	}
+
+	if !verifyPassword(password, user.Password, user.Salt) {
+		return nil, errors.ErrInvalidCredentials
+	}
+
+	return user, nil
+}
+*/
+/* func verifyPassword(password string, storedPassword string, salt string) bool {
+
+	saltedPassword := password + salt
+	decodedStoredPassword, err := base64.StdEncoding.DecodeString(storedPassword)
+	if err != nil {
+		return false
+	}
+	err = bcrypt.CompareHashAndPassword([]byte(decodedStoredPassword), []byte(saltedPassword))
+	return err == nil
+} */