omniauth-google-oauth2 0.1.9 → 0.1.10

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 .powenv
+.idea/

data/examples/config.ru

@@ -33,8 +33,11 @@ end
 use Rack::Session::Cookie, :secret => ENV['RACK_COOKIE_SECRET']
 
 use OmniAuth::Builder do
-  provider :google_oauth2, ENV['GOOGLE_KEY'], ENV['GOOGLE_SECRET'], {
-  }
+  # Regular usage
+  provider :google_oauth2, ENV['GOOGLE_KEY'], ENV['GOOGLE_SECRET'], {}
+  
+  # Custom scope supporting youtube
+  # provider :google_oauth2, ENV['GOOGLE_KEY'], ENV['GOOGLE_SECRET'], {:scope => 'http://gdata.youtube.com,userinfo.email,userinfo.profile,plus.me', :access_type => 'online', :approval_prompt => ''}
 end
 
 run App.new

data/examples/omni_auth.rb

@@ -0,0 +1,6 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+  # If you don't need a refresh token -- if you're only using Google for account creation/auth and don't need google services -- set the access_type to 'online'.
+  # Also, set the approval prompt to an empty string, since otherwise it will be set to 'force', which makes users manually approve to the Oauth every time they log in.
+  # See http://googleappsdeveloper.blogspot.com/2011/10/upcoming-changes-to-oauth-20-endpoint.html
+  provider :google_oauth2, ENV['GOOGLE_KEY'], ENV['GOOGLE_SECRET'], {access_type: 'online', approval_prompt: ''}
+end

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.1.9"
+    VERSION = "0.1.10"
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -8,7 +8,7 @@ module OmniAuth
       DEFAULT_SCOPE = "userinfo.email,userinfo.profile"
 
       option :name, 'google_oauth2'
-      option :authorize_options, [:scope, :approval_prompt, :access_type]
+      option :authorize_options, [:scope, :approval_prompt, :access_type, :state]
 
       option :client_options, {
         :site          => 'https://accounts.google.com',
@@ -21,11 +21,15 @@ module OmniAuth
         super.tap do |params|
           scopes = (params[:scope] || DEFAULT_SCOPE).split(",")
           scopes.map! { |s| s =~ /^https?:\/\// ? s : "#{base_scope_url}#{s}" }
+          params[:state] = request.params['state'] if request.params['state']
           params[:scope] = scopes.join(' ')
           # This makes sure we get a refresh_token.
           # http://googlecode.blogspot.com/2011/10/upcoming-changes-to-oauth-20-endpoint.html
           params[:access_type] = 'offline' if params[:access_type].nil?
           params[:approval_prompt] = 'force' if params[:approval_prompt].nil?
+          # allow overriding approval_prompt on the request itself
+          params[:approval_prompt] = request.params['approval_prompt'] if request_has_approval_prompt
+          
         end
       end
 
@@ -40,11 +44,11 @@ module OmniAuth
           :image      => raw_info['picture']
         })
       end
-
+      
       extra do
-        prune!({
-          'raw_info' => raw_info
-        })
+        hash = {}
+        hash[:raw_info] = raw_info unless skip_info?
+        prune! hash
       end
 
       def raw_info
@@ -53,6 +57,10 @@ module OmniAuth
 
       private
 
+      def request_has_approval_prompt
+        request.env && request.params && request.params['approval_prompt']
+      end
+
       def prune!(hash)
         hash.delete_if do |_, value|
           prune!(value) if value.is_a?(Hash)

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -2,8 +2,18 @@ require 'spec_helper'
 require 'omniauth-google-oauth2'
 
 describe OmniAuth::Strategies::GoogleOauth2 do
+  
+  before :each do
+    @request = double('Request')
+    @request.stub(:params) { {} }
+    @request.stub(:cookies) { {} }
+    @request.stub(:env) { {} }
+  end
+  
   subject do
-    OmniAuth::Strategies::GoogleOauth2.new(nil, @options || {})
+    OmniAuth::Strategies::GoogleOauth2.new(nil, @options || {}).tap do |strategy|
+      strategy.stub(:request) { @request }
+    end
   end
 
   it_should_behave_like 'an oauth2 strategy'
@@ -28,7 +38,7 @@ describe OmniAuth::Strategies::GoogleOauth2 do
     end
   end
 
-  describe '#authorize_params' do
+  describe '#authorize_params' do 
     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')
@@ -48,6 +58,33 @@ describe OmniAuth::Strategies::GoogleOauth2 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
+
+    it 'should set the state parameter' do
+      @options = {:state => "some_state"}
+      subject.authorize_params['state'].should eq('some_state')
+    end
+    
+    it 'should set the state parameter dynamically' do
+      subject.stub(:request) { double('Request', {:params => { 'state' => 'some_state' }, :env => {}}) }
+      subject.authorize_params['state'].should eq('some_state')
+    end
+    
+    it 'should allow request parameter to override approval_prompt' do
+      @options = {:approval_prompt => ''} # non-nil prevent default 'force'
+      # stub the request
+      subject.stub!(:request).and_return( Rack::Request.new( {'QUERY_STRING' => "approval_prompt=force", "rack.input" => ""}))
+      subject.authorize_params['approval_prompt'].should eq('force')
+    end
+
+    it 'should include raw_info in extras hash by default' do
+      subject.stub(:raw_info) { { :foo => 'bar' } }
+      subject.extra[:raw_info].should eq({ :foo => 'bar' })
+    end
+
+    it 'should not include raw_info in extras hash when skip_info is specified' do
+      @options = { :skip_info => true }
+      subject.extra.should_not have_key(:raw_info)
+    end
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Josh Ellithorpe
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-06 00:00:00 -08:00
-default_executable: 
+date: 2012-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: omniauth
@@ -94,6 +93,7 @@ files:
 - README.md
 - Rakefile
 - examples/config.ru
+- examples/omni_auth.rb
 - lib/omniauth-google-oauth2.rb
 - lib/omniauth/google_oauth2.rb
 - lib/omniauth/google_oauth2/version.rb
@@ -102,7 +102,6 @@ files:
 - spec/omniauth/strategies/google_oauth2_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -132,7 +131,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