opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-06-03 10:54:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Skip email domain check when admins edit user emails (#29609)

Browse Source 
Follow #29522

Administrators should be able to set a user's email address even if the
email address is not in `EMAIL_DOMAIN_ALLOWLIST`
This commit is contained in:
Zettat123
2024-03-06 00:51:56 +08:00
committed by GitHub
parent ebff37ae09
commit 136dd99e86
6 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/user/email.go
View File

@ -14,12 +14,13 @@ import (
"code.gitea.io/gitea/modules/util"
)
func AddOrSetPrimaryEmailAddress(ctx context.Context, u *user_model.User, emailStr string) error {
// AdminAddOrSetPrimaryEmailAddress is used by admins to add or set a user's primary email address
func AdminAddOrSetPrimaryEmailAddress(ctx context.Context, u *user_model.User, emailStr string) error {
if strings.EqualFold(u.Email, emailStr) {
return nil
}
if err := user_model.ValidateEmail(emailStr); err != nil {
if err := user_model.ValidateEmailForAdmin(emailStr); err != nil {
return err
}