oa-oauth 0.3.0 → 0.3.2

data/lib/omniauth/oauth.rb

@@ -19,6 +19,7 @@ module OmniAuth
     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'
@@ -37,6 +38,7 @@ module OmniAuth
     autoload :Vimeo,              'omniauth/strategies/oauth/vimeo'
     autoload :Yahoo,              'omniauth/strategies/oauth/yahoo'
     autoload :YouTube,            'omniauth/strategies/oauth/you_tube'
+    autoload :Xing,               'omniauth/strategies/oauth/xing'
 
     autoload :OAuth2,             'omniauth/strategies/oauth2'
     autoload :AngelList,          'omniauth/strategies/oauth2/angellist'

data/lib/omniauth/strategies/google_oauth2.rb

@@ -16,7 +16,7 @@ module OmniAuth
           :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

data/lib/omniauth/strategies/oauth/google.rb

@@ -59,9 +59,12 @@ module OmniAuth
         @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

data/lib/omniauth/strategies/oauth/my_space.rb

@@ -0,0 +1,71 @@
+require 'json'
+require 'omniauth/oauth'
+
+module OmniAuth
+  module Strategies
+    class MySpace < OmniAuth::Strategies::OAuth
+
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :site => 'http://api.myspace.com',
+          :access_token_path => '/access_token',
+          :authorize_path => '/authorize',
+          :request_token_path => '/request_token',
+          :http_method => "get"
+        }
+        options.merge! :http_method => :get
+        super(app, :my_space, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def callback_phase
+        session['oauth'][name.to_s]['callback_confirmed'] = true
+        super
+      end
+
+      def user_data
+        @access_token.options.merge!({:param_name => 'oauth_token', :mode => :query})
+        # response = @access_token.post('/simple/players.info')
+        # @data ||= MultiJson.decode(response.body)
+      end
+
+      def request_phase
+        request_token = consumer.get_request_token(:oauth_callback => callback_url)
+        session['oauth'] ||= {}
+        session['oauth'][name.to_s] = {'callback_confirmed' => request_token.callback_confirmed?, 'request_token' => request_token.token, 'request_secret' => request_token.secret}
+        sleep 1
+        if request_token.callback_confirmed?
+          redirect request_token.authorize_url(options[:authorize_params])
+        else
+          redirect request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url))
+        end
+
+      rescue ::Timeout::Error => e
+        fail!(:timeout, e)
+      rescue ::Net::HTTPFatalError, ::OpenSSL::SSL::SSLError => e
+        fail!(:service_unavailable, e)
+      end
+
+      def consumer
+        ::OAuth::Consumer.new(consumer_key, consumer_secret, {
+                :http_method=>"get",
+                :site=>"http://api.myspace.com",
+                :request_token_path=>"/request_token",
+                :access_token_path=>"/access_token",
+                :authorize_path=>"/authorize"
+        })
+      end
+
+      def user_hash(access_token)
+        person = JSON.parse( access_token.get("/v2/people/@me/@self?format=json").body )["users"].first
+
+        hash = {
+          'id'          => person['id'],
+          'first_name'  => person['first_name'],
+          'last_name'   => person['last_name'],
+          'image'       => person["photo_urls"]["large"],
+        }
+      end
+
+    end
+  end
+end

data/lib/omniauth/strategies/oauth/xing.rb

@@ -0,0 +1,48 @@
+require 'json'
+require 'omniauth/oauth'
+
+module OmniAuth
+  module Strategies
+    class Xing < OmniAuth::Strategies::OAuth
+
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        client_options = {
+          :access_token_path => '/v1/access_token',
+          :authorize_path => '/v1/authorize',
+          :request_token_path => '/v1/request_token/',
+          :site => 'https://api.xing.com'
+        }
+        super(app, :xing, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def callback_phase
+        session['oauth'][name.to_s]['callback_confirmed'] = true
+        super
+      end
+
+      def auth_hash
+        hash = user_hash(@access_token)
+
+        OmniAuth::Utils.deep_merge(super,
+          {
+            'uid' => @access_token.params[:user_id],
+            'user_info' => hash,
+          }
+        )
+      end
+
+      def user_hash(access_token)
+        person = JSON.parse( access_token.get('/v1/users/me').body )["users"].first
+
+        hash = {
+          'id'          => person['id'],
+          'first_name'  => person['first_name'],
+          'last_name'   => person['last_name'],
+          'image'       => person["photo_urls"]["large"],
+          'email'       => person["active_email"],
+        }
+      end
+
+    end
+  end
+end

data/lib/omniauth/strategies/oauth2.rb

@@ -78,8 +78,6 @@ module OmniAuth
       def build_access_token
         verifier = request.params['code']
         client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options))
-      rescue ::OAuth2::Error => e
-        raise e.response.inspect
       end
 
       def auth_hash

data/lib/omniauth/strategies/oauth2/facebook.rb

@@ -42,8 +42,6 @@ module OmniAuth
         @access_token.options[:mode] = :query
         @access_token.options[:param_name] = 'access_token'
         @data ||= @access_token.get('/me').parsed
-      rescue ::OAuth2::Error => e
-        raise e.response.inspect
       end
 
       def request_phase
@@ -52,10 +50,13 @@ module OmniAuth
       end
 
       def build_access_token
-        if facebook_session.nil? || facebook_session.empty?
-          super
-        else
+        if !signed_request.nil? && !signed_request.empty?
+          verifier = signed_request['code']
+          client.auth_code.get_token(verifier, {:redirect_uri => ''}.merge(options))
+        elsif !facebook_session.nil? && !facebook_session.empty?
           @access_token = ::OAuth2::AccessToken.new(client, facebook_session['access_token'], {:mode => :query, :param_name => 'access_token'})
+        else
+          super
         end
       end
 
@@ -68,6 +69,15 @@ module OmniAuth
         end
       end
 
+      def signed_request
+        signed_request_cookie = request.cookies["fbsr_#{client.id}"]
+        if signed_request_cookie
+          signed_request = parse_signed_request(signed_request_cookie)
+        else
+          nil
+        end
+      end
+
       def user_info
         {
           'nickname' => user_data['username'],
@@ -82,6 +92,35 @@ module OmniAuth
           },
         }
       end
+
+      protected
+        # Borrowed from koala gem.
+        #
+        # Originally provided directly by Facebook, however this has changed
+        # as their concept of crypto changed. For historic purposes, this is their proposal:
+        # https://developers.facebook.com/docs/authentication/canvas/encryption_proposal/
+        # Currently see https://github.com/facebook/php-sdk/blob/master/src/facebook.php#L758
+        # for a more accurate reference implementation strategy.
+        def parse_signed_request(input)
+          encoded_sig, encoded_envelope = input.split('.', 2)
+          signature = base64_url_decode(encoded_sig).unpack("H*").first
+          envelope = MultiJson.decode(base64_url_decode(encoded_envelope))
+
+          raise "SignedRequest: Unsupported algorithm #{envelope['algorithm']}" if envelope['algorithm'] != 'HMAC-SHA256'
+
+          # now see if the signature is valid (digest, key, data)
+          hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, client.secret, encoded_envelope.tr("-_", "+/"))
+          raise 'SignedRequest: Invalid signature' if (signature != hmac)
+
+          return envelope
+        end
+
+        # base 64
+        # directly from https://github.com/facebook/crypto-request-examples/raw/master/sample.rb
+        def base64_url_decode(str)
+          str += '=' * (4 - str.length.modulo(4))
+          Base64.decode64(str.tr('-_', '+/'))
+        end
     end
   end
 end

data/lib/omniauth/strategies/oauth2/gowalla.rb

@@ -26,6 +26,7 @@ module OmniAuth
           super, {
             'uid' => user_data['url'].split('/').last,
             'user_info' => user_info,
+             'credentials' => {'refresh_token' => @access_token.refresh_token},
             'extra' => {
               'user_hash' => user_data,
               'refresh_token' => refresh_token,
@@ -34,10 +35,22 @@ module OmniAuth
           }
         )
       end
-
       def user_data
-        @data ||= MultiJson.decode(@access_token.get('/users/me.json'))
+        puts "user_data"
+        if(@data.nil?)
+          opts={
+            :raise_errors=>false,
+            :headers =>{:Accept => 'application/json','X-Gowalla-API-Key'=> self.client_id},
+            :params=>{:oauth_token=>@access_token.token}
+            }
+          response=@access_token.get('http://api.gowalla.com/users/me',opts)
+      
+          @data = MultiJson.decode(response.body) 
+        end
+        
+        @data 
       end
+     
 
       def refresh_token
         @refresh_token ||= @access_token.refresh_token
@@ -53,6 +66,7 @@ module OmniAuth
       end
 
       def user_info
+        
         {
           'name' => "#{user_data['first_name']} #{user_data['last_name']}",
           'nickname' => user_data['username'],
@@ -67,6 +81,21 @@ module OmniAuth
           },
         }
       end
+    def build_access_token
+      token=super
+      ##remove expires_at from token, invalid format
+      token=::OAuth2::AccessToken.new(token.client,token.token,{:expires_in=>token.expires_in,:refresh_token=>token.refresh_token}.merge(token.params))
+      ## if token is expired refresh and again remove expires_at
+      if token.expired?
+        token=token.refresh!
+        token=::OAuth2::AccessToken.new(token.client,token.token,{:expires_in=>token.expires_in,:refresh_token=>token.refresh_token}.merge(token.params))
+      end
+      token
+      
+    end
+     
     end
+    
+    
   end
 end

data/lib/omniauth/strategies/oauth2/salesforce.rb

@@ -5,12 +5,22 @@ module OmniAuth
     class Salesforce < OmniAuth::Strategies::OAuth2
       def initialize(app, client_id=nil, client_secret=nil, options={}, &block)
         client_options = {
-          :authorize_url => 'https://login.salesforce.com/services/oauth2/authorize',
-          :token_url => 'https://login.salesforce.com/services/oauth2/token',
+          :site => 'https://login.salesforce.com',
+          :authorize_url  => '/services/oauth2/authorize',
+          :token_url      => '/services/oauth2/token',
         }
-        options.merge!(:response_type => 'code', :grant_type => 'authorization_code')
         super(app, :salesforce, client_id, client_secret, client_options, options, &block)
       end
+      
+      def request_phase
+        options[:response_type] ||= 'code'
+        super
+      end
+
+      def callback_phase
+        options[:grant_type] ||= 'authorization_code'
+        super
+      end
 
       def auth_hash
         data = user_data
@@ -35,10 +45,12 @@ module OmniAuth
       end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get(@access_token['id']))
+        @access_token.options[:header_format] = 'OAuth %s'
+
+        @data ||= @access_token.get(@access_token['id']).parsed
       rescue ::OAuth2::Error => e
         if e.response.status == 302
-          @data ||= MultiJson.decode(@access_token.get(e.response.headers['location']))
+          @data ||= @access_token.get(e.response.headers['location']).parsed
         else
           raise e
         end

data/lib/omniauth/strategies/oauth2/thirty_seven_signals.rb

@@ -25,7 +25,7 @@ module OmniAuth
       end
 
       def user_data
-        @data ||= MultiJson.decode(@access_token.get('/authorization.json'))
+        @data ||= @access_token.get('https://launchpad.37signals.com/authorization.json').parsed
       end
 
       def user_info

data/lib/omniauth/strategies/oauth2/yammer.rb

@@ -49,8 +49,6 @@ module OmniAuth
         temp_access_token = client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(options))
         token = eval(temp_access_token.token)['token']
         @access_token = ::OAuth2::AccessToken.new(client, token, temp_access_token.params)
-      rescue ::OAuth2::Error => e
-        raise e.response.inspect
       end
 
       def user_hash

data/lib/omniauth/version.rb

@@ -7,7 +7,7 @@ module OmniAuth
       MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 0
+      PATCH = 2
     end
     unless defined?(::OmniAuth::Version::PRE)
       PRE   = nil

data/spec/omniauth/strategies/oauth/my_space_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::MySpace do
+  it_should_behave_like "an oauth strategy"
+end

data/spec/omniauth/strategies/oauth/xing_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Xing do
+  it_should_behave_like "an oauth strategy"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-oauth
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 -05:00
+date: 2011-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 2
+        version: 0.3.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -289,6 +289,7 @@ files:
 - lib/omniauth/strategies/oauth/linked_in.rb
 - lib/omniauth/strategies/oauth/meetup.rb
 - lib/omniauth/strategies/oauth/miso.rb
+- lib/omniauth/strategies/oauth/my_space.rb
 - lib/omniauth/strategies/oauth/netflix.rb
 - lib/omniauth/strategies/oauth/orkut.rb
 - lib/omniauth/strategies/oauth/plurk.rb
@@ -305,6 +306,7 @@ files:
 - lib/omniauth/strategies/oauth/twitter.rb
 - lib/omniauth/strategies/oauth/type_pad.rb
 - lib/omniauth/strategies/oauth/vimeo.rb
+- lib/omniauth/strategies/oauth/xing.rb
 - lib/omniauth/strategies/oauth/yahoo.rb
 - lib/omniauth/strategies/oauth/you_tube.rb
 - lib/omniauth/strategies/oauth2.rb
@@ -355,6 +357,7 @@ files:
 - spec/omniauth/strategies/oauth/linked_in_spec.rb
 - spec/omniauth/strategies/oauth/meetup_spec.rb
 - spec/omniauth/strategies/oauth/miso_spec.rb
+- spec/omniauth/strategies/oauth/my_space_spec.rb
 - spec/omniauth/strategies/oauth/netflix_spec.rb
 - spec/omniauth/strategies/oauth/oauth_spec.rb
 - spec/omniauth/strategies/oauth/orkut_spec.rb
@@ -369,6 +372,7 @@ files:
 - spec/omniauth/strategies/oauth/twitter_spec.rb
 - spec/omniauth/strategies/oauth/type_pad_spec.rb
 - spec/omniauth/strategies/oauth/vimeo_spec.rb
+- spec/omniauth/strategies/oauth/xing_spec.rb
 - spec/omniauth/strategies/oauth/yahoo_spec.rb
 - spec/omniauth/strategies/oauth/you_tube_spec.rb
 - spec/omniauth/strategies/oauth2/angellist_spec.rb
@@ -451,6 +455,7 @@ test_files:
 - spec/omniauth/strategies/oauth/linked_in_spec.rb
 - spec/omniauth/strategies/oauth/meetup_spec.rb
 - spec/omniauth/strategies/oauth/miso_spec.rb
+- spec/omniauth/strategies/oauth/my_space_spec.rb
 - spec/omniauth/strategies/oauth/netflix_spec.rb
 - spec/omniauth/strategies/oauth/oauth_spec.rb
 - spec/omniauth/strategies/oauth/orkut_spec.rb
@@ -465,6 +470,7 @@ test_files:
 - spec/omniauth/strategies/oauth/twitter_spec.rb
 - spec/omniauth/strategies/oauth/type_pad_spec.rb
 - spec/omniauth/strategies/oauth/vimeo_spec.rb
+- spec/omniauth/strategies/oauth/xing_spec.rb
 - spec/omniauth/strategies/oauth/yahoo_spec.rb
 - spec/omniauth/strategies/oauth/you_tube_spec.rb
 - spec/omniauth/strategies/oauth2/angellist_spec.rb