timetracker update

app/service/authService/auth.go

@@ -13,7 +13,7 @@ import (
 	"git.ma-al.com/goc_marek/timetracker/app/model"
 	"git.ma-al.com/goc_marek/timetracker/app/service/emailService"
 	constdata "git.ma-al.com/goc_marek/timetracker/app/utils/const_data"
-	"git.ma-al.com/goc_marek/timetracker/app/view"
+	"git.ma-al.com/goc_marek/timetracker/app/utils/responseErrors"
 
 	"github.com/dlclark/regexp2"
 	"github.com/golang-jwt/jwt/v5"
@@ -60,23 +60,23 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	// Find user by email
 	if err := s.db.Where("email = ?", req.Email).First(&user).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, "", view.ErrInvalidCredentials
+			return nil, "", responseErrors.ErrInvalidCredentials
 		}
 		return nil, "", fmt.Errorf("database error: %w", err)
 	}
 	// Check if user is active
 	if !user.IsActive {
-		return nil, "", view.ErrUserInactive
+		return nil, "", responseErrors.ErrUserInactive
 	}
 
 	// Check if email is verified
 	if !user.EmailVerified {
-		return nil, "", view.ErrEmailNotVerified
+		return nil, "", responseErrors.ErrEmailNotVerified
 	}
 
 	// Verify password
 	if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(req.Password)); err != nil {
-		return nil, "", view.ErrInvalidCredentials
+		return nil, "", responseErrors.ErrInvalidCredentials
 	}
 
 	// Update last login time
@@ -109,17 +109,17 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 	// Check if email already exists
 	var existingUser model.Customer
 	if err := s.db.Where("email = ?", req.Email).First(&existingUser).Error; err == nil {
-		return view.ErrEmailExists
+		return responseErrors.ErrEmailExists
 	}
 
 	// Validate passwords match
 	if req.Password != req.ConfirmPassword {
-		return view.ErrPasswordsDoNotMatch
+		return responseErrors.ErrPasswordsDoNotMatch
 	}
 
 	// Validate password strength
 	if err := validatePassword(req.Password); err != nil {
-		return view.ErrInvalidPassword
+		return responseErrors.ErrInvalidPassword
 	}
 
 	// Hash password
@@ -176,14 +176,14 @@ func (s *AuthService) CompleteRegistration(req *model.CompleteRegistrationReques
 	var user model.Customer
 	if err := s.db.Where("email_verification_token = ?", req.Token).First(&user).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, "", view.ErrInvalidVerificationToken
+			return nil, "", responseErrors.ErrInvalidVerificationToken
 		}
 		return nil, "", fmt.Errorf("database error: %w", err)
 	}
 
 	// Check if token is expired
 	if user.EmailVerificationExpires != nil && user.EmailVerificationExpires.Before(time.Now()) {
-		return nil, "", view.ErrVerificationTokenExpired
+		return nil, "", responseErrors.ErrVerificationTokenExpired
 	}
 
 	// Update user - activate account and mark email as verified
@@ -283,19 +283,19 @@ func (s *AuthService) ResetPassword(token, newPassword string) error {
 	var user model.Customer
 	if err := s.db.Where("password_reset_token = ?", token).First(&user).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return view.ErrInvalidResetToken
+			return responseErrors.ErrInvalidResetToken
 		}
 		return fmt.Errorf("database error: %w", err)
 	}
 
 	// Check if token is expired
 	if user.PasswordResetExpires == nil || user.PasswordResetExpires.Before(time.Now()) {
-		return view.ErrResetTokenExpired
+		return responseErrors.ErrResetTokenExpired
 	}
 
 	// Validate new password
 	if err := validatePassword(newPassword); err != nil {
-		return view.ErrInvalidPassword
+		return responseErrors.ErrInvalidPassword
 	}
 
 	// Hash new password
@@ -330,14 +330,14 @@ func (s *AuthService) ValidateToken(tokenString string) (*JWTClaims, error) {
 
 	if err != nil {
 		if errors.Is(err, jwt.ErrTokenExpired) {
-			return nil, view.ErrTokenExpired
+			return nil, responseErrors.ErrTokenExpired
 		}
-		return nil, view.ErrInvalidToken
+		return nil, responseErrors.ErrInvalidToken
 	}
 
 	claims, ok := token.Claims.(*JWTClaims)
 	if !ok || !token.Valid {
-		return nil, view.ErrInvalidToken
+		return nil, responseErrors.ErrInvalidToken
 	}
 
 	return claims, nil
@@ -352,7 +352,7 @@ func (s *AuthService) RefreshToken(rawToken string) (*model.AuthResponse, string
 	var rt model.RefreshToken
 	if err := s.db.Where("token_hash = ?", tokenHash).First(&rt).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, "", view.ErrInvalidToken
+			return nil, "", responseErrors.ErrInvalidToken
 		}
 		return nil, "", fmt.Errorf("database error: %w", err)
 	}
@@ -361,21 +361,21 @@ func (s *AuthService) RefreshToken(rawToken string) (*model.AuthResponse, string
 	if rt.ExpiresAt.Before(time.Now()) {
 		// Clean up expired token
 		s.db.Delete(&rt)
-		return nil, "", view.ErrTokenExpired
+		return nil, "", responseErrors.ErrTokenExpired
 	}
 
 	// Get user from database
 	var user model.Customer
 	if err := s.db.First(&user, rt.CustomerID).Error; err != nil {
-		return nil, "", view.ErrUserNotFound
+		return nil, "", responseErrors.ErrUserNotFound
 	}
 
 	if !user.IsActive {
-		return nil, "", view.ErrUserInactive
+		return nil, "", responseErrors.ErrUserInactive
 	}
 
 	if !user.EmailVerified {
-		return nil, "", view.ErrEmailNotVerified
+		return nil, "", responseErrors.ErrEmailNotVerified
 	}
 
 	// Delete the old refresh token (rotation: one-time use)
@@ -420,7 +420,7 @@ func (s *AuthService) GetUserByID(userID uint) (*model.Customer, error) {
 	var user model.Customer
 	if err := s.db.First(&user, userID).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, view.ErrUserNotFound
+			return nil, responseErrors.ErrUserNotFound
 		}
 		return nil, fmt.Errorf("database error: %w", err)
 	}
@@ -432,7 +432,7 @@ func (s *AuthService) GetUserByEmail(email string) (*model.Customer, error) {
 	var user model.Customer
 	if err := s.db.Where("email = ?", email).First(&user).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, view.ErrUserNotFound
+			return nil, responseErrors.ErrUserNotFound
 		}
 		return nil, fmt.Errorf("database error: %w", err)
 	}