omniauth-google-oauth2 0.1.6 → 0.1.7

data/examples/config.ru

@@ -34,7 +34,6 @@ use Rack::Session::Cookie, :secret => ENV['RACK_COOKIE_SECRET']
 
 use OmniAuth::Builder do
   provider :google_oauth2, ENV['GOOGLE_KEY'], ENV['GOOGLE_SECRET'], {
-    :scope => 'https://www.googleapis.com/auth/plus.me'
   }
 end
 

data/lib/omniauth/google_oauth2.rb

@@ -1,2 +1 @@
-require 'omniauth/google_oauth2/version'
 require 'omniauth/strategies/google_oauth2'

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -3,58 +3,62 @@ require 'omniauth/strategies/oauth2'
 module OmniAuth
   module Strategies
     class GoogleOauth2 < OmniAuth::Strategies::OAuth2
+
+      # Possible scopes: userinfo.email,userinfo.profile,plus.me
+      DEFAULT_SCOPE = "userinfo.email,userinfo.profile"
+
       option :name, 'google_oauth2'
 
       option :client_options, {
-        :site => 'https://accounts.google.com',
+        :site          => 'https://accounts.google.com',
         :authorize_url => '/o/oauth2/auth',
-        :token_url => '/o/oauth2/token'
+        :token_url     => '/o/oauth2/token'
       }
 
-      def request_phase
-        setup_authorize_params
-        super
+      def authorize_params
+        base_scope_url = "https://www.googleapis.com/auth/"
+        super.tap do |params|
+          scopes = (params[:scope] || DEFAULT_SCOPE).split(",")
+          scopes.map! { |s| s =~ /^https?:\/\// ? s : "#{base_scope_url}#{s}" }
+          params[:scope] = scopes.join(' ')
+        end
       end
 
-      def setup_authorize_params
-        opts = {
-          :client_id => options[:client_id],
-          :redirect_uri => options[:redirect_uri] || callback_url,
-          :response_type => "code",
-          :scope => options[:scope]
-        }
-        google_email_scope = "www.googleapis.com/auth/userinfo.email"
-        opts[:scope] ||= "https://#{google_email_scope}"
-        opts[:scope] << " https://#{google_email_scope}" unless opts[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
-        options[:authorize_params] = opts.merge(options[:authorize_params])
+      uid{ raw_info['id'] || verified_email }
+
+      info do
+        prune!({
+          :name       => raw_info['name'],
+          :email      => verified_email,
+          :first_name => raw_info['given_name'],
+          :last_name  => raw_info['family_name'],
+          :image      => raw_info['picture']
+        })
       end
 
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => info['uid'],
-          'info' => info,
-          'credentials' => {'expires_at' => access_token.expires_at},
-          'extra' => {'user_hash' => user_data}
+      extra do
+        prune!({
+          'raw_info' => raw_info
         })
       end
 
-      info do
-        if user_data['data']['isVerified']
-          email = user_data['data']['email'] rescue nil
-        else
-          email = nil
-        end
+      def raw_info
+        @raw_info ||= access_token.get('https://www.googleapis.com/oauth2/v1/userinfo').parsed
+      end
 
-        {
-          'email' => email,
-          'uid' => email,
-          'name' => email
-        }
+      private
+
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
       end
 
-      def user_data
-        @data ||= access_token.get("https://www.googleapis.com/userinfo/email?alt=json").parsed
+      def verified_email
+        raw_info['verified_email'] ? raw_info['email'] : nil
       end
+
     end
   end
 end

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -22,34 +22,32 @@ describe OmniAuth::Strategies::GoogleOauth2 do
     end
   end
 
-  describe 'redirect_uri' do
-    before do
-      subject.stub(:callback_url).and_return('http://example.host/default')
-    end
-
-    it 'should be callback_url by default' do
-      subject.request_phase
-      subject.options[:authorize_params][:redirect_uri].should eql('http://example.host/default')
-    end
-    
-    it 'should be overriden by an option' do
-      subject.options[:redirect_uri] = 'http://example.host/override'
-      subject.request_phase
-      subject.options[:authorize_params][:redirect_uri].should eql('http://example.host/override')
-    end
-  end
-
   describe '#callback_path' do
     it "has the correct callback path" do
       subject.callback_path.should eq('/auth/google_oauth2/callback')
     end
   end
 
-  # These are setup during the request_phase
-  # At init they are blank
   describe '#authorize_params' do
-    it "has no authorize params at init" do
-      subject.authorize_params.should be_empty
+    it 'should expand scope shortcuts' do
+      @options = { :authorize_options => [:scope], :scope => 'userinfo.email'}
+      subject.authorize_params['scope'].should eq('https://www.googleapis.com/auth/userinfo.email')
+    end
+
+    it 'should leave full scopes as is' do
+      @options = { :authorize_options => [:scope], :scope => 'https://www.googleapis.com/auth/userinfo.profile'}
+      subject.authorize_params['scope'].should eq('https://www.googleapis.com/auth/userinfo.profile')
+    end
+
+    it 'should join scopes' do
+      @options = { :authorize_options => [:scope], :scope => 'userinfo.profile,userinfo.email'}
+      subject.authorize_params['scope'].should eq('https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email')
+    end
+
+    it 'should set default scope to userinfo.email,userinfo.profile' do
+      @options = { :authorize_options => [:scope]}
+      subject.authorize_params['scope'].should eq('https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile')
     end
   end
+
 end

data/spec/support/shared_examples.rb

@@ -15,8 +15,8 @@ shared_examples 'an oauth2 strategy' do
     end
 
     it 'should include top-level options that are marked as :authorize_options' do
-      @options = { :authorize_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
-      subject.authorize_params['scope'].should eq('bar')
+      @options = { :authorize_options => [:scope, :foo], :scope => 'http://bar', :foo => 'baz' }
+      subject.authorize_params['scope'].should eq('http://bar')
       subject.authorize_params['foo'].should eq('baz')
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Josh Ellithorpe
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 -08:00
-default_executable: 
+date: 2011-11-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: omniauth
@@ -101,7 +100,6 @@ files:
 - spec/omniauth/strategies/google_oauth2_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -131,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Google oauth2 strategy for OmniAuth 1.0