Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include login_name in adminCreateUser response #20283

Merged
merged 12 commits into from
Jul 15, 2022
Merged

Include login_name in adminCreateUser response #20283

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
044ce37
Include login_name in adminCreateUser response
Jul 7, 2022
2820ac3
generate swagger
Jul 7, 2022
9347835
Update v1_json.tmpl
wxiaoguang Jul 8, 2022
7835284
Merge branch 'main' into return-login-name
6543 Jul 12, 2022
23cdfc9
expose login_name to admin and user itself only
Jul 13, 2022
4443593
Merge branch 'return-login-name' of https://github.com/kimbj95/gitea …
Jul 13, 2022
f4efad8
add missing case
Jul 13, 2022
ecdf8ea
Fix structure and comment
Jul 14, 2022
30efc96
Merge branch 'master' into return-login-name
6543 Jul 14, 2022
96c4c9c
modules/structs/user.go
6543 Jul 14, 2022
1826021
Merge branch 'main' into return-login-name
zeripath Jul 14, 2022
54a5d35
Merge branch 'main' into return-login-name
wxiaoguang Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions modules/convert/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ func toUser(user *user_model.User, signed, authed bool) *api.User {
StarredRepos: user.NumStars,
}

if authed {
result.LoginName = user.LoginName
kimbj95 marked this conversation as resolved.
Show resolved Hide resolved
} else {
result.LoginName = ""
kimbj95 marked this conversation as resolved.
Show resolved Hide resolved
}

result.Visibility = user.Visibility.String()

// hide primary email if API caller is anonymous or user keep email private
Expand Down
2 changes: 2 additions & 0 deletions modules/structs/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ type User struct {
ID int64 `json:"id"`
// the user's username
UserName string `json:"login"`
// the user's login name
kimbj95 marked this conversation as resolved.
Show resolved Hide resolved
LoginName string `json:"login_name"`
// the user's full name
FullName string `json:"full_name"`
// swagger:strfmt email
Expand Down
5 changes: 5 additions & 0 deletions templates/swagger/v1_json.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18479,6 +18479,11 @@
"type": "string",
"x-go-name": "UserName"
},
"login_name": {
"description": "the user's login name",
"type": "string",
"x-go-name": "LoginName"
},
"prohibit_login": {
"description": "Is user login prohibited",
"type": "boolean",
Expand Down