added password reset system

internal/services/user_service.go

@@ -1,15 +1,12 @@
 package services
 
 import (
-	"net/http"
 	"strings"
 
 	"GoMembership/internal/constants"
 	"GoMembership/internal/models"
 	"GoMembership/internal/repositories"
-	"GoMembership/internal/utils"
 	"GoMembership/pkg/errors"
-	"GoMembership/pkg/logger"
 
 	"github.com/alexedwards/argon2id"
 	"gorm.io/gorm"
@@ -18,13 +15,17 @@ import (
 )
 
 type UserServiceInterface interface {
-	RegisterUser(user *models.User) (uint, string, error)
+	RegisterUser(user *models.User) (id uint, token string, err error)
 	GetUserByEmail(email string) (*models.User, error)
 	GetUserByID(id uint) (*models.User, error)
 	GetUsers(where map[string]interface{}) (*[]models.User, error)
-	VerifyUser(token *string) (*models.User, error)
 	UpdateUser(user *models.User) (*models.User, error)
 	DeleteUser(lastname string, id uint) error
+	SetUserStatus(id uint, status uint) error
+	VerifyUser(token *string, verificationType *string) (*models.Verification, error)
+	SetVerificationToken(id *uint, verificationType *string) (string, error)
+	RevokeVerification(id *uint, verificationType string) error
+	HandlePasswordChangeRequest(user *models.User) (token string, err error)
 }
 
 type UserService struct {
@@ -81,7 +82,7 @@ func (service *UserService) UpdateUser(user *models.User) (*models.User, error)
 	return updatedUser, nil
 }
 
-func (service *UserService) RegisterUser(user *models.User) (uint, string, error) {
+func (service *UserService) RegisterUser(user *models.User) (id uint, token string, err error) {
 
 	setPassword(user.Password, user)
 
@@ -89,49 +90,20 @@ func (service *UserService) RegisterUser(user *models.User) (uint, string, error
 	user.CreatedAt = time.Now()
 	user.UpdatedAt = time.Now()
 	user.PaymentStatus = constants.AwaitingPaymentStatus
-	// if user.Licence == nil {
-	// 	user.Licence = &models.Licence{Status: constants.UnverifiedStatus}
-	// }
 	user.BankAccount.MandateDateSigned = time.Now()
-	id, err := service.Repo.CreateUser(user)
-
+	id, err = service.Repo.CreateUser(user)
 	if err != nil {
 		return 0, "", err
 	}
 
-	user.ID = id
-
-	token, err := utils.GenerateVerificationToken()
+	token, err = service.SetVerificationToken(&id, &constants.VerificationTypes.Email)
 	if err != nil {
 		return 0, "", err
 	}
-
-	logger.Info.Printf("TOKEN: %v", token)
-
-	// Check if user is already verified
-	verified, err := service.Repo.IsVerified(&user.ID)
-	if err != nil {
-		return 0, "", err
-	}
-	if verified {
-		return 0, "", errors.ErrAlreadyVerified
-	}
-
-	// Prepare the Verification record
-	verification := models.Verification{
-		UserID:            user.ID,
-		VerificationToken: token,
-	}
-
-	if _, err = service.Repo.SetVerificationToken(&verification); err != nil {
-		return http.StatusInternalServerError, "", err
-	}
-
 	return id, token, nil
 }
 
 func (service *UserService) GetUserByID(id uint) (*models.User, error) {
-
 	return repositories.GetUserByID(&id)
 }
 
@@ -146,35 +118,6 @@ func (service *UserService) GetUsers(where map[string]interface{}) (*[]models.Us
 	return service.Repo.GetUsers(where)
 }
 
-func (service *UserService) VerifyUser(token *string) (*models.User, error) {
-	verification, err := service.Repo.GetVerificationOfToken(token)
-	if err != nil {
-		return nil, err
-	}
-	// Check if the user is already verified
-	verified, err := service.Repo.IsVerified(&verification.UserID)
-	if err != nil {
-		return nil, err
-	}
-	user, err := repositories.GetUserByID(&verification.UserID)
-	if err != nil {
-		return nil, err
-	}
-	if verified {
-		return user, errors.ErrAlreadyVerified
-	}
-	// Update user status to active
-	t := time.Now()
-	verification.EmailVerifiedAt = &t
-
-	user.Status = constants.VerifiedStatus
-	user.Verification = *verification
-	user.ID = verification.UserID
-	service.Repo.UpdateUser(user)
-
-	return user, nil
-}
-
 func setPassword(plaintextPassword string, u *models.User) error {
 	hash, err := argon2id.CreateHash(plaintextPassword, argon2id.DefaultParams)
 	if err != nil {