oa-oauth 0.2.4 → 0.2.5

data/lib/omniauth/oauth.rb

@@ -6,39 +6,48 @@ module OmniAuth
     autoload :OAuth2,             'omniauth/strategies/oauth2'
     autoload :XAuth,              'omniauth/strategies/xauth'
 
-    autoload :Twitter,            'omniauth/strategies/twitter'
-    autoload :LinkedIn,           'omniauth/strategies/linked_in'
+    autoload :Bitly,              'omniauth/strategies/bitly'
+    autoload :Dailymile,          'omniauth/strategies/dailymile'
+    autoload :Doit,               'omniauth/strategies/doit'
+    autoload :Dopplr,             'omniauth/strategies/dopplr'
+    autoload :Douban,             'omniauth/strategies/douban'
+    autoload :Evernote,           'omniauth/strategies/evernote'
     autoload :Facebook,           'omniauth/strategies/facebook'
-    autoload :GitHub,             'omniauth/strategies/github'
-    autoload :ThirtySevenSignals, 'omniauth/strategies/thirty_seven_signals'
     autoload :Foursquare,         'omniauth/strategies/foursquare'
-    autoload :Gowalla,            'omniauth/strategies/gowalla'
-    autoload :Identica,           'omniauth/strategies/identica'
-    autoload :TripIt,             'omniauth/strategies/trip_it'
-    autoload :Dopplr,             'omniauth/strategies/dopplr'
-    autoload :Meetup,             'omniauth/strategies/meetup'
-    autoload :Salesforce,         'omniauth/strategies/salesforce'
-    autoload :SoundCloud,         'omniauth/strategies/sound_cloud'
-    autoload :SmugMug,            'omniauth/strategies/smug_mug'
+    autoload :GitHub,             'omniauth/strategies/github'
     autoload :Goodreads,          'omniauth/strategies/goodreads'
-    autoload :Yahoo,              'omniauth/strategies/yahoo'
-    autoload :TypePad,            'omniauth/strategies/type_pad'
     autoload :Google,             'omniauth/strategies/google'
-    autoload :Netflix,            'omniauth/strategies/netflix'
-    autoload :Bitly,              'omniauth/strategies/bitly'
-    autoload :Vimeo,              'omniauth/strategies/vimeo'
-    autoload :YouTube,            'omniauth/strategies/you_tube'
+    autoload :Gowalla,            'omniauth/strategies/gowalla'
     autoload :Hyves,              'omniauth/strategies/hyves'
-    autoload :Miso,               'omniauth/strategies/miso'
-    autoload :Dailymile,          'omniauth/strategies/dailymile'
+    autoload :Identica,           'omniauth/strategies/identica'
     autoload :Instagram,          'omniauth/strategies/instagram'
-    autoload :Mixi,               'omniauth/strategies/mixi'
-    autoload :Evernote,           'omniauth/strategies/evernote'
-    autoload :Doit,               'omniauth/strategies/doit'
     autoload :Instapaper,         'omniauth/strategies/instapaper'
-    autoload :TradeMe,            'omniauth/strategies/trade_me'
+    autoload :LinkedIn,           'omniauth/strategies/linked_in'
+    autoload :Meetup,             'omniauth/strategies/meetup'
+    autoload :Miso,               'omniauth/strategies/miso'
+    autoload :Mixi,               'omniauth/strategies/mixi'
+    autoload :Netflix,            'omniauth/strategies/netflix'
+    autoload :Qzone,              'omniauth/strategies/qzone'
+    autoload :Rdio,               'omniauth/strategies/rdio'
+    autoload :Renren,             'omniauth/strategies/renren'
+    autoload :Salesforce,         'omniauth/strategies/salesforce'
+    autoload :SmugMug,            'omniauth/strategies/smug_mug'
+    autoload :SoundCloud,         'omniauth/strategies/sound_cloud'
+    autoload :T163,               'omniauth/strategies/t163'
     autoload :Teambox,            'omniauth/strategies/teambox'
+    autoload :ThirtySevenSignals, 'omniauth/strategies/thirty_seven_signals'
+    autoload :Tqq,                'omniauth/strategies/tqq'
+    autoload :TradeMe,            'omniauth/strategies/trade_me'
+    autoload :TripIt,             'omniauth/strategies/trip_it'
+    autoload :Tsina,              'omniauth/strategies/tsina'
+    autoload :Tsohu,              'omniauth/strategies/tsohu'
     autoload :Tumblr,             'omniauth/strategies/tumblr'
+    autoload :Twitter,            'omniauth/strategies/twitter'
+    autoload :TypePad,            'omniauth/strategies/type_pad'
+    autoload :Vimeo,              'omniauth/strategies/vimeo'
     autoload :Vkontakte,          'omniauth/strategies/vkontakte'
+    autoload :Yahoo,              'omniauth/strategies/yahoo'
+    autoload :Yammer,             'omniauth/strategies/yammer'
+    autoload :YouTube,            'omniauth/strategies/you_tube'
   end
 end

data/lib/omniauth/strategies/bitly.rb

@@ -22,16 +22,16 @@ module OmniAuth
 
         super(app, :bitly, api_key, secret_key, client_options, options, &block)
       end
-      
+
       protected
-      
+
       def user_data
         {
           'login' => @access_token['login'],
           'api_key' => @access_token['apiKey']
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => @access_token['login'],
@@ -43,4 +43,4 @@ module OmniAuth
 
   end
 
-end
+end

data/lib/omniauth/strategies/doit.rb

@@ -10,26 +10,26 @@ module OmniAuth
           :authorize_url => 'https://openapi.doit.im/oauth/authorize',
           :access_token_url => 'https://openapi.doit.im/oauth/access_token'
         }
-        
+
         super(app, :doit, consumer_key, consumer_secret, client_options, options, &block)
       end
-      
+
       protected
-      
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get(client.site+"/v1/settings"),{'Authorization'=> 'OAuth'+@access_token.token})
       end
-      
+
       def request_phase
         options[:response_type] ||= "code"
         super
       end
-      
+
       def callback_phase
         options[:grant_type] ||= 'authorization_code'
         super
       end
-      
+
       def user_info
         {
           'account' => user_data['account'],
@@ -47,7 +47,7 @@ module OmniAuth
           'updated'=> user_data['updated']
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['id'],
@@ -57,4 +57,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/omniauth/strategies/dopplr.rb

@@ -21,14 +21,14 @@ module OmniAuth
           :access_token_path  => "/oauth/access_token",
           :authorize_path    => "/oauth/authorize"
         }
-        
+
         super(app, :dopplr, consumer_key, consumer_secret, client_options, options, &block)
-      end  
-      
+      end
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get('/oauthapi/whoami').body)['whoami']
       end
-      
+
       def user_info
         {
           'nickname' => user_data["nick"],
@@ -40,14 +40,14 @@ module OmniAuth
             'DopplrMobile' => user_data["mobile_url"],
           }
         }
-      end      
+      end
 
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['nick'],
           'user_info' => user_info
         })
-      end      
+      end
     end
   end
 end

data/lib/omniauth/strategies/douban.rb

@@ -0,0 +1,60 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Douban via OAuth and retrieve basic
+    # user information.
+    #
+    # Usage:
+    #
+    #    use OmniAuth::Strategies::Douban, 'APIKey', 'APIKeySecret'
+    #
+    class Douban < OmniAuth::Strategies::OAuth
+      def initialize(app, consumer_key = nil, consumer_secret = nil, options = {}, &block)
+        # Although in OAuth spec the :realm parameter is optional,
+        # it is required for Douban.
+        client_options = {
+          :site               => 'http://www.douban.com',
+          :request_token_path => '/service/auth/request_token',
+          :access_token_path  => '/service/auth/access_token',
+          :authorize_path     => '/service/auth/authorize',
+          :realm              => 'OmniAuth'
+        }
+
+        super(app, :douban, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => @access_token.params[:douban_user_id],
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_hash}
+        })
+      end
+
+      def user_info
+        user_hash = self.user_hash
+
+        location = user_hash['location'] ? user_hash['location']['$t'] : nil
+        image = user_hash['link'].find {|l| l['@rel'] == 'icon' }['@href']
+        douban_url = user_hash['link'].find {|l| l['@rel'] == 'alternate' }['@href']
+        {
+          'username' => user_hash['db:uid']['$t'],
+          'name' => user_hash['title']['$t'],
+          'location' => location,
+          'image' => image,
+          'description' => user_hash['content']['$t'],
+          'urls' => {
+            'Douban' => douban_url
+          }
+        }
+      end
+
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get('http://api.douban.com/people/%40me?alt=json').body)
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/evernote.rb

@@ -1,11 +1,6 @@
 require 'omniauth/oauth'
 require 'multi_json'
-
-begin
-  require 'evernote'
-rescue LoadError => e
-  raise "Omniauth Evernote strategy requires 'evernote' gem. Add it to your Gemfile: gem 'evernote'"
-end
+require 'evernote'
 
 module OmniAuth
   module Strategies

data/lib/omniauth/strategies/facebook.rb

@@ -16,16 +16,16 @@ module OmniAuth
       def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
         super(app, :facebook, client_id, client_secret, {:site => 'https://graph.facebook.com/'}, options, &block)
       end
-      
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get('/me', {}, { "Accept-Language" => "en-us,en;"}))
       end
-      
+
       def request_phase
         options[:scope] ||= "email,offline_access"
         super
       end
-      
+
       def build_access_token
         if facebook_session.nil? || facebook_session.empty?
           super
@@ -41,7 +41,7 @@ module OmniAuth
         else
           nil
         end
-      end      
+      end
 
       def user_info
         {
@@ -57,7 +57,7 @@ module OmniAuth
           }
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['id'],

data/lib/omniauth/strategies/foursquare.rb

@@ -9,33 +9,38 @@ module OmniAuth
       # @option options [Boolean, true] :sign_in When true, use a sign-in flow instead of the authorization flow.
       # @option options [Boolean, false] :mobile When true, use the mobile sign-in interface.
       def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+        options[:sign_in] ||= true
         super(app, :foursquare, client_id, client_secret, {
           :site => "https://api.foursquare.com/v2",
-          :authorize_url      => "https://foursquare.com/oauth2/authenticate",
+          :authorize_url      => authorize_url(options),
           :access_token_url   => "https://foursquare.com/oauth2/access_token"
         }, options, &block)
       end
-      
+
+      def authorize_url(options)
+        "https://foursquare.com/#{'mobile/' if options[:mobile]}oauth2/#{options[:sign_in] ? 'authenticate' : 'authorize'}"
+      end
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get(client.site+'/users/self', {'oauth_token' => @access_token.token}))
       end
-      
+
       def request_phase
         options[:response_type] ||= 'code'
         super
       end
-      
+
       def callback_phase
         options[:grant_type] ||= 'authorization_code'
         super
       end
-      
+
       def user_info
         {
           'nickname' => user_data['response']['user']['contact']['twitter'],
           'first_name' => user_data['response']['user']['firstName'],
           'last_name' => user_data['response']['user']['lastName'],
-          'email' => user_data['response']['user']['contact']['twitter'],
+          'email' => user_data['response']['user']['contact']['email'],
           'name' => "#{user_data['response']['user']['firstName']} #{user_data['response']['user']['lastName']}".strip,
         # 'location' => user_data['response']['user']['location'],
           'image' => user_data['response']['user']['photo'],
@@ -44,7 +49,7 @@ module OmniAuth
           'urls' => {}
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['response']['user']['id'],

data/lib/omniauth/strategies/github.rb

@@ -3,7 +3,7 @@ require 'multi_json'
 
 module OmniAuth
   module Strategies
-    # OAuth 2.0 based authentication with GitHub. In order to 
+    # OAuth 2.0 based authentication with GitHub. In order to
     # sign up for an application, you need to [register an application](http://github.com/account/applications/new)
     # and provide the proper credentials to this middleware.
     class GitHub < OAuth2
@@ -16,16 +16,16 @@ module OmniAuth
           :authorize_path => '/login/oauth/authorize',
           :access_token_path => '/login/oauth/access_token'
         }
-        
+
         super(app, :github, client_id, client_secret, client_options, options, &block)
       end
-      
+
       protected
-      
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get('/api/v2/json/user/show'))['user']
       end
-      
+
       def user_info
         {
           'nickname' => user_data["login"],
@@ -37,7 +37,7 @@ module OmniAuth
           }
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data['id'],

data/lib/omniauth/strategies/goodreads.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+require 'multi_xml'
 require 'omniauth/oauth'
 
 module OmniAuth
@@ -23,9 +23,9 @@ module OmniAuth
       end
 
       def user_hash(access_token)
-        authenticated_user = Nokogiri::XML::Document.parse(@access_token.get('/api/auth_user').body)
+        authenticated_user = MultiXml.parse(@access_token.get('/api/auth_user').body)
         id = authenticated_user.xpath('GoodreadsResponse/user').attribute('id').value.to_i
-        response_doc = Nokogiri::XML::Document.parse(open("http://www.goodreads.com/user/show/#{id}.xml?key=#{@consumer_key}").read)
+        response_doc = MultiXml.parse(open("http://www.goodreads.com/user/show/#{id}.xml?key=#{@consumer_key}").read)
         user = response_doc.xpath('GoodreadsResponse/user')
 
         hash = {

data/lib/omniauth/strategies/gowalla.rb

@@ -20,21 +20,21 @@ module OmniAuth
           :authorize_url => 'https://gowalla.com/api/oauth/new',
           :access_token_url => 'https://api.gowalla.com/api/oauth/token'
         }
-        
+
         super(app, :gowalla, api_key, secret_key, client_options, options, &block)
       end
-      
+
       protected
-      
+
       def user_data
         @data ||= MultiJson.decode(@access_token.get("/users/me.json"))
       end
-      
+
       def request_phase
         options[:scope] ||= "read"
         super
       end
-      
+
       def user_info
         {
           'name' => "#{user_data['first_name']} #{user_data['last_name']}",
@@ -51,7 +51,7 @@ module OmniAuth
           }
         }
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data["url"].split('/').last,

data/lib/omniauth/strategies/hyves.rb

@@ -15,10 +15,10 @@ module OmniAuth
         }
         super(app, :hyves, consumer_key, consumer_secret, client_options, options, &block)
       end
-      
+
       def auth_hash
-        hash = user_hash(@access_token)   
-                     
+        hash = user_hash(@access_token)
+
         {
           "provider" => "hyves",
           "uid" => hash["userid"],
@@ -33,35 +33,35 @@ module OmniAuth
           }
         }
       end
-      
+
       def user_hash(access_token)
         rsp = MultiJson.decode( access_token.get("http://data.hyves-api.nl/?userid=#{access_token.params[:userid]}&ha_method=users.get&#{default_options}").body )
         rsp["user"].first
       end
-      
+
       def request_token_path
         "http://data.hyves-api.nl/?#{request_token_options}&#{default_options}"
       end
-      
+
       def access_token_path
         "http://data.hyves-api.nl/?#{access_token_options}&#{default_options}"
       end
-      
+
       def default_options
-        to_params( { :ha_version => "2.0", :ha_format => "json", :ha_fancylayout => false } )            
+        to_params( { :ha_version => "2.0", :ha_format => "json", :ha_fancylayout => false } )
       end
-      
+
       def request_token_options
-        to_params( { :methods => "users.get,friends.get,wwws.create", :ha_method => "auth.requesttoken", :strict_oauth_spec_response => true } )          
+        to_params( { :methods => "users.get,friends.get,wwws.create", :ha_method => "auth.requesttoken", :strict_oauth_spec_response => true } )
       end
-      
+
       def access_token_options
         to_params( { :ha_method => "auth.accesstoken", :strict_oauth_spec_response => true } )
       end
-      
+
       def to_params(options)
         options.collect { |key, value| "#{key}=#{value}"}.join('&')
-      end      
+      end
     end
   end
-end
+end