From 8f61fce93870fe5ca7d88447b2139b873ce001aa Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 13 Oct 2024 11:13:55 +0800
Subject: [PATCH] Only rename a user when they should receive a different name
(#32247)
Fix #31996
(cherry picked from commit 9df5ddaf44aa5a3f319acba7b18645b7b1d4d8a2)
---
services/user/user.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/services/user/user.go b/services/user/user.go
index 4e983eb9f6..606a4b2137 100644
--- a/services/user/user.go
+++ b/services/user/user.go
@@ -33,6 +33,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{
@@ -41,10 +45,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
}