Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e9283b
Only rename a user when they should receive a different name (#32247)
lunny Oct 13, 2024
4363f8c
Merge branch 'release/v1.22' into backport-32247-v1.22
GiteaBot Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions services/user/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ import (

// RenameUser renames a user
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.
if !u.IsOrganization() && !u.IsLocal() {
return user_model.ErrUserIsNotLocal{
Expand All @@ -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 {
return err
}
Expand Down