oa-oauth 0.2.4 → 0.2.5

data/lib/omniauth/strategies/instagram.rb

@@ -10,31 +10,31 @@ module OmniAuth
     #   use OmniAuth::Strategies::Instagram, 'client_id', 'client_secret'
     class Instagram < OAuth2
       # @option options [String] :scope separate the scopes by a space
-      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)        
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
         client_options = {
           :site => "https://api.instagram.com/",
           :authorize_url      => "/oauth/authorize",
           :access_token_url   => "/oauth/access_token"
         }
-        
+
         super(app, :instagram, client_id, client_secret, client_options, options, &block)
       end
-      
+
       def request_phase
         options[:scope] ||= "basic"
         options[:response_type] ||= 'code'
         super
       end
-      
+
       def callback_phase
         options[:grant_type] ||= 'authorization_code'
         super
       end
-      
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get("/v1/users/self"))
       end
-      
+
       def user_info
         {
           'nickname' => user_data['data']['username'],
@@ -43,7 +43,7 @@ module OmniAuth
           'urls' => {}
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['data']['id'],

data/lib/omniauth/strategies/instapaper.rb

@@ -4,7 +4,7 @@ require 'multi_json'
 module OmniAuth
   module Strategies
     class Instapaper < OmniAuth::Strategies::XAuth
-      
+
       def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
         client_options = {
           :title => 'Instapaper',
@@ -13,27 +13,27 @@ module OmniAuth
         }
         super(app, :instapaper, consumer_key, consumer_secret, client_options, options, &block)
       end
-      
+
       protected
-      
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get('/api/1/account/verify_credentials').body)[0]
       end
-      
+
       def user_info
         {
           'nickname' => user_data['username'],
           'name' => user_data['username']
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['user_id'],
           'user_info' => user_info
         })
       end
-      
+
     end
   end
 end

data/lib/omniauth/strategies/linked_in.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+require 'multi_xml'
 require 'omniauth/oauth'
 
 module OmniAuth
@@ -15,22 +15,21 @@ module OmniAuth
 
         client_options[:authorize_path] = '/uas/oauth/authenticate' unless options[:sign_in] == false
 
-        '/uas/oauth/authorize'
         super(app, :linked_in, consumer_key, consumer_secret, client_options, options, &block)
       end
-      
+
       def auth_hash
         hash = user_hash(@access_token)
-        
+
         OmniAuth::Utils.deep_merge(super, {
           'uid' => hash.delete('id'),
           'user_info' => hash
         })
       end
-      
+
       def user_hash(access_token)
-        person = Nokogiri::XML::Document.parse(@access_token.get('/v1/people/~:(id,first-name,last-name,headline,member-url-resources,picture-url,location,public-profile-url)').body).xpath('person')
-        
+        person = MulitXml.parse(@access_token.get('/v1/people/~:(id,first-name,last-name,headline,member-url-resources,picture-url,location,public-profile-url)').body).xpath('person')
+
         hash = {
           'id' => person.xpath('id').text,
           'first_name' => person.xpath('first-name').text,
@@ -39,15 +38,16 @@ module OmniAuth
           'location' => person.xpath('location/name').text,
           'image' => person.xpath('picture-url').text,
           'description' => person.xpath('headline').text,
+          'public_profile_url' => person.xpath('public-profile-url').text,
           'urls' => person.css('member-url-resources member-url').inject({}) do |h,element|
             h[element.xpath('name').text] = element.xpath('url').text
             h
           end
         }
-        
+
         hash['urls']['LinkedIn'] = person.xpath('public-profile-url').text
         hash['name'] = "#{hash['first_name']} #{hash['last_name']}"
-        
+
         hash
       end
     end

data/lib/omniauth/strategies/miso.rb

@@ -3,7 +3,7 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    # 
+    #
     # Authenticate to Miso via OAuth and retrieve basic
     # user information.
     #
@@ -15,7 +15,7 @@ module OmniAuth
       def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
         super(app, :miso, consumer_key, consumer_secret, {:site => 'https://gomiso.com'}, options)
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_hash['id'],
@@ -23,8 +23,8 @@ module OmniAuth
           'extra' => {'user_hash' => user_hash}
         })
       end
-      
-      def user_info 
+
+      def user_info
         {
           'nickname' => user_hash['username'],
           'name' => user_hash['full_name'],
@@ -32,7 +32,7 @@ module OmniAuth
           'description' => user_hash['tagline'],
         }
       end
-      
+
       def user_hash
         @user_hash ||= MultiJson.decode(@access_token.get('/api/oauth/v1/users/show.json').body)['user']
       end

data/lib/omniauth/strategies/mixi.rb

@@ -10,35 +10,35 @@ module OmniAuth
     #   use OmniAuth::Strategies::Mixi, 'client_id', 'client_secret'
     class Mixi < OAuth2
       # @option options [String] :scope separate the scopes by a space
-      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)        
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
         client_options = {
           :site => "https://mixi.jp/",
           :authorize_url      => "/connect_authorize.pl",
           :access_token_url   => "https://secure.mixi-platform.com/2/token"
         }
-        
+
         super(app, :mixi, client_id, client_secret, client_options, options, &block)
       end
-      
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get(
           "http://api.mixi-platform.com/2/people/@me/@self",
           {'oauth_token' => @access_token.token}
         ))
       end
-      
+
       def request_phase
         options[:scope] ||= "r_profile"
-        options[:display] ||= "pc"        
+        options[:display] ||= "pc"
         options[:response_type] ||= 'code'
         super
       end
-      
+
       def callback_phase
         options[:grant_type] ||= 'authorization_code'
         super
       end
-      
+
       def user_info
         {
           'nickname' => user_data['entry']['displayName'],
@@ -46,7 +46,7 @@ module OmniAuth
           'urls' => {:profile => user_data['entry']['profileUrl']}
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['entry']['id'],

data/lib/omniauth/strategies/oauth2.rb

@@ -12,26 +12,26 @@ module OmniAuth
     # OAuth 2.0.
     class OAuth2
       include OmniAuth::Strategy
-      
+
       # The options passed in to the strategy.
       attr_accessor :options
       # The `OAuth2::Client` for this strategy.
       attr_accessor :client_id, :client_secret, :client_options
-      
+
       # An error that is indicated in the OAuth 2.0 callback.
-      # This could be a `redirect_uri_mismatch` or other 
+      # This could be a `redirect_uri_mismatch` or other
       class CallbackError < StandardError
         attr_accessor :error, :error_reason, :error_uri
-        
+
         def initialize(error, error_reason=nil, error_uri=nil)
           self.error = error
           self.error_reason = error_reason
           self.error_uri = error_uri
         end
       end
-      
+
       # Initialize a new OAuth 2.0 authentication provider.
-      
+
       # @param [Rack Application] app standard middleware application argument
       # @param [String] name the name for this provider to be used in its URL, e.g. `/auth/name`
       # @param [String] client_id the client/application ID of this provider
@@ -43,17 +43,17 @@ module OmniAuth
         self.client_options = client_options
         super
       end
-      
+
       def client
         ::OAuth2::Client.new(client_id, client_secret, client_options.merge(options[:client_options] || {}))
       end
-      
+
       def callback_url
         full_host + callback_path
       end
 
       protected
-        
+
       def request_phase
         redirect client.web_server.authorize_url({:redirect_uri => callback_url}.merge(options))
       end
@@ -62,19 +62,19 @@ module OmniAuth
         if request.params['error'] || request.params['error_reason']
           raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
         end
-        
+
         @access_token = build_access_token
-        
+
         if @access_token.expires? && @access_token.expires_in <= 0
-          client.request(:post, client.access_token_url, { 
+          client.request(:post, client.access_token_url, {
               'client_id' => client_id,
-              'grant_type' => 'refresh_token', 
+              'grant_type' => 'refresh_token',
               'client_secret' => client_secret,
-              'refresh_token' => @access_token.refresh_token 
+              'refresh_token' => @access_token.refresh_token
             }.merge(options))
           @access_token = client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
         end
-        
+
         super
       rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied, CallbackError => e
         fail!(:invalid_credentials, e)
@@ -83,16 +83,15 @@ module OmniAuth
       end
 
       def build_access_token
-        verifier = request.params['code']        
+        verifier = request.params['code']
         client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
       end
-      
+
       def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'credentials' => {
-            'token' => @access_token.token
-          }
-        })
+        credentials = {'token' => @access_token.token}
+        credentials.merge('refresh_token' => @access_token.refresh_token) if @access_token.expires?
+
+        OmniAuth::Utils.deep_merge(super, {'credentials' => credentials})
       end
     end
   end

data/lib/omniauth/strategies/qzone.rb

@@ -0,0 +1,69 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to qzone (QQ) via OAuth and retrieve basic
+    # user information.
+    #
+    # Usage:
+    #
+    #    use OmniAuth::Strategies::Qzone, 'consumerkey', 'consumersecret'
+    #
+    class Qzone < OmniAuth::Strategies::OAuth
+      # Initialize the middleware
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        client_options = {
+          :site => 'http://openapi.qzone.qq.com',
+          :request_token_path => '/oauth/qzoneoauth_request_token',
+          :access_token_path  => '/oauth/qzoneoauth_access_token',
+          :authorize_path     => '/oauth/qzoneoauth_authorize',
+          :scheme             => :query_string,
+          :http_method        => :get
+        }
+
+        options[:authorize_params] = {:oauth_consumer_key => consumer_key}
+        super(app, :qzone, consumer_key, consumer_secret, client_options, options)
+      end
+
+      #HACK qzone is using a none-standard parameter oauth_overicode
+      def consumer_options
+        @consumer_options[:access_token_path] = '/oauth/qzoneoauth_access_token?oauth_vericode=' + request['oauth_vericode'] if request['oauth_vericode']
+        @consumer_options
+      end
+
+      def callback_phase
+        session['oauth'][name.to_s]['callback_confirmed'] = true
+        super
+      end
+
+      def auth_hash
+        ui = user_info
+        OmniAuth::Utils.deep_merge(super, {
+            'uid' => ui['uid'],
+            'user_info' => ui,
+            'extra' => {'user_hash' => user_hash}
+          })
+      end
+
+      def user_info
+        user_hash = self.user_hash
+        {
+          'uid' => @access_token.params[:openid],
+          'nickname' => user_hash['nickname'],
+          'name' =>  user_hash['nickname'],
+          'image' => user_hash['figureurl'],
+          'urls' => {
+            'figureurl_1' => user_hash['figureurl_1'],
+            'figureurl_2' => user_hash['figureurl_2'],
+          }
+        }
+      end
+
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get("/user/get_user_info?format=json&openid=#{@access_token.params[:openid]}").body)
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/rdio.rb

@@ -0,0 +1,45 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Rdio via OAuth and retrieve basic user information.
+    # Usage:
+    #    use OmniAuth::Strategies::Rdio, 'consumerkey', 'consumersecret'
+    #
+    class Rdio < OmniAuth::Strategies::OAuth
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        opts = {
+          :site               => 'http://api.rdio.com',
+          :request_token_path => "/oauth/request_token",
+          :access_token_path  => "/oauth/access_token",
+          :authorize_url      => "https://www.rdio.com/oauth/authorize"
+        }
+        super(app, :rdio, consumer_key, consumer_secret, opts, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid'       => user_hash['key'],
+          'user_info' => user_info,
+          'extra'     => { 'user_hash' => user_hash }
+        })
+      end
+
+      def user_info
+        user = user_hash
+        {
+          'nickname'   => user['username'],
+          'first_name' => user['firstName'],
+          'last_name'  => user['lastName'],
+          'name'       => "#{user['firstName']} #{user['lastName']}"
+        }
+      end
+
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.post("http://api.rdio.com/1/", { :method => 'currentUser', :extras => 'username' }).body)['result']
+      end
+    end
+  end
+end