Browse Source

Include login_name in adminCreateUser response (#20283)

`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.
tags/v1.18.0-rc0
Baekjun Kim 1 year ago
parent
commit
e35a39e81d
No account linked to committer's email address
3 changed files with 10 additions and 0 deletions
  1. 1
    0
      modules/convert/user.go
  2. 3
    0
      modules/structs/user.go
  3. 6
    0
      templates/swagger/v1_json.tmpl

+ 1
- 0
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
if authed {
result.IsAdmin = user.IsAdmin
result.LoginName = user.LoginName
result.LastLogin = user.LastLoginUnix.AsTime()
result.Language = user.Language
result.IsActive = user.IsActive

+ 3
- 0
modules/structs/user.go View File

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

+ 6
- 0
templates/swagger/v1_json.tmpl View File

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

Loading…
Cancel
Save