Merge pull request #22 from kenn/primary_email

email field now returns the user's primary email.

Author: mbleigh

lib/omniauth/strategies/github.rb

@@ -46,12 +46,19 @@ def raw_info
       end
 
       def email
-        raw_info['email'] || (email_access_allowed? ? emails.first : nil)
+        raw_info['email'] || primary_email
       end
 
+      def primary_email
+        primary = emails.find{|i| i['primary'] }
+        primary && primary['email'] || emails.first && emails.first['email']
+      end
+
+      # The new /user/emails API - http://developer.github.com/v3/users/emails/#future-response
       def emails
+        return [] unless email_access_allowed?
         access_token.options[:mode] = :query
-        @emails ||= access_token.get('/user/emails').parsed
+        @emails ||= access_token.get('/user/emails', :headers => { 'Accept' => 'application/vnd.github.v3' }).parsed
       end
 
       def email_access_allowed?

spec/omniauth/strategies/github_spec.rb

@@ -57,11 +57,26 @@
       subject.email.should be_nil
     end
 
+    it "should return the primary email if there is no raw_info and email access is allowed" do
+      emails = [
+        { 'email' => 'secondary@example.com', 'primary' => false },
+        { 'email' => 'primary@example.com',   'primary' => true }
+      ]
+      subject.stub!(:raw_info).and_return({})
+      subject.options['scope'] = 'user'
+      subject.stub!(:emails).and_return(emails)
+      subject.email.should eq('primary@example.com')
+    end
+
     it "should return the first email if there is no raw_info and email access is allowed" do
+      emails = [
+        { 'email' => 'first@example.com',   'primary' => false },
+        { 'email' => 'second@example.com',  'primary' => false }
+      ]
       subject.stub!(:raw_info).and_return({})
       subject.options['scope'] = 'user'
-      subject.stub!(:emails).and_return([ 'you@example.com' ])
-      subject.email.should eq('you@example.com')
+      subject.stub!(:emails).and_return(emails)
+      subject.email.should eq('first@example.com')
     end
   end