Setting loginName in parseAuthSource if provided

me-heer · me-heer · commit 9e3009e7d3e6 · 2024-01-20T19:36:30.000+05:30
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
@@ -48,7 +48,9 @@ func parseAuthSource(ctx *context.APIContext, u *user_model.User, sourceID int64
 
 	u.LoginType = source.Type
 	u.LoginSource = source.ID
-	u.LoginName = loginName
+	if len(loginName) > 0 {
+		u.LoginName = loginName
+	}
 }
 
 // CreateUser create a user
@@ -229,10 +231,6 @@ func EditUser(ctx *context.APIContext) {
 		ctx.ContextUser.MustChangePassword = *form.MustChangePassword
 	}
 
-	if len(form.LoginName) != 0 {
-		ctx.ContextUser.LoginName = form.LoginName
-	}
-
 	if form.FullName != nil {
 		ctx.ContextUser.FullName = *form.FullName
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,9 @@ func parseAuthSource(ctx context.APIContext, u user_model.User, sourceID int64`
`48`	`48`
`49`	`49`	`u.LoginType = source.Type`
`50`	`50`	`u.LoginSource = source.ID`
`51`		`- u.LoginName = loginName`
	`51`	`+ if len(loginName) > 0 {`
	`52`	`+ u.LoginName = loginName`
	`53`	`+ }`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`// CreateUser create a user`
`@@ -229,10 +231,6 @@ func EditUser(ctx *context.APIContext) {`
`229`	`231`	`ctx.ContextUser.MustChangePassword = *form.MustChangePassword`
`230`	`232`	`}`
`231`	`233`
`232`		`- if len(form.LoginName) != 0 {`
`233`		`- ctx.ContextUser.LoginName = form.LoginName`
`234`		`- }`
`235`		`-`
`236`	`234`	`if form.FullName != nil {`
`237`	`235`	`ctx.ContextUser.FullName = *form.FullName`
`238`	`236`	`}`