nune/gitea
nune/gitea
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 53 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routers/api/v1/admin/user.go
View file

@ -209,7 +209,7 @@ func EditUser(ctx *context.APIContext) {
}
if form.Email != nil {
if err := user_service.AddOrSetPrimaryEmailAddress(ctx, ctx.ContextUser, *form.Email); err != nil {
if err := user_service.AdminAddOrSetPrimaryEmailAddress(ctx, ctx.ContextUser, *form.Email); err != nil {
switch {
case user_model.IsErrEmailCharIsNotSupported(err), user_model.IsErrEmailInvalid(err):
ctx.Error(http.StatusBadRequest, "EmailInvalid", err)