refactoring db; added email-verification

This commit is contained in:
$(pass /github/name)
2024-07-08 23:43:55 +02:00
parent 555d1be575
commit 87e9f71ceb
20 changed files with 890 additions and 255 deletions

View File

@@ -3,7 +3,9 @@ package services
import (
"GoMembership/internal/models"
"GoMembership/internal/repositories"
// "GoMembership/pkg/errors"
"GoMembership/internal/utils"
"GoMembership/pkg/logger"
// "crypto/rand"
// "encoding/base64"
// "golang.org/x/crypto/bcrypt"
@@ -11,8 +13,9 @@ import (
)
type UserService interface {
RegisterUser(user *models.User) (int64, error)
// AuthenticateUser(email, password string) (*models.User, error)
RegisterUser(user *models.User) (int64, string, error)
// AuthenticateUser(email, password string) (*models.User, error)A
VerifyUser(token *string) (*models.User, error)
}
type userService struct {
@@ -23,7 +26,7 @@ func NewUserService(repo repositories.UserRepository) UserService {
return &userService{repo}
}
func (service *userService) RegisterUser(user *models.User) (int64, error) {
func (service *userService) RegisterUser(user *models.User) (int64, string, error) {
/* salt := make([]byte, 16)
if _, err := rand.Read(salt); err != nil {
return -1, err
@@ -35,16 +38,45 @@ func (service *userService) RegisterUser(user *models.User) (int64, error) {
return -1, err
}
user.Password = string(hashedPassword) */
user.Password = ""
user.Status = "unverified"
user.CreatedAt = time.Now()
user.UpdatedAt = time.Now()
return service.repo.CreateUser(user)
id, err := service.repo.CreateUser(user)
if err != nil {
return -1, "", err
}
user.ID = id
token, err := utils.GenerateVerificationToken()
if err != nil {
return -1, "", err
}
logger.Info.Printf("user: %+v", user)
_, err = service.repo.SetVerificationToken(user, &token)
if err != nil {
return -1, "", err
}
return id, token, nil
}
func (service *userService) VerifyUser(token *string) (*models.User, error) {
userID, err := service.repo.VerifyUserOfToken(token)
if err != nil {
return nil, err
}
user, err := service.repo.FindUserByID(userID)
if err != nil {
return nil, err
}
return user, nil
}
/* 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