Fix empty field login_name
in API response JSON when creating user (#30511)
Fix #30508 ps: if `sourceID` is not set, `LoginName` will be ignored (cherry picked from commit cf9061f44a439aa7775e301a7467dbda22a06eaa)
This commit is contained in:
parent
e025ec0131
commit
3662829cc9
@ -30,7 +30,7 @@ import (
|
|||||||
user_service "code.gitea.io/gitea/services/user"
|
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 {
|
if sourceID == 0 {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -47,7 +47,6 @@ func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64
|
|||||||
|
|
||||||
u.LoginType = source.Type
|
u.LoginType = source.Type
|
||||||
u.LoginSource = source.ID
|
u.LoginSource = source.ID
|
||||||
u.LoginName = loginName
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateUser create a user
|
// CreateUser create a user
|
||||||
@ -83,12 +82,13 @@ func CreateUser(ctx *context.APIContext) {
|
|||||||
Passwd: form.Password,
|
Passwd: form.Password,
|
||||||
MustChangePassword: true,
|
MustChangePassword: true,
|
||||||
LoginType: auth.Plain,
|
LoginType: auth.Plain,
|
||||||
|
LoginName: form.LoginName,
|
||||||
}
|
}
|
||||||
if form.MustChangePassword != nil {
|
if form.MustChangePassword != nil {
|
||||||
u.MustChangePassword = *form.MustChangePassword
|
u.MustChangePassword = *form.MustChangePassword
|
||||||
}
|
}
|
||||||
|
|
||||||
parseAuthSource(ctx, u, form.SourceID, form.LoginName)
|
parseAuthSource(ctx, u, form.SourceID)
|
||||||
if ctx.Written() {
|
if ctx.Written() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user