diff options
Diffstat (limited to 'src/user/hooks.go')
| -rw-r--r-- | src/user/hooks.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/user/hooks.go b/src/user/hooks.go index 1552760..61e24bc 100644 --- a/src/user/hooks.go +++ b/src/user/hooks.go @@ -4,23 +4,21 @@ import ( "context" validation "github.com/go-ozzo/ozzo-validation/v4" - "github.com/go-ozzo/ozzo-validation/v4/is" "github.com/volatiletech/sqlboiler/v4/boil" "gitlab.com/alexkavon/newsstand/src/models" ) func init() { - models.AddUserHook(boil.BeforeInsertHook, validate) + models.AddUserHook(boil.BeforeInsertHook, validateNew) // should always be last models.AddUserHook(boil.BeforeInsertHook, hashSecretBeforeInsert) } -func validate(ctx context.Context, exec boil.ContextExecutor, u *models.User) error { +func validateNew(ctx context.Context, exec boil.ContextExecutor, u *models.User) error { // validate user err := validation.ValidateStruct(u, validation.Field(&u.Username, validation.Required, validation.Length(3, 50)), validation.Field(&u.Secret, validation.Required, validation.Length(8, 128)), - validation.Field(&u.Email, validation.Required, is.Email), ) if err != nil { return err @@ -30,7 +28,7 @@ func validate(ctx context.Context, exec boil.ContextExecutor, u *models.User) er } func hashSecretBeforeInsert(ctx context.Context, exec boil.ContextExecutor, u *models.User) error { - hashed, err := HashSecret(u.Secret) + hashed, err := hashSecret(u.Secret) if err != nil { return err } |