github-mirror/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-22 08:59:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Only rename a user when they should receive a different name (#32247) (#32249)
Some checks are pending
release-nightly / disk-clean (push) Waiting to run
Details
release-nightly / nightly-binary (push) Waiting to run
Details
release-nightly / nightly-docker-rootful (push) Waiting to run
Details
release-nightly / nightly-docker-rootless (push) Waiting to run
Details

Browse Source 
Backport #32247 by @lunny

Fix #31996

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Giteabot 2024-10-14 03:27:37 +08:00 committed by GitHub
parent bcfe1f91d2
commit 24b65f122a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/user/user.go
View File

@ -32,6 +32,10 @@ import (
// RenameUser renames a user // RenameUser renames a user
func RenameUser(ctx context.Context, u *user_model.User, newUserName string) error { func RenameUser(ctx context.Context, u *user_model.User, newUserName string) error {
if newUserName == u.Name {
return nil
}
// Non-local users are not allowed to change their username. // Non-local users are not allowed to change their username.
if !u.IsOrganization() && !u.IsLocal() { if !u.IsOrganization() && !u.IsLocal() {
return user_model.ErrUserIsNotLocal{ return user_model.ErrUserIsNotLocal{
@ -40,10 +44,6 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err
} }
} }
if newUserName == u.Name {
return nil
}
if err := user_model.IsUsableUsername(newUserName); err != nil { if err := user_model.IsUsableUsername(newUserName); err != nil {
return err return err
} }