omniauth-google-oauth2 0.1.12 → 0.1.13

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.1.12"
+    VERSION = "0.1.13"
   end
 end

data/lib/omniauth/strategies/google_oauth2.rb

@@ -19,6 +19,10 @@ module OmniAuth
       def authorize_params
         base_scope_url = "https://www.googleapis.com/auth/"
         super.tap do |params|
+          # Read the params if passed directly to omniauth_authorize_path
+          %w(scope approval_prompt access_type state hd).each do |k|
+            params[k.to_sym] = request.params[k] unless [nil, ''].include?(request.params[k])
+          end
           scopes = (params[:scope] || DEFAULT_SCOPE).split(",")
           scopes.map! { |s| s =~ /^https?:\/\// ? s : "#{base_scope_url}#{s}" }
           params[:scope] = scopes.join(' ')
@@ -26,12 +30,8 @@ module OmniAuth
           # 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
-          # hd ("Hosted Domain") can be set to a Google Apps domain to force a login to that domain
-          params[:hd] = request.params['hd'] if request.params['hd']
           # Override the state per request
-          session['omniauth.state'] = params[:state] = request.params['state'] if request.params['state']
+          session['omniauth.state'] = params[:state] if request.params['state']
         end
       end
 

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -40,39 +40,95 @@ describe OmniAuth::Strategies::GoogleOauth2 do
   end
 
   describe '#callback_path' do
-    it "has the correct callback path" do
+    it 'has the correct callback path' do
       subject.callback_path.should eq('/auth/google_oauth2/callback')
     end
   end
 
   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')
+    %w(approval_prompt access_type state hd).each do |k|
+      it "should set the #{k} authorize option dynamically in the request" do
+        @options = {k.to_sym => ''}
+        subject.stub(:request) { double('Request', {:params => { k => 'something' }, :env => {}}) }
+        subject.authorize_params[k].should eq('something')
+      end
     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')
+    describe 'scope' 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')
+      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
+
+      it 'should dynamically set the scope in the request' do
+        @options = {:scope => 'http://example.com'}
+        subject.stub(:request) { double('Request', {:params => { 'scope' => 'userinfo.email' }, :env => {}}) }
+        subject.authorize_params['scope'].should eq('https://www.googleapis.com/auth/userinfo.email')
+      end
     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')
+    describe 'approval_prompt' do
+      it 'should set the approval_prompt parameter if present' do
+        @options = {:approval_prompt => 'prompt'}
+        subject.authorize_params['approval_prompt'].should eq('prompt')
+      end
+
+      it 'should default to "force"' do
+        @options = {}
+        subject.authorize_params['approval_prompt'].should eq('force')
+      end
+    end
+
+    describe 'access_type' do
+      it 'should set the access_type parameter if present' do
+        @options = {:access_type => 'type'}
+        subject.authorize_params['access_type'].should eq('type')
+      end
+
+      it 'should default to "offline"' do
+        @options = {}
+        subject.authorize_params['access_type'].should eq('offline')
+      end
     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')
+    describe 'state' do
+      it 'should set the state parameter' do
+        @options = {:state => 'some_state'}
+        subject.authorize_params['state'].should eq('some_state')
+        subject.session['omniauth.state'].should eq('some_state')
+      end
+
+      it 'should set the omniauth.state dynamically' do
+        subject.stub(:request) { double('Request', {:params => { 'state' => 'some_state' }, :env => {}}) }
+        subject.authorize_params['state'].should eq('some_state')
+        subject.session['omniauth.state'].should eq('some_state')
+      end
     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')
+    describe 'hd' do
+      it 'should set the hd (hosted domain) parameter if present' do
+        @options = {:hd => 'example.com'}
+        subject.authorize_params['hd'].should eq('example.com')
+      end
     end
+  end
 
+  describe 'raw info' do
     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' })
@@ -82,23 +138,5 @@ describe OmniAuth::Strategies::GoogleOauth2 do
       @options = { :skip_info => true }
       subject.extra.should_not have_key(:raw_info)
     end
-
-    it 'should set the state parameter' do
-      @options = {:state => "some_state"}
-      subject.authorize_params['state'].should eq('some_state')
-      subject.session['omniauth.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')
-      subject.session['omniauth.state'].should eq('some_state')
-    end
-
-    it 'should set the hd (hosted domain) parameter if present' do
-      @options = {:hd => "example.com"}
-      subject.authorize_params['hd'].should eq('example.com')
-    end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3450546043308666818
+      hash: 1263356288876244939
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3450546043308666818
+      hash: 1263356288876244939
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24