Only rename a user when they should receive a different name (#32247)

Fix #31996
pull/32242/head^2
Lunny Xiao 1 month ago committed by GitHub
parent 6fced33581
commit 9df5ddaf44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      services/user/user.go

@ -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
} }

Loading…
Cancel
Save