Skip to content

Include all email data in 'extra' response #41

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

Closed
wants to merge 1 commit into from
Closed

Include all email data in 'extra' response #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions lib/omniauth/strategies/github.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ def authorize_params
{
'nickname' => raw_info['login'],
'email' => email,
'email_verified' => @email_verified || false,
Copy link
Author

@riking riking Sep 2, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes nil values to be changed into false.

Copy link

@SamSaffron SamSaffron Sep 3, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

usual approach is !!(something)

'display_email' => raw_info['email'],
'name' => raw_info['name'],
'image' => raw_info['avatar_url'],
'urls' => {
Expand All @@ -39,7 +41,7 @@ def authorize_params
end

extra do
{:raw_info => raw_info}
{:raw_info => raw_info, :all_emails => emails}
end

def raw_info
Expand All @@ -48,12 +50,16 @@ def raw_info
end

def email
(email_access_allowed?) ? primary_email : raw_info['email']
(email_access_allowed?) ? primary_email : raw_info['email']
end

def primary_email
primary = emails.find{|i| i['primary'] }
primary && primary['email'] || emails.first && emails.first['email']
primary = emails.find { |i| i['primary'] }
if primary && primary['email']
@email_verified = primary['verified']
return primary['email']
end
emails.first && emails.first['email']
end

# The new /user/emails API - http://developer.github.com/v3/users/emails/#future-response
Expand Down