From a797dd169ed3b01a2d9394862356c4319b9bcc50 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 16 Apr 2024 02:35:04 +0000 Subject: [PATCH 1/2] fix --- 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 cfa74d25f2279..477cd28e9db2a 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -31,7 +31,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 } @@ -48,7 +48,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 @@ -84,12 +83,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 } From 8eadcb8fa5b611e6950fd3a151e543e2fbd5051c Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 17 Apr 2024 00:00:53 +0000 Subject: [PATCH 2/2] fix lint --- routers/api/v1/admin/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 477cd28e9db2a..6dd60f5c9904f 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -192,7 +192,7 @@ func EditUser(ctx *context.APIContext) { form := web.GetForm(ctx).(*api.EditUserOption) - parseAuthSource(ctx, ctx.ContextUser, form.SourceID, form.LoginName) + parseAuthSource(ctx, ctx.ContextUser, form.SourceID) if ctx.Written() { return }