omniauth-google-oauth2 0.1.10 → 0.1.11

data/README.md

@@ -6,7 +6,7 @@ Get your API key at https://code.google.com/apis/console/
 
 ## License
 
-Copyright (c) 2011 by Josh Ellithorpe
+Copyright (c) 2012 by Josh Ellithorpe
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/omniauth/google_oauth2/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GoogleOauth2
-    VERSION = "0.1.10"
+    VERSION = "0.1.11"
   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, :state]
+      option :authorize_options, [:scope, :approval_prompt, :access_type, :hd]
 
       option :client_options, {
         :site          => 'https://accounts.google.com',
@@ -21,7 +21,6 @@ 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
@@ -29,7 +28,8 @@ module OmniAuth
           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']
         end
       end
 
@@ -44,7 +44,7 @@ module OmniAuth
           :image      => raw_info['picture']
         })
       end
-      
+
       extra do
         hash = {}
         hash[:raw_info] = raw_info unless skip_info?
@@ -74,4 +74,4 @@ module OmniAuth
 
     end
   end
-end
+end

data/spec/omniauth/strategies/google_oauth2_spec.rb

@@ -2,14 +2,14 @@ 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 || {}).tap do |strategy|
       strategy.stub(:request) { @request }
@@ -38,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')
@@ -59,16 +59,6 @@ describe OmniAuth::Strategies::GoogleOauth2 do
       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
@@ -85,6 +75,11 @@ describe OmniAuth::Strategies::GoogleOauth2 do
       @options = { :skip_info => true }
       subject.extra.should_not have_key(:raw_info)
     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
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-google-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Josh Ellithorpe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-17 00:00:00 Z
+date: 2012-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: omniauth