omniauth-google-oauth2 0.1.11 → 0.1.12

data/.rvmrc

@@ -1 +1 @@
-rvm use ree@omniauth-google-oauth2 --create
+rvm use 1.9.2@omniauth-google-oauth2 --create

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   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, :hd]
+      option :authorize_options, [:scope, :approval_prompt, :access_type, :state, :hd]
 
       option :client_options, {
         :site          => 'https://accounts.google.com',
@@ -30,6 +30,8 @@ module OmniAuth
           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']
         end
       end
 

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -2,16 +2,23 @@ require 'spec_helper'
 require 'omniauth-google-oauth2'
 
 describe OmniAuth::Strategies::GoogleOauth2 do
+  def app; lambda{|env| [200, {}, ["Hello."]]} end
 
   before :each do
+    OmniAuth.config.test_mode = true
     @request = double('Request')
     @request.stub(:params) { {} }
     @request.stub(:cookies) { {} }
     @request.stub(:env) { {} }
   end
 
+  after do
+    OmniAuth.config.test_mode = false
+  end
+
   subject do
-    OmniAuth::Strategies::GoogleOauth2.new(nil, @options || {}).tap do |strategy|
+    args = ['appid', 'secret', @options || {}].compact
+    OmniAuth::Strategies::GoogleOauth2.new(app, *args).tap do |strategy|
       strategy.stub(:request) { @request }
     end
   end
@@ -76,6 +83,18 @@ describe OmniAuth::Strategies::GoogleOauth2 do
       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')

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'bundler/setup'
 require 'rspec'
+
 Dir[File.expand_path('../support/**/*', __FILE__)].each { |f| require f }
 
 RSpec.configure do |config|

metadata

@@ -1,92 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: omniauth-google-oauth2
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.1.12
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 11
-  version: 0.1.11
 platform: ruby
-authors: 
+authors:
 - Josh Ellithorpe
 - Yury Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: omniauth
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: omniauth-oauth2
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: omniauth-oauth2
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Google oauth2 strategy for OmniAuth 1.0
-email: 
+email:
 - quest@mac.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -102,40 +98,37 @@ files:
 - spec/omniauth/strategies/google_oauth2_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3450546043308666818
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3450546043308666818
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Google oauth2 strategy for OmniAuth 1.0
-test_files: 
+test_files:
 - spec/omniauth/strategies/google_oauth2_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb