0 3 stable

lib/omniauth/version.rb

@@ -7,10 +7,10 @@ module Version
       MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 0
+      PATCH = 2
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = "rc1"
+      PRE   = nil
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

oa-basic/lib/omniauth/version.rb

@@ -7,10 +7,10 @@ module Version
       MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 0
+      PATCH = 2
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = "rc1"
+      PRE   = nil
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

oa-core/lib/omniauth/strategy.rb

@@ -107,6 +107,7 @@ def mock_callback_call
         @env['omniauth.auth'] = mocked_auth
         @env['omniauth.origin'] = session.delete('omniauth.origin')
         @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
+        copy_query_params
         call_app!
       end
     end
@@ -124,10 +125,14 @@ def request_phase
       raise NotImplementedError
     end
 
-    def callback_phase
-      @env['omniauth.auth'] = auth_hash
+    def copy_query_params
       @env['omniauth.params'] = session['query_params'] || {}
       session['query_params'] = nil if session['query_params']
+    end
+
+    def callback_phase
+      @env['omniauth.auth'] = auth_hash
+      copy_query_params
       call_app!
     end
 

oa-core/lib/omniauth/version.rb

@@ -7,10 +7,10 @@ module Version
       MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 0
+      PATCH = 2
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = "rc1"
+      PRE   = nil
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

oa-enterprise/lib/omniauth/strategies/saml.rb

@@ -8,11 +8,11 @@ class SAML
       autoload :AuthResponse,     'omniauth/strategies/saml/auth_response'
       autoload :ValidationError,  'omniauth/strategies/saml/validation_error'
       autoload :XMLSecurity,      'omniauth/strategies/saml/xml_security'
-      
+
       @@settings = {}
-      
+
       def initialize(app, options={})
-        super(app, :saml)
+        super( app, (options[:name] || :saml) )
         @@settings = {
           :assertion_consumer_service_url => options[:assertion_consumer_service_url],
           :issuer                         => options[:issuer],
@@ -21,30 +21,32 @@ def initialize(app, options={})
           :name_identifier_format         => options[:name_identifier_format] || "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
         }
       end
-          
+
       def request_phase
         request = OmniAuth::Strategies::SAML::AuthRequest.new
         redirect(request.create(@@settings))
       end
-      
+
       def callback_phase
         begin
           response = OmniAuth::Strategies::SAML::AuthResponse.new(request.params['SAMLResponse'])
           response.settings = @@settings
           @name_id  = response.name_id
+          @extra_attributes = response.attributes
           return fail!(:invalid_ticket, 'Invalid SAML Ticket') if @name_id.nil? || @name_id.empty?
           super
         rescue ArgumentError => e
           fail!(:invalid_ticket, 'Invalid SAML Response')
-        end        
+        end
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
-          'uid' => @name_id
+          'uid' => @name_id,
+          'extra' => @extra_attributes
         })
-      end  
-            
+      end
+
     end
   end
 end

oa-enterprise/lib/omniauth/version.rb

@@ -7,10 +7,10 @@ module Version
       MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 0
+      PATCH = 2
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = "rc1"
+      PRE   = nil
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

oa-more/lib/omniauth/version.rb

@@ -7,10 +7,10 @@ module Version
       MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 0
+      PATCH = 2
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = "rc1"
+      PRE   = nil
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

oa-oauth/lib/omniauth/oauth.rb

@@ -7,6 +7,7 @@ module Strategies
     autoload :Dopplr,             'omniauth/strategies/oauth/dopplr'
     autoload :Douban,             'omniauth/strategies/oauth/douban'
     autoload :Dropbox,            'omniauth/strategies/oauth/dropbox'
+    autoload :Etsy,               'omniauth/strategies/oauth/etsy'
     autoload :Evernote,           'omniauth/strategies/oauth/evernote'
     autoload :Flattr,             'omniauth/strategies/oauth/flattr'    
     autoload :Flickr,             'omniauth/strategies/oauth/flickr'    
@@ -19,6 +20,7 @@ module Strategies
     autoload :LinkedIn,           'omniauth/strategies/oauth/linked_in'
     autoload :Meetup,             'omniauth/strategies/oauth/meetup'
     autoload :Miso,               'omniauth/strategies/oauth/miso'
+    autoload :MySpace,            'omniauth/strategies/oauth/my_space'
     autoload :Netflix,            'omniauth/strategies/oauth/netflix'
     autoload :Orkut,              'omniauth/strategies/oauth/orkut'    
     autoload :Qzone,              'omniauth/strategies/oauth/qzone'
@@ -36,8 +38,8 @@ module Strategies
     autoload :TypePad,            'omniauth/strategies/oauth/type_pad'
     autoload :Vimeo,              'omniauth/strategies/oauth/vimeo'
     autoload :Yahoo,              'omniauth/strategies/oauth/yahoo'
-    autoload :Yammer,             'omniauth/strategies/oauth/yammer'
     autoload :YouTube,            'omniauth/strategies/oauth/you_tube'
+    autoload :Xing,               'omniauth/strategies/oauth/xing'
 
     autoload :OAuth2,             'omniauth/strategies/oauth2'
     autoload :AngelList,          'omniauth/strategies/oauth2/angellist'
@@ -65,10 +67,11 @@ module Strategies
     autoload :Viadeo,             'omniauth/strategies/oauth2/viadeo'
     autoload :Vkontakte,          'omniauth/strategies/oauth2/vkontakte'
     autoload :WePay,              'omniauth/strategies/oauth2/we_pay'
+    autoload :Yammer,             'omniauth/strategies/oauth2/yammer'
 
 
     autoload :XAuth,              'omniauth/strategies/xauth'
     autoload :Instapaper,         'omniauth/strategies/xauth/instapaper'
-    
+
   end
 end

oa-oauth/lib/omniauth/strategies/google_oauth2.rb

@@ -16,13 +16,13 @@ def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
           :token_url => '/o/oauth2/token'
         }
 
-        super(app, :google_oauth2, client_id, client_secret, client_options, options, &block)
+        super(app, (options[:name] || :google_oauth2), client_id, client_secret, client_options, options, &block)
       end
 
       def request_phase
         google_email_scope = "www.googleapis.com/auth/userinfo.email"
         options[:scope] ||= "https://#{google_email_scope}"
-        options[:scope] << "https://#{google_email_scope}" unless options[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
+        options[:scope] << " https://#{google_email_scope}" unless options[:scope] =~ %r[http[s]?:\/\/#{google_email_scope}]
         redirect client.auth_code.authorize_url(
           {:redirect_uri => callback_url, :response_type => "code"}.merge(options))
       end

oa-oauth/lib/omniauth/strategies/oauth/dropbox.rb

@@ -6,10 +6,10 @@ module Strategies
     class Dropbox < OmniAuth::Strategies::OAuth
       def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
         client_options = {
-          :authorize_url => 'https://www.dropbox.com/0/oauth/authorize',
-          :access_token_url => 'https://api.dropbox.com/0/oauth/access_token',
+          :authorize_url => 'https://www.dropbox.com/1/oauth/authorize',
+          :access_token_url => 'https://api.dropbox.com/1/oauth/access_token',
           :proxy => ENV['HTTP_PROXY'] || ENV['http_proxy'],
-          :request_token_url => 'https://api.dropbox.com/0/oauth/request_token',
+          :request_token_url => 'https://api.dropbox.com/1/oauth/request_token',
           :site => 'https://api.dropbox.com',
         }
         super(app, :dropbox, consumer_key, consumer_secret, client_options, options, &block)
@@ -25,7 +25,7 @@ def auth_hash
       end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get('/0/account/info').body)
+        @data ||= MultiJson.decode(@access_token.get('/1/account/info').body)
       end
 
       def user_info

oa-oauth/lib/omniauth/strategies/oauth/etsy.rb

@@ -0,0 +1,106 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    class Etsy < OmniAuth::Strategies::OAuth
+
+      # Cribbed from the etsy gem.
+      SANDBOX_HOST = 'sandbox.openapi.etsy.com'
+      PRODUCTION_HOST = 'openapi.etsy.com'
+
+      # Set the environment, accepts either :sandbox or :production. Defaults to :production
+      # and will raise an exception when set to an unrecognized environment.
+      def self.environment=(environment)
+        unless [:sandbox, :production].include?(environment)
+          raise(ArgumentError, "environment must be set to either :sandbox or :production")
+        end
+        @environment = environment
+        @host = (environment == :sandbox) ? SANDBOX_HOST : PRODUCTION_HOST
+      end
+
+      # The currently configured environment.
+      def self.environment
+        @environment || :production
+      end
+
+      def self.host # :nodoc:
+        @host || PRODUCTION_HOST
+      end
+
+      def self.callback_url
+        @callback_url || 'oob'
+      end
+
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        # Set environment first; this can update our host
+        OmniAuth::Strategies::Etsy.environment=options[:environment] if options[:environment]
+        client_options = {
+          :site => "http://#{OmniAuth::Strategies::Etsy.host}",
+          :request_token_path => request_token_path(options),
+          :access_token_path => access_token_path,
+          :http_method => :get,
+          :scheme => :query_string
+        }
+
+        super(app, :etsy, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def request_phase
+        request_token = consumer.get_request_token(:oauth_callback => callback_url)
+        session['oauth'] ||= {}
+        session['oauth'][name.to_s] = {'callback_confirmed' => true, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
+        r = Rack::Response.new
+        if request_token.params[:login_url]
+          # Already contains token, etc, of the form:
+          # https://www.etsy.com/oauth/signin?oauth_consumer_key=wg30ji4z8kdzsymfkw9vm333&oauth_token=650a9d4a8d589bb7e6aefed1628885&service=v2_prod
+          r.redirect(request_token.params[:login_url])
+        end
+        r.finish
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_hash['user_id'],
+          'user_info' => user_info,
+          'extra' => { 'user_hash' => user_hash }
+        })
+      end
+
+      def user_info
+        return {} unless user_hash
+        {
+          'uid' => user_hash['user_id'],
+          'nickname' => user_hash['login_name'],
+          'email' => user_hash['primary_email'],
+          'name' => user_hash['login_name'],
+          'feedback_info' => user_hash['feedback_info']
+        }
+      end
+
+      def request_token_path(options)
+        # Default scope is to read a user's private profile information, including email.  Scope is specified
+        # as a uri-encoded query kv pair, "scope=scope_1+scope_2+...+scope_n"
+        # For a full list of scope options, see: 
+        # http://www.etsy.com/developers/documentation/getting_started/oauth
+        "/v2/oauth/request_token?#{to_params({:scope => options.fetch(:scope, 'profile_r+email_r')})}"
+      end
+
+      def access_token_path
+        "/v2/oauth/access_token"
+      end
+
+      def to_params(options)
+        options.collect{|key, value| "#{key}=#{value}"}.join('&')
+      end
+
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get('/v2/users/__SELF__').body)['results'][0]
+      rescue ::Errno::ETIMEDOUT
+        raise ::Timeout::Error
+      rescue ::OAuth::Error => e
+        raise e.response.inspect
+      end
+    end
+  end
+end

oa-oauth/lib/omniauth/strategies/oauth/goodreads.rb

@@ -24,19 +24,19 @@ def auth_hash
       end
 
       def user_info(access_token)
-        authenticated_user = MultiXml.parse(@access_token.get('/api/auth_user').body)
-        id = authenticated_user.xpath('GoodreadsResponse/user').attribute('id').value.to_i
-        response_doc = MultiXml.parse(open("http://www.goodreads.com/user/show/#{id}.xml?key=#{@consumer_key}").read)
-        user = response_doc.xpath('GoodreadsResponse/user')
+        authenticated_user = MultiXml.parse(access_token.get('/api/auth_user').body)
+        id = authenticated_user['GoodreadsResponse']['user']['id'].to_i
+        response_doc = MultiXml.parse(access_token.get("/user/show/#{id}.xml?key=#{@consumer_key}").body)
+        user = response_doc['GoodreadsResponse']['user']
 
         hash = {
           'id' => id,
-          'name' => user.xpath('name').text,
-          'user_name' => user.xpath('user_name').text,
-          'image_url' => user.xpath('image_url').text,
-          'about' => user.xpath('about').text,
-          'location' => user.xpath('location').text,
-          'website' => user.xpath('website').text,
+          'name' => user['name'],
+          'user_name' => user['user_name'],
+          'image_url' => user['image_url'],
+          'about' => user['about'],
+          'location' => user['location'],
+          'website' => user['website'],
         }
       end
     end

oa-oauth/lib/omniauth/strategies/oauth/google.rb

@@ -59,9 +59,12 @@ def user_hash
         @user_hash ||= MultiJson.decode(@access_token.get('https://www.google.com/m8/feeds/contacts/default/full?max-results=1&alt=json').body)
       end
 
-      # Monkeypatch OmniAuth to pass the scope in the consumer.get_request_token call
+      # Monkeypatch OmniAuth to pass the scope and authorize_params in the consumer.get_request_token call
       def request_phase
-        request_token = consumer.get_request_token({:oauth_callback => callback_url}, {:scope => options[:scope]})
+        request_options = {:scope => options[:scope]}
+        request_options.merge!(options[:authorize_params])
+
+        request_token = consumer.get_request_token({:oauth_callback => callback_url}, request_options)
         session['oauth'] ||= {}
         session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
         r = Rack::Response.new