bjoernager/forgejo
bjoernager/forgejo
1
Fork 0
Code Activity

fix: use ValidateEmail as binding across web forms

Browse source
This commit is contained in:
Solomon Victorino 2024-08-28 16:56:35 -06:00
parent df907ec7f9
commit 471567b3ba
24 changed files with 281 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

7
services/user/email.go
View file

@ -12,6 +12,7 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/validation"
"code.gitea.io/gitea/services/mailer"
)
@ -21,7 +22,7 @@ func AdminAddOrSetPrimaryEmailAddress(ctx context.Context, u *user_model.User, e
return nil
}
if err := user_model.ValidateEmailForAdmin(emailStr); err != nil {
if err := validation.ValidateEmailForAdmin(emailStr); err != nil {
return err
}
@ -74,7 +75,7 @@ func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailSt
return nil
}
if err := user_model.ValidateEmail(emailStr); err != nil {
if err := validation.ValidateEmail(emailStr); err != nil {
return err
}
@ -119,7 +120,7 @@ func ReplacePrimaryEmailAddress(ctx context.Context, u *user_model.User, emailSt
func AddEmailAddresses(ctx context.Context, u *user_model.User, emails []string) error {
for _, emailStr := range emails {
if err := user_model.ValidateEmail(emailStr); err != nil {
if err := validation.ValidateEmail(emailStr); err != nil {
return err
}