Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Include login_name in adminCreateUser response (#20283)

Browse Source 
`login_name` (Authentication Sign-in Name) is not included in the response of `adminUserCreate` API. 
This PR is to return user-specified `login_name` if there is one.
This commit is contained in:
Baekjun Kim 2022-07-15 01:52:11 -07:00 committed by GitHub
parent e49ef56dde
commit e35a39e81d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/convert/user.go
View File

@ -73,6 +73,7 @@ func toUser(user *user_model.User, signed, authed bool) *api.User {
// only site admin will get these information and possibly user himself // only site admin will get these information and possibly user himself
if authed { if authed {
result.IsAdmin = user.IsAdmin result.IsAdmin = user.IsAdmin
result.LoginName = user.LoginName
result.LastLogin = user.LastLoginUnix.AsTime() result.LastLogin = user.LastLoginUnix.AsTime()
result.Language = user.Language result.Language = user.Language
result.IsActive = user.IsActive result.IsActive = user.IsActive

3
modules/structs/user.go
View File

@ -17,6 +17,9 @@ type User struct {
ID int64 `json:"id"` ID int64 `json:"id"`
// the user's username // the user's username
UserName string `json:"login"` UserName string `json:"login"`
// the user's authentication sign-in name.
// default: empty
LoginName string `json:"login_name"`
// the user's full name // the user's full name
FullName string `json:"full_name"` FullName string `json:"full_name"`
// swagger:strfmt email // swagger:strfmt email

6
templates/swagger/v1_json.tmpl
View File

@ -18487,6 +18487,12 @@
"type": "string", "type": "string",
"x-go-name": "UserName" "x-go-name": "UserName"
}, },
"login_name": {
"description": "the user's authentication sign-in name.",
"type": "string",
"default": "empty",
"x-go-name": "LoginName"
},
"prohibit_login": { "prohibit_login": {
"description": "Is user login prohibited", "description": "Is user login prohibited",
"type": "boolean", "type": "boolean",