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

Show email if the authenticated user owns the profile page being requested for #4981

Merged
merged 12 commits into from
Feb 19, 2019
Merged

Show email if the authenticated user owns the profile page being requested for #4981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c2a1a03
Show email if the authenticated user owns the profile page being
adelowo Sep 26, 2018
9368cfc
fix current user check... This prevents a panic as a user must be sig…
adelowo Sep 27, 2018
d09b47d
fix panic in tests
adelowo Dec 9, 2018
c857dd9
try to fix tests
adelowo Dec 9, 2018
ca89f93
Merge branch 'master' into dont_hide_email_from_self
techknowlogick Jan 30, 2019
de8219f
Update year
techknowlogick Jan 30, 2019
282292e
Test CI fail
techknowlogick Jan 30, 2019
95da2bb
Revert change
techknowlogick Jan 30, 2019
c62e8bb
User 3 is not allowed to authorize
lafriks Feb 19, 2019
f046b8d
Merge branch 'master' into dont_hide_email_from_self
techknowlogick Feb 19, 2019
e55a825
Set user2 email to be private
lafriks Feb 19, 2019
8049add
Change to user4 in explore page as user2 now has private email option…
lafriks Feb 19, 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
17 changes: 14 additions & 3 deletions integrations/setting_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) {
htmlDoc := NewHTMLParser(t, resp.Body)
assert.Contains(t,
htmlDoc.doc.Find(".ui.user.list").Text(),
"user2@example.com",
"user4@example.com",
)

setting.UI.ShowUserEmail = false
Expand All @@ -35,7 +35,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) {
htmlDoc = NewHTMLParser(t, resp.Body)
assert.NotContains(t,
htmlDoc.doc.Find(".ui.user.list").Text(),
"user2@example.com",
"user4@example.com",
)

setting.UI.ShowUserEmail = showUserEmail
Expand All @@ -61,12 +61,23 @@ func TestSettingShowUserEmailProfile(t *testing.T) {
req = NewRequest(t, "GET", "/user2")
resp = session.MakeRequest(t, req, http.StatusOK)
htmlDoc = NewHTMLParser(t, resp.Body)
assert.NotContains(t,
// Should contain since this user owns the profile page
assert.Contains(t,
htmlDoc.doc.Find(".user.profile").Text(),
"user2@example.com",
)

setting.UI.ShowUserEmail = showUserEmail

session = loginUser(t, "user4")
req = NewRequest(t, "GET", "/user2")
resp = session.MakeRequest(t, req, http.StatusOK)
htmlDoc = NewHTMLParser(t, resp.Body)
assert.NotContains(t,
htmlDoc.doc.Find(".user.profile").Text(),
"user2@example.com",
)

}

func TestSettingLandingPage(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions models/fixtures/user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
name: user2
full_name: " < U<se>r Tw<o > >< "
email: user2@example.com
keep_email_private: true
passwd: 7d93daa0d1e6f2305cc8fa496847d61dc7320bb16262f9c55dd753480207234cdd96a93194e408341971742f4701772a025a # password
type: 0 # individual
salt: ZogKvWdyEx
Expand Down
2 changes: 1 addition & 1 deletion routers/user/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func Profile(ctx *context.Context) {
}
}

ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail
ctx.Data["ShowUserEmail"] = len(ctxUser.Email) > 0 && ctx.IsSigned && (!ctxUser.KeepEmailPrivate || ctxUser.ID == ctx.User.ID)

ctx.HTML(200, tplProfile)
}
Expand Down
2 changes: 1 addition & 1 deletion templates/user/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{{if .Owner.Location}}
<li><i class="octicon octicon-location"></i> {{.Owner.Location}}</li>
{{end}}
{{if and $.ShowUserEmail .Owner.Email .IsSigned (not .Owner.KeepEmailPrivate)}}
{{if .ShowUserEmail }}
<li>
<i class="octicon octicon-mail"></i>
<a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a>
Expand Down