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

Fix what information is shown about user in API. #9115

Merged
merged 5 commits into from
Nov 24, 2019
Merged

Fix what information is shown about user in API. #9115

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
775676d
Fix what information is shown about user in API.
davidsvantesson Nov 21, 2019
c2464b8
Use Email directly, as KeepEmailPrivate is already handled.
davidsvantesson Nov 22, 2019
3808bd8
Merge branch 'master' into api-user-information
lunny Nov 22, 2019
e04e89a
Merge branch 'master' into api-user-information
lunny Nov 23, 2019
382e08d
Merge branch 'master' into api-user-information
techknowlogick Nov 24, 2019
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
Prev Previous commit
Next Next commit
Use Email directly, as KeepEmailPrivate is already handled.
  • Loading branch information
@davidsvantesson
davidsvantesson committed Nov 22, 2019
commit c2464b83889a3ba7433ad08f662a322452a46f5d
2 changes: 1 addition & 1 deletion modules/convert/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ func ToUser(user *models.User, signed, authed bool) *api.User {
}
// hide primary email if API caller is anonymous or user keep email private
if signed && (!user.KeepEmailPrivate || authed) {
zeripath marked this conversation as resolved.
Show resolved Hide resolved
result.Email = user.GetEmail()
result.Email = user.Email
}
// only site admin will get these information and possibly user himself
if authed {
Expand Down