omniauth 0.2.5 → 0.2.6

data/oa-oauth/lib/omniauth/strategies/mailru.rb

@@ -0,0 +1,107 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Vkontakte utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    # documentation available here:
+    # http://api.mail.ru/docs/guides/oauth/sites/
+    #
+    # @example Basic Usage
+    #     use OmniAuth::Strategies::Mailru, 'API Key', 'Secret Key', :private_key => 'Private Key'
+    class Mailru < OAuth2
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] api_key the application id as [registered in Mailru]
+      # @param [String] secret_key the application secret as [registered in Mailru]
+      def initialize(app, api_key = nil, secret_key = nil, options = {}, &block)
+        client_options = {
+          :site => 'https://connect.mail.ru',
+          :authorize_path => '/oauth/authorize',
+          :access_token_path => '/oauth/token'
+        }
+
+        @private_key  = options[:private_key]
+
+        super(app, :mailru, api_key, secret_key, client_options, options, &block)
+      end
+
+      protected
+
+      def request_phase
+        options[:response_type] ||= 'code'
+        super
+      end
+
+      def calculate_signature(params)
+        str = params['uids'] + (params.sort.collect { |c| "#{c[0]}=#{c[1]}" }).join('') + @private_key
+        Digest::MD5.hexdigest(str)
+      end
+
+      def user_data
+        request_params = {
+          'method' => 'users.getInfo',
+          'app_id' => client_id,
+          'session_key' => @access_token.token,
+          'uids' => @access_token['x_mailru_vid']
+        }
+
+        request_params.merge!('sig' => calculate_signature(request_params))
+        @data ||= MultiJson.decode(client.request(:get, 'http://www.appsmail.ru/platform/api', request_params))[0]
+      end
+
+      #"uid": "15410773191172635989",
+      #"first_name": "Евгений",
+      #"last_name": "Маслов",
+      #"nick": "maslov",
+      #"sex": 0,
+      #"birthday": "15.02.1980",
+      #"has_pic": 1,
+      #"pic": "http://avt.appsmail.ru/mail/emaslov/_avatar",
+      #"pic_small": "http://avt.appsmail.ru/mail/emaslov/_avatarsmall",
+      #"pic_big": "http://avt.appsmail.ru/mail/emaslov/_avatarbig",
+      #"link": "http://my.mail.ru/mail/emaslov/",
+      #"referer_type": "",
+      #"referer_id": "",
+      #"is_online": 1,
+      #"vip" : 1,
+      #"location": {
+      #  "country": {
+      #    "name": "Россия",
+      #    "id": "24"
+      #  },
+      #  "city": {
+      #    "name": "Москва",
+      #    "id": "25"
+      #  },
+      #  "region": {
+      #    "name": "Москва",
+      #    "id": "999999"
+      #  }
+      #}
+
+      def user_info
+        {
+          'nickname' => user_data['nick'],
+          'email' =>  user_data['email'],
+          'first_name' => user_data["first_name"],
+          'last_name' => user_data["last_name"],
+          'name' => "#{user_data['first_name']} #{user_data['last_name']}",
+          'image' => @data['pic'],
+          'urls' => {
+            'Mailru' => user_data["link"]
+          }
+        }
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_data['uid'],
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_data}
+        })
+      end
+    end
+  end
+end

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

@@ -31,15 +31,13 @@ module OmniAuth
         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}
-        r = Rack::Response.new
 
         if request_token.callback_confirmed?
-          r.redirect(request_token.authorize_url(options[:authorize_params]))
+          redirect request_token.authorize_url(options[:authorize_params])
         else
-          r.redirect(request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url)))
+          redirect request_token.authorize_url(options[:authorize_params].merge(:oauth_callback => callback_url))
         end
 
-        r.finish
       rescue ::Timeout::Error => e
         fail!(:timeout, e)
       end

data/oa-oauth/lib/omniauth/strategies/oauth2.rb

@@ -49,7 +49,7 @@ module OmniAuth
       end
 
       def callback_url
-        full_host + callback_path
+        full_host + script_name + callback_path
       end
 
       protected
@@ -64,22 +64,15 @@ module OmniAuth
         end
 
         @access_token = build_access_token
-
-        if @access_token.expires? && @access_token.expires_in <= 0
-          client.request(:post, client.access_token_url, {
-              'client_id' => client_id,
-              'grant_type' => 'refresh_token',
-              'client_secret' => client_secret,
-              'refresh_token' => @access_token.refresh_token
-            }.merge(options))
-          @access_token = client.web_server.get_access_token(verifier, {:redirect_uri => callback_url}.merge(options))
-        end
+        @access_token = client.web_server.refresh_access_token(@access_token.refresh_token) if @access_token.expired?
 
         super
       rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied, CallbackError => e
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
+      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
+        fail!(:timeout, e)
       end
 
       def build_access_token
@@ -89,7 +82,7 @@ module OmniAuth
 
       def auth_hash
         credentials = {'token' => @access_token.token}
-        credentials.merge('refresh_token' => @access_token.refresh_token) if @access_token.expires?
+        credentials.merge!('refresh_token' => @access_token.refresh_token) if @access_token.expires?
 
         OmniAuth::Utils.deep_merge(super, {'credentials' => credentials})
       end

data/oa-oauth/lib/omniauth/strategies/plurk.rb

@@ -0,0 +1,58 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Plurk via OAuth and retrieve basic user info.
+    #
+    # Please note that this strategy relies on Plurk API 2.0,
+    # which is still in Beta.
+    #
+    # Usage:
+    #   use OmniAuth::Strategies::Plurk
+    class Plurk < OmniAuth::Strategies::OAuth
+
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] client_key App key [registered on plurk] (http://www.plurk.com/PlurkApp/register)
+      # @param [String] client_secret App secret registered on plurk
+      def initialize(app, client_key = nil, client_secret = nil, options = {}, &block)
+        client_options = { :site => 'http://www.plurk.com',
+                           :request_token_path => '/OAuth/request_token',
+                           :access_token_path => '/OAuth/access_token',
+                           :authorize_path => '/OAuth/authorize' }
+
+        super(app, :plurk, client_key, client_secret, client_options, options)
+      end
+
+      def auth_hash
+        user = self.user_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user['id'],
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_hash}
+        })
+      end
+
+      def user_info
+        user = self.user_hash
+        {
+          'name' => user['full_name'],
+          'nickname' => user['display_name'] || user['nick_name'],
+          'location' => user['location'],
+          'image' => if user['has_profile_image'] == 1
+                        "http://avatars.plurk.com/#{user['id']}-medium#{user['avatar']}.gif"
+                      else
+                        "http://www.plurk.com/static/default_medium.gif"
+                      end,
+          'urls' => { 'Plurk' => 'http://plurk.com/' + user['nick_name']}
+        }
+      end
+
+      def user_hash
+        @user_hash  ||= MultiJson.decode(@access_token.get('/APP/Profile/getOwnProfile').body)['user_info']
+      end
+
+    end
+  end
+end

data/oa-oauth/lib/omniauth/strategies/taobao.rb

@@ -0,0 +1,79 @@
+require 'omniauth/oauth'
+require 'multi_json'
+require 'digest/md5'
+require 'net/http'
+
+module OmniAuth
+  module Strategies
+    # Authenticate to Renren utilizing OAuth 2.0 and retrieve
+    # basic user information.
+    #
+    # @example Basic Usage
+    # use OmniAuth::Strategies::TB, 'client_id', 'client_secret'
+    class TB < OAuth2
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] client_id the app key at taobao open platform
+      # @param [String] client_secret  the app secret at taobao open platform
+      # @option options [String]
+
+      def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
+        client_options = {
+          :site => "https://oauth.taobao.com/",
+          :authorize_url => "/authorize",
+          :access_token_url => "/token"
+        }
+
+        super(app, :tb, client_id, client_secret, client_options, options, &block)
+      end
+
+      def user_data
+        # TODO to be moved in options
+        url = 'http://gw.api.taobao.com/router/rest'
+
+        query_param = {
+          :app_key => client_id,
+
+          # TODO to be moved in options
+          # TODO add more default fields (http://my.open.taobao.com/apidoc/index.htm#categoryId:1-dataStructId:3)
+          :fields => 'user_id,uid,nick,sex,buyer_credit,seller_credit,location,created,last_visit,birthday,type,status,alipay_no,alipay_account,alipay_account,email,consumer_protection,alipay_bind',
+          :format => 'json',
+          :method => 'taobao.user.get',
+          :session => @access_token.token,
+          :sign_method => 'md5',
+          :timestamp   => Time.now.strftime("%Y-%m-%d %H:%M:%S"),
+          :v => '2.0'
+        }
+        query_param = generate_sign(query_param)
+        res = Net::HTTP.post_form(URI.parse(url), query_param)
+        @data ||= MultiJson.decode(res.body)["user_get_response"]["user"]
+      end
+
+      def request_phase
+        options[:state] ||= '1'
+        super
+      end
+
+      def user_info
+        {
+          'name' => user_data["nick"],
+          'email' => (user_data["email"] if user_data["email"]),
+        }
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => user_data['uid'],
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_data}
+        })
+      end
+
+      def generate_sign(params)
+        str = client_secret + (params.sort.collect { |k, v| "#{k}#{v}" }).join + client_secret
+        params["sign"] = Digest::MD5.hexdigest(str).upcase!
+        params
+      end
+
+    end
+  end
+end

data/oa-oauth/lib/omniauth/strategies/vkontakte.rb

@@ -29,17 +29,19 @@ module OmniAuth
 
       def user_data
         # http://vkontakte.ru/developers.php?o=-17680044&p=Description+of+Fields+of+the+fields+Parameter
-        @fields ||= ['uid', 'first_name', 'last_name', 'nickname', 'domain', 'sex', 'city', 'country', 'timezone', 'photo', 'photo_big']
+        @fields ||= ['uid', 'first_name', 'last_name', 'nickname', 'domain', 'sex', 'bdate', 'city', 'country', 'timezone', 'photo', 'photo_big']
 
         # http://vkontakte.ru/developers.php?o=-1&p=getProfiles
         @data ||= MultiJson.decode(@access_token.get("https://api.vkontakte.ru/method/getProfiles?uid=#{@access_token['user_id']}&fields=#{@fields.join(',')}&access_token=#{@access_token.token}"))['response'][0]
 
         # we need these 2 additional requests since vkontakte returns only ids of the City and Country
         # http://vkontakte.ru/developers.php?o=-17680044&p=getCities
-        @city ||= MultiJson.decode(@access_token.get("https://api.vkontakte.ru/method/getCities?cids=#{@data['city']}&access_token=#{@access_token.token}"))['response'][0]['name']
+        cities = MultiJson.decode(@access_token.get("https://api.vkontakte.ru/method/getCities?cids=#{@data['city']}&access_token=#{@access_token.token}"))['response']
+        @city ||= cities.first['name'] if cities && cities.first
 
         # http://vkontakte.ru/developers.php?o=-17680044&p=getCountries
-        @country ||= MultiJson.decode(@access_token.get("https://api.vkontakte.ru/method/getCountries?cids=#{@data['country']}&access_token=#{@access_token}"))['response'][0]['name']
+        countries = MultiJson.decode(@access_token.get("https://api.vkontakte.ru/method/getCountries?cids=#{@data['country']}&access_token=#{@access_token}"))['response']
+        @country ||= countries.first['name'] if countries && countries.first
       end
 
     def request_phase
@@ -49,10 +51,11 @@ module OmniAuth
 
     def user_info
       {
-        'firstname' => @data['first_name'],
+        'first_name' => @data['first_name'],
         'last_name' => @data['last_name'],
         'name' => "#{@data['first_name']} #{@data['last_name']}",
         'nickname' => @data['nickname'],
+        'birth_date' => @data['bdate'],
         'image' => @data['photo'],
         'location' => "#{@country}, #{@city}",
         'urls' => {

data/oa-oauth/lib/omniauth/version.rb

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

data/oa-oauth/oa-oauth.gemspec

@@ -3,7 +3,6 @@ require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'faraday', '~> 0.6.1'
-  gem.add_runtime_dependency 'jruby-openssl', '~> 0.7.3' if RUBY_PLATFORM == 'java'
   gem.add_runtime_dependency 'multi_json', '~> 1.0.0'
   gem.add_runtime_dependency 'multi_xml', '~> 0.2.2'
   gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
@@ -16,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-oauth'
   gem.version = OmniAuth::Version::STRING

data/oa-oauth/spec/omniauth/strategies/mailru_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe OmniAuth::Strategies::Mailru do
+  it_should_behave_like "an oauth2 strategy"
+end

data/oa-oauth/spec/omniauth/strategies/plurk_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe OmniAuth::Strategies::Plurk do
+  it_should_behave_like 'an oauth strategy'
+end

data/oa-oauth/spec/omniauth/strategies/taobao_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe OmniAuth::Strategies::TB do
+  it_should_behave_like "an oauth2 strategy"
+end

data/oa-openid/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+platforms :jruby do
+  gem 'jruby-openssl', '~> 0.7'
+end
+
+gemspec

data/oa-openid/lib/omniauth/openid.rb

@@ -55,5 +55,6 @@ module OmniAuth
   module Strategies
     autoload :OpenID, 'omniauth/strategies/open_id'
     autoload :GoogleApps, 'omniauth/strategies/google_apps'
+    autoload :Steam, 'omniauth/strategies/steam'
   end
 end

data/oa-openid/lib/omniauth/strategies/steam.rb

@@ -0,0 +1,55 @@
+require 'omniauth/openid'
+module OmniAuth
+  module Strategies
+    class Steam < OmniAuth::Strategies::OpenID
+      def initialize(app, store = nil, api_key = nil, options = {}, &block)
+        options[:identifier] ||= "http://steamcommunity.com/openid"
+        options[:name] ||= 'steam'
+        @api_key = api_key
+        super(app, store, options, &block)
+      end
+
+      def user_info(response=nil)
+        player = user_hash['response']['players']['player'].first
+        nickname = player["personaname"]
+        name = player["realname"]
+        url = player["profileurl"]
+        country = player["loccountrycode"]
+        state = player["locstatecode"]
+        city = player["loccityid"]
+
+        {
+          'nickname' => nickname,
+          'name' => name,
+          'url' => url,
+          'location' => "#{city}, #{state}, #{country}"
+        }
+      end
+
+      def user_hash
+        # Steam provides no information back on a openid response other than a 64bit user id
+        # Need to use this information and make a API call to get user information from steam.
+        if @api_key
+          unless @user_hash
+            uri = URI.parse("http://api.steampowered.com/")
+            req = Net::HTTP::Get.new("#{uri.path}ISteamUser/GetPlayerSummaries/v0001/?key=#{@api_key}&steamids=#{@openid_response.display_identifier.split("/").last}")
+            res = Net::HTTP.start(uri.host, uri.port) {|http|
+              http.request(req)
+            }
+          end
+          @user_hash ||= MultiJson.decode(res.body)
+        else
+          {}
+        end
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => @openid_response.display_identifier.split("/").last,
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_hash}
+        })
+      end
+    end
+  end
+end