backend: moved setpassword to user model
This commit is contained in:
@@ -8,7 +8,6 @@ import (
|
||||
"GoMembership/internal/repositories"
|
||||
"GoMembership/pkg/errors"
|
||||
|
||||
"github.com/alexedwards/argon2id"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"time"
|
||||
@@ -55,9 +54,7 @@ func (service *UserService) UpdateUser(user *models.User) (*models.User, error)
|
||||
return nil, errors.ErrUserNotFound
|
||||
}
|
||||
|
||||
if user.Password != "" {
|
||||
setPassword(user.Password, user)
|
||||
}
|
||||
user.SetPassword(user.Password)
|
||||
|
||||
// Validate subscription model
|
||||
selectedModel, err := repositories.GetSubscriptionByName(&user.Membership.SubscriptionModel.Name)
|
||||
@@ -84,7 +81,7 @@ func (service *UserService) UpdateUser(user *models.User) (*models.User, error)
|
||||
|
||||
func (service *UserService) RegisterUser(user *models.User) (id uint, token string, err error) {
|
||||
|
||||
setPassword(user.Password, user)
|
||||
user.SetPassword(user.Password)
|
||||
|
||||
user.Status = constants.UnverifiedStatus
|
||||
user.CreatedAt = time.Now()
|
||||
@@ -117,12 +114,3 @@ func (service *UserService) GetUsers(where map[string]interface{}) (*[]models.Us
|
||||
}
|
||||
return service.Repo.GetUsers(where)
|
||||
}
|
||||
|
||||
func setPassword(plaintextPassword string, u *models.User) error {
|
||||
hash, err := argon2id.CreateHash(plaintextPassword, argon2id.DefaultParams)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
u.Password = hash
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user