refac: reamaining auth surface rewrite, T0

internal/infrastructure/persistence/mappers/userMapper.go

@@ -21,29 +21,31 @@ func DomainToNullableString(value string) *string {
 
 func UserToDomain(m models.User) user.User {
 	return user.User{
-		ID:                     m.ID,
-		Username:               m.Username,
-		Password:               m.Password,
-		PasswordResetCode:      nullableStringToDomain(m.PasswordResetCode),
-		Email:                  m.Email,
-		IsVerified:             m.IsVerified,
-		VerificationCode:       nullableStringToDomain(m.VerificationCode),
-		VerificationExpiration: m.VerificationExpiration,
-		CreatedAt:              m.CreatedAt,
-		UpdatedAt:              m.UpdatedAt,
+		ID:                      m.ID,
+		Username:                m.Username,
+		Password:                m.Password,
+		PasswordResetCode:       nullableStringToDomain(m.PasswordResetCode),
+		Email:                   m.Email,
+		IsVerified:              m.IsVerified,
+		VerificationCode:        nullableStringToDomain(m.VerificationCode),
+		VerificationExpiration:  m.VerificationExpiration,
+		PasswordResetExpiration: m.PasswordResetExpiration,
+		CreatedAt:               m.CreatedAt,
+		UpdatedAt:               m.UpdatedAt,
 	}
 }
 
 func UserToModel(a user.User) models.User {
 	return models.User{
-		Username:               a.Username,
-		Password:               a.Password,
-		PasswordResetCode:      DomainToNullableString(a.PasswordResetCode),
-		Email:                  a.Email,
-		IsVerified:             a.IsVerified,
-		VerificationCode:       DomainToNullableString(a.VerificationCode),
-		VerificationExpiration: a.VerificationExpiration,
-		CreatedAt:              a.CreatedAt,
-		UpdatedAt:              a.UpdatedAt,
+		Username:                a.Username,
+		Password:                a.Password,
+		PasswordResetCode:       DomainToNullableString(a.PasswordResetCode),
+		Email:                   a.Email,
+		IsVerified:              a.IsVerified,
+		VerificationCode:        DomainToNullableString(a.VerificationCode),
+		VerificationExpiration:  a.VerificationExpiration,
+		PasswordResetExpiration: a.PasswordResetExpiration,
+		CreatedAt:               a.CreatedAt,
+		UpdatedAt:               a.UpdatedAt,
 	}
 }

internal/infrastructure/persistence/models/userModel.go

@@ -5,14 +5,15 @@ import (
 )
 
 type User struct {
-	ID                     uint32  `gorm:"primaryKey;autoIncrement"`
-	Username               string  `gorm:"unique;not null"`
-	Password               string  `gorm:"not null"`
-	PasswordResetCode      *string `gorm:"unique"`
-	Email                  string  `gorm:"unique;not null"`
-	IsVerified             bool    `gorm:"default=false;not null"`
-	VerificationCode       *string `gorm:"unique"`
-	VerificationExpiration time.Time
-	CreatedAt              time.Time `gorm:"autoCreateTime"`
-	UpdatedAt              time.Time `gorm:"autoUpdateTime"`
+	ID                      uint32  `gorm:"primaryKey;autoIncrement"`
+	Username                string  `gorm:"unique;not null"`
+	Password                string  `gorm:"not null"`
+	PasswordResetCode       *string `gorm:"unique"`
+	Email                   string  `gorm:"unique;not null"`
+	IsVerified              bool    `gorm:"default=false;not null"`
+	VerificationCode        *string `gorm:"unique"`
+	VerificationExpiration  time.Time
+	PasswordResetExpiration time.Time
+	CreatedAt               time.Time `gorm:"autoCreateTime"`
+	UpdatedAt               time.Time `gorm:"autoUpdateTime"`
 }

internal/infrastructure/persistence/repositories/userRepository.go

@@ -4,6 +4,7 @@ import (
 	domainUser "RenewCMS/internal/domain/user"
 	"RenewCMS/internal/infrastructure/persistence/mappers"
 	entity "RenewCMS/internal/infrastructure/persistence/models"
+	"time"
 
 	"gorm.io/gorm"
 )
@@ -115,7 +116,7 @@ func (u *UserRepository) UpdatePassword(userId uint32, password string) (domainU
 	return mappers.UserToDomain(localUser), nil
 }
 
-func (u *UserRepository) UpdatePasswordResetCode(userId uint32, code string) (domainUser.User, error) {
+func (u *UserRepository) UpdatePasswordResetCode(userId uint32, code string, expiration time.Time) (domainUser.User, error) {
 	var localUser entity.User
 	err := u.db.Model(&entity.User{}).First(&localUser, userId).Error
 	if err != nil {
@@ -123,6 +124,42 @@ func (u *UserRepository) UpdatePasswordResetCode(userId uint32, code string) (do
 	}
 
 	localUser.PasswordResetCode = mappers.DomainToNullableString(code)
+	localUser.PasswordResetExpiration = expiration
+	err = u.db.Save(&localUser).Error
+	if err != nil {
+		return domainUser.User{}, err
+	}
+
+	return mappers.UserToDomain(localUser), nil
+}
+
+func (u *UserRepository) ClearVerificationCode(userId uint32) (domainUser.User, error) {
+	var localUser entity.User
+	err := u.db.Model(&entity.User{}).First(&localUser, userId).Error
+	if err != nil {
+		return domainUser.User{}, mapNotFoundErr(err, domainUser.ErrUserNotFound)
+	}
+
+	localUser.IsVerified = true
+	localUser.VerificationCode = mappers.DomainToNullableString("")
+	err = u.db.Save(&localUser).Error
+	if err != nil {
+		return domainUser.User{}, err
+	}
+
+	return mappers.UserToDomain(localUser), nil
+}
+
+func (u *UserRepository) ResetPassword(userId uint32, hashedPassword string) (domainUser.User, error) {
+	var localUser entity.User
+	err := u.db.Model(&entity.User{}).First(&localUser, userId).Error
+	if err != nil {
+		return domainUser.User{}, mapNotFoundErr(err, domainUser.ErrUserNotFound)
+	}
+
+	localUser.Password = hashedPassword
+	localUser.PasswordResetCode = mappers.DomainToNullableString("")
+	localUser.PasswordResetExpiration = time.Time{}
 	err = u.db.Save(&localUser).Error
 	if err != nil {
 		return domainUser.User{}, err