Skip to content

Commit 5d9e03b

Browse files
authored
show emails in executions endpoint (#1165)
1 parent 4d25b56 commit 5d9e03b

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

lib/travis/api/v3/renderer/user.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ class Renderer::User < Renderer::Owner
66
representation(:additional, :emails)
77

88
def email
9-
@model.email if current_user?
9+
@model.email if show_emails?
1010
end
1111

1212
def emails
13-
current_user? ? @model.emails.map(&:email) : []
13+
show_emails? ? @model.emails.map(&:email) : []
1414
end
1515

1616
def secure_user_hash
@@ -20,6 +20,10 @@ def secure_user_hash
2020

2121
private
2222

23+
def show_emails?
24+
current_user? || options[:show_email] == true
25+
end
26+
2327
def current_user?
2428
access_control.class == Travis::API::V3::AccessControl::LegacyToken && access_control.user.id == @model.id
2529
end

lib/travis/api/v3/services/executions/for_owner_per_sender.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def recuce_by_sender(results) # rubocop:disable Metrics/AbcSize, Metrics/MethodL
3131
credits_consumed: item.credits_consumed,
3232
minutes_consumed: minutes_consumed,
3333
sender_id: item.sender_id,
34-
sender: Renderer.render_model(sender, mode: :standard)
34+
sender: Renderer.render_model(sender, mode: :standard, show_email: true)
3535
}
3636
end
3737
end

spec/v3/services/v2_subscription/executions_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"@representation"=>"minimal",
171171
"id"=>1
172172
},
173-
"email"=>nil,
173+
"email"=>"[email protected]",
174174
"is_syncing"=>nil,
175175
"synced_at"=>nil,
176176
"recently_signed_up"=>false,

0 commit comments

Comments
 (0)