omniauth_china 0.1.0 → 0.1.1

data/README.markdown

@@ -1,10 +1,15 @@
 # OmniAuth: Standardized Multi-Provider Authentication
 
-OmniAuth is a new Rack-based authentication system for multi-provider external authentcation. OmniAuth is built from the ground up on the philosophy that **authentication is not the same as identity**, and is based on two observations:
+OmniAuth is a new Rack-based authentication system for multi-provider external authentcation. OmniAuth is built from the ground up on the philosophy that **authentication is not the same as identity**.
+
+## Apparently, oauth providers of China have already been merged into [intridea/omniauth](https://github.com/intridea/omniauth). Go take a look.
+
 
 # OmniAuthChina (omniauth_china) 
 
-OmniAuth China is an extention of OmniAuth, it addes Open ID providers in China such as Douban, Sina, Sohu, 163, Tencent, Renren, etc.
+OmniAuth China is an extention of OmniAuth, it addes Open ID providers in China such as Douban, Sina, Sohu, 163, Tencent, Renren, Qzone, etc.
+
+## Note
 
 ## Installation
 
@@ -22,11 +27,8 @@ OmniAuth currently supports the following external providers:
   * T163 (credit: [he9qi](http://github.com/he9qi))
   * Tsohu (credit: [he9qi](http://github.com/he9qi))
   * Tqq (credit: [he9qi](http://github.com/he9qi))
-  * Renren (credit: [taweili](http://github.com/taweili), [rainux](http://github.com/rainux), [he9qi](http://github.com/he9qi))
-
-## 人人（[taweili](http://github.com/taweili), [rainux](http://github.com/rainux), [he9qi](http://github.com/he9qi))
-
-人人 has been updated to Oauth 2.0; However, as of right now, 人人 still needs session key to get more user information other than just uid[see here](http://wiki.dev.renren.com/wiki/%E8%8E%B7%E5%8F%96%E4%BA%BA%E4%BA%BA%E7%BD%91%E8%B5%84%E6%BA%90), so we still need to request the session key by `https://graph.renren.com/renren_api/session_key?oauth_token='access_token'`.  Hopefully this will change soon in the future.
+  * Renren (credit: [quake](http://github.com/quake))
+  * Qzone (credit: [quake](http://github.com/quake))
 
 ## Usage
 

data/lib/omniauth_china/oauth_china.rb

@@ -8,5 +8,6 @@ module OmniAuth
     autoload :Tsohu,              'omniauth_china/strategies/tsohu'
     autoload :Tqq,                'omniauth_china/strategies/tqq'
     autoload :Renren,             'omniauth_china/strategies/renren'
+    autoload :Qzone,              'omniauth_china/strategies/qzone'
   end
 end

data/lib/omniauth_china/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_china/strategies/renren.rb

@@ -1,79 +1,87 @@
 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::Renren, 'client_id', 'client_secret'
     class Renren < OAuth2
-      autoload :Session, 'omniauth_china/strategies/renren/session'
-      autoload :Service, 'omniauth_china/strategies/renren/service'
-      
-      class << self
-        def api_key; @@api_key; end
-        def secret_key; @@secret_key; end
-      end
-      
       # @param [Rack Application] app standard middleware application parameter
-      # @param [String] client_id the application id as [registered on Renren](http://www.renren.com/developers/)
+      # @param [String] client_id the application id as [registered on Renren](http://dev.renren.com/)
       # @param [String] client_secret the application secret as registered on Renren
-      # @option options [String] :scope ('email') comma-separated extended permissions such as `email` and `manage_pages`
+      # @option options [String] :scope ('publish_feed,status_update') comma-separated extended permissions such as `publish_feed` and `status_update`
       def initialize(app, client_id = nil, client_secret = nil, options = {}, &block)
-        @@api_key = client_id
-        @@secret_key = client_secret
-        super(app, :renren, client_id, client_secret, {:site => 'https://graph.renren.com/', :access_token_path => "/oauth/token"}, options, &block)
+        client_options = {
+          :site => "http://graph.renren.com/",
+          :authorize_url      => "/oauth/authorize",
+          :access_token_url   => "/oauth/token"
+        }
+
+        super(app, :renren, client_id, client_secret, client_options, options, &block)
+      end
+
+      def user_data
+        @data ||= MultiJson.decode(Net::HTTP.post_form(URI.parse('http://api.renren.com/restserver.do'), signed_params).body)[0]
+      end
+
+      def signed_params
+        params = {}
+        params[:api_key] = client.id
+        params[:method] = "users.getInfo"
+        params[:call_id] = Time.now.to_i
+        params[:format] = "json"
+        params[:v] = "1.0"
+        params[:uids] = session_key["user"]["id"]
+        params[:session_key] = session_key["renren_token"]["session_key"]
+        params[:sig] = Digest::MD5.hexdigest(params.map {|k,v| "#{k}=#{v}"}.sort.join("") + client.secret)
+        params
       end
-      
-      def user_hash
-        @data ||= MultiJson.decode(@access_token.get('/renren_api/session_key', { :oauth_token => @access_token.token }, { "Accept-Language" => "zh;"}))
-        @renren_session ||= Renren::Session.new(@data)
+
+      def session_key
+        @session_key ||= MultiJson.decode(@access_token.get('/renren_api/session_key'))
       end
-      
+
       def request_phase
-        options[:scope] ||= "email"
-        options[:response_type] ||= "code"
+        options[:scope] ||= "publish_feed"
         super
       end
-      
-      # need to have :grant_type=>"authorization_code" for renren to work
-      def callback_phase
-        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'])
+
+      def build_access_token
+        if renren_session.nil? || renrensession.empty?
+          super
+        else
+          @access_token = ::OAuth2::AccessToken.new(client, renren_session['access_token'])
         end
-        verifier = request.params['code']
-        @access_token = client.web_server.get_access_token(verifier,  {:redirect_uri => callback_url, :grant_type=>"authorization_code" })
-        @env['omniauth.auth'] = auth_hash
-        call_app!
-      rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied, CallbackError => e
-        fail!(:invalid_credentials, e)
       end
-      
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => user_hash.uid,
-          'user_info' => user_info,
-          'extra' => {
-            'user_hash' => user_hash.user
-          }
-        })
+
+      def renren_session
+        session_cookie = request.cookies["rrs_#{client.id}"]
+        if session_cookie
+          @renren_session ||= Rack::Utils.parse_query(request.cookies["rrs_#{client.id}"].gsub('"', ''))
+        else
+          nil
+        end
       end
-      
+
       def user_info
-        user_hash = self.user_hash.user
         {
-          'username' => user_hash['name'],
-          'name' => user_hash['name'],
-          'image' => user_hash['tinyurl'],
-          'vip' => user_hash['vip'],
-          'headurl' => user_hash['headurl']
+          'name' => user_data["name"],
+          'image' => user_data["tinyurl"]
         }
       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/lib/omniauth_china/version.rb

@@ -1,3 +1,3 @@
 module OmniauthChina
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/omniauth_china/strategies/qzone_spec.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Qi He
@@ -68,9 +68,8 @@ files:
 - lib/omniauth_china.rb
 - lib/omniauth_china/oauth_china.rb
 - lib/omniauth_china/strategies/douban.rb
+- lib/omniauth_china/strategies/qzone.rb
 - lib/omniauth_china/strategies/renren.rb
-- lib/omniauth_china/strategies/renren/service.rb
-- lib/omniauth_china/strategies/renren/session.rb
 - lib/omniauth_china/strategies/t163.rb
 - lib/omniauth_china/strategies/tqq.rb
 - lib/omniauth_china/strategies/tsina.rb
@@ -78,6 +77,7 @@ files:
 - lib/omniauth_china/version.rb
 - omniauth_china.gemspec
 - spec/omniauth_china/strategies/douban_spec.rb
+- spec/omniauth_china/strategies/qzone_spec.rb
 - spec/omniauth_china/strategies/renren_spec.rb
 - spec/omniauth_china/strategies/t163_spec.rb
 - spec/omniauth_china/strategies/tqq_spec.rb
@@ -160,6 +160,7 @@ specification_version: 3
 summary: "OmniAuth extension: omniauth for china"
 test_files: 
 - spec/omniauth_china/strategies/douban_spec.rb
+- spec/omniauth_china/strategies/qzone_spec.rb
 - spec/omniauth_china/strategies/renren_spec.rb
 - spec/omniauth_china/strategies/t163_spec.rb
 - spec/omniauth_china/strategies/tqq_spec.rb

data/lib/omniauth_china/strategies/renren/service.rb

@@ -1,22 +0,0 @@
-require 'net/http'
-require 'pp'
-
-module OmniAuth
-  module Strategies
-    class Renren
-      class Service
-        DEBUG = false
-
-        def post(params)
-          pp "### Posting Params: #{params.inspect}" if DEBUG
-          Net::HTTP.post_form(url, params)
-        end
-
-        private
-        def url
-          URI.parse('http://api.renren.com/restserver.do')
-        end
-      end
-    end
-  end
-end

data/lib/omniauth_china/strategies/renren/session.rb

@@ -1,78 +0,0 @@
-require 'digest/md5'
-require 'multi_json'
-
-module OmniAuth
-  module Strategies
-    class Renren
-      class Session
-        class IncorrectSignature < Exception; end
-        class SessionExpired < Exception; end
-        class OtherException < Exception; end
-
-        attr_reader :session_key
-        attr_reader :expires
-        attr_reader :uid
-
-        def initialize(user_hash)
-          @expires = user_hash['renren_token']['expires_in'] ? user_hash['renren_token']['expires_in'].to_i : 0
-          @session_key = user_hash['renren_token']['session_key']
-          @uid = user_hash['user']['id']
-        end
-
-        def user
-          @user ||= invoke_method('users.getInfo', :uids => @uid, :format => :json).first
-        end
-
-        def infinite?
-          @expires == 0
-        end
-
-        def expired?
-          @expires.nil? || (!infinite? && Time.at(@expires) <= Time.now)
-        end
-
-        def secured?
-          !@session_key.nil? && !expired?
-        end
-
-        def invoke_method(method, params = {})
-          xn_params = {
-            :method => method,
-            :api_key => Renren.api_key,
-            :session_key => session_key,
-            :call_id => Time.now.to_i,
-            :v => '1.0',
-            :format => :json
-          }
-          xn_params.merge!(params) if params
-          xn_params.merge!(:sig => compute_sig(xn_params))
-          MultiJson.decode(Service.new.post(xn_params).body)
-        end
-
-        class << self
-          private
-          def verify_signature(renren_sig_params, expected_signature)
-            raise Renren::Session::IncorrectSignature if compute_sig(renren_sig_params) != expected_signature
-            # raise Renren::Session::SignatureTooOld if renren_sig_params['time'] && Time.at(renren_sig_params['time'].to_f) < earliest_valid_session
-            true
-          end
-
-          def compute_sig(params)
-            raw_string = params.collect {|*args| args.join('=') }.sort.join
-            actual_sig = Digest::MD5.hexdigest([raw_string, Renren.secret_key].join)
-          end
-        end
-
-        private
-
-        def verify_signature(renren_sig_params, expected_signature)
-          self.class.send :verify_signature, renren_sig_params, expected_signature
-        end
-
-        def compute_sig(params)
-          self.class.send :compute_sig, params
-        end
-      end
-    end
-  end
-end