From 9de4bebbf76c93937d82758524064f9e9e0becbd Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 17 Apr 2024 01:34:48 +0800 Subject: [PATCH] Fix empty field `login_name` in API response JSON when creating user (#30511) (#30516) Backport #30511 by @yp05327 Fix #30508 ps: if `sourceID` is not set, `LoginName` will be ignored Co-authored-by: yp05327 <576951401@qq.com> (cherry picked from commit f9a025f6a358aa6e34408743a59f5081f397d47c) --- routers/api/v1/admin/user.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 12da8a9597..98c9a2697f 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -30,7 +30,7 @@ import ( user_service "code.gitea.io/gitea/services/user" ) -func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64, loginName string) { +func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64) { if sourceID == 0 { return } @@ -47,7 +47,6 @@ func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64 u.LoginType = source.Type u.LoginSource = source.ID - u.LoginName = loginName } // CreateUser create a user @@ -83,12 +82,13 @@ func CreateUser(ctx *context.APIContext) { Passwd: form.Password, MustChangePassword: true, LoginType: auth.Plain, + LoginName: form.LoginName, } if form.MustChangePassword != nil { u.MustChangePassword = *form.MustChangePassword } - parseAuthSource(ctx, u, form.SourceID, form.LoginName) + parseAuthSource(ctx, u, form.SourceID) if ctx.Written() { return }