luckyimnotanigger/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-17 11:59:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix database inconsistent when admin change user email (#17549)

Browse source
This commit is contained in:
Lunny Xiao 2021-11-26 09:56:16 +08:00 • committed by GitHub
parent f23851f690
commit 371ebce252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 62 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import (
"errors"
"fmt"
"net/http"
"strings"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
@ -203,12 +204,21 @@ func EditUser(ctx *context.APIContext) {
if form.FullName != nil {
u.FullName = *form.FullName
}
var emailChanged bool
if form.Email != nil {
u.Email = *form.Email
if len(u.Email) == 0 {
email := strings.TrimSpace(*form.Email)
if len(email) == 0 {
ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("email is not allowed to be empty string"))
return
}
if err := user_model.ValidateEmail(email); err != nil {
ctx.InternalServerError(err)
return
}
emailChanged = !strings.EqualFold(u.Email, email)
u.Email = email
}
if form.Website != nil {
u.Website = *form.Website
@ -247,7 +257,7 @@ func EditUser(ctx *context.APIContext) {
u.IsRestricted = *form.Restricted
}
if err := user_model.UpdateUser(u); err != nil {
if err := user_model.UpdateUser(u, emailChanged); err != nil {
if user_model.IsErrEmailAlreadyUsed(err) || user_model.IsErrEmailInvalid(err) {
ctx.Error(http.StatusUnprocessableEntity, "", err)
} else {

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

@ -74,7 +74,7 @@ func UpdateUserSettings(ctx *context.APIContext) {
ctx.User.KeepActivityPrivate = *form.HideActivity
}
if err := user_model.UpdateUser(ctx.User); err != nil {
if err := user_model.UpdateUser(ctx.User, false); err != nil {
ctx.InternalServerError(err)
return
}