omniauth-wechat 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGZhY2RjNDIxZmY5Nzk2YWQ1YTlmYTlhNmU2MzQ5MDRmNDc5YjY1NA==
+    NDcxNTBjMTI0OTZmZDQ2NDM5ZTEyMzVmNDgzMzdmYzc2N2E0ODY1Mw==
   data.tar.gz: !binary |-
-    MDFkNmEzYTU2NTA2ZGU4M2YxMDhlYzU4M2IxOWUwMmEzZjUwMzNjNw==
+    ZDk2M2Q1YzRlYTEyMDFjMmY1NzI3OWY5NDhmOGIwNDNjZWMzZDUxOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mzk1NGE2NmM3Mjg4NjlmOWIxZDRhYjdjNWNiNTU5MDliYTc0ZWJlZTFiMGY2
-    MmVjYzIxYTU5NDllMzUyOTcyM2U0NTIyMDUyYWYwMjRlOWZjMTIzMjVjNDhh
-    YTZlZjI2MWZhNDZmZmEyNzUzOTk2ZTc4NTI2YjQ5MzM2ZTUxNjM=
+    ZjdhNzJmODk4MjE5NTZlNDhkNDdmNmRiN2NjMWJhOGY5NDMyOTcyMjA3MWRl
+    ZTJhNDQ1OGE4ZWU1MzUwYTNlZjRkOWQxYmU0MTBlMGMxMGViYTNjY2JiNTkx
+    NmM0ODdhOGU2ZGI4MDgzNTk4YzA4ZmY3ODVkZWVjNDk4MzI2ZWE=
   data.tar.gz: !binary |-
-    NTFhNDMyNGQzMTI0ZWQ0N2FmM2Y2Mzg4ZjZiMTU4NWIzNjIzM2JmMjViN2Fi
-    NTE0ZmIzZDA2ZDE5ZDBkYWM3OTBhOTRhNjA0Y2E1YzY3MzgzZDM3ZjEyN2Zk
-    Yjk4NDAxMzU0NTZhM2MwODlhZjNmYWIzNGZlM2UzZGEwMjBlOTI=
+    M2FjMmVhM2QxYzY0MmEwMTllZmEzNWEyYWVlNDRlMzQ4OWVjNjExNzkzNDdh
+    YTk1MmVkMDZjOGZmOTczZGI3ZDY5OGMzMTYxNDBlYWYzYzNkMjFiYmJkYWU1
+    YTkxZDc3MTI0NmJmYTQ4NmI2ZGJiM2RjNWUxMGZmNTZmY2I1MzA=

data/lib/omniauth/strategies/wechat.rb

@@ -1,44 +1,89 @@
-require 'omniauth/strategies/oauth2'
+require 'cgi'
+require 'uri'
+require 'oauth2'
+require 'omniauth'
+require 'timeout'
+require 'securerandom'
 
 module OmniAuth
   module Strategies
-    class WeChat < OmniAuth::Strategies::OAuth2
+    class WeChat
+      include OmniAuth::Strategy
+      args [:appid, :secret]
+      option :appid,nil
+      option :secret,nil
       option :name, "wechat"
+      option :authorize_params, {}
+      option :authorize_options, [:scope]
+      option :token_params, {}
+      option :token_options, []
+      option :auth_token_params, {}
       option :client_options, {
         :site => 'http://open.weixin.qq.com',
         :authorize_url => 'https://open.weixin.qq.com/connect/oauth2/authorize',
         :token_url => "https://api.weixin.qq.com/sns/oauth2/access_token"
       }
-      option :provider_ignores_state, true
+      
+      attr_accessor :access_token
+      
+      def client(opt={})
+        client_options = options.client_options.merge(opt)
+        ::OAuth2::Client.new(options.appid, options.secret, deep_symbolize(client_options))
+      end
+      
+      def callback_url
+        full_host + script_name + callback_path
+      end
+      
+      credentials do
+        hash = {'token' => access_token.token}
+        hash.merge!('refresh_token' => access_token.refresh_token) if access_token.expires? && access_token.refresh_token
+        hash.merge!('expires_at' => access_token.expires_at) if access_token.expires?
+        hash.merge!('expires' => access_token.expires?)
+        hash
+      end
       
       def request_phase
         redirect client.authorize_url(authorize_params)+'#wechat_redirect'
       end
       
       def authorize_params
-
-        {:appid=>options.client_id,
+        options.authorize_params[:state] = SecureRandom.hex(24)      
+        options.authorize_params.merge({:appid=>options.client_id,
           :redirect_uri => callback_url,
           :response_type => 'code',
           :scope => 'snsapi_userinfo'
-         }
+         })
       end
 
       def callback_url
         full_host + script_name + callback_path 
       end
+      
       def token_params
-        params = super
-        params.merge({:appid=>options.client_id,:secret=>options.client_secret,:grant_type=>'authorization_code'})
+          {:appid=>options.appid,:secret=>options.secret}
       end
       
-      def build_access_token
-        client.auth_code.get_token(
-          request.params['code'],
-          {:redirect_uri => callback_url, :parse => :json}.merge(token_params.to_hash(:symbolize_keys => true)),
-          {:mode => :query, :param_name => 'access_token'})
+      def callback_phase
+        if request.params['code'] 
+          raise CallbackError.new('noauthorize','user cancel authorizing')
+        end
+       
+        self.access_token = build_access_token
+        self.access_token = refresh_access_token(access_token) if access_token.expired?
+        super
+      rescue ::OAuth2::Error, CallbackError => e
+        fail!(:invalid_credentials, e)
+      rescue ::MultiJson::DecodeError => e
+        fail!(:invalid_response, e)
+      rescue ::Timeout::Error, ::Errno::ETIMEDOUT, Faraday::Error::TimeoutError => e
+        fail!(:timeout, e)
+      rescue ::SocketError, Faraday::Error::ConnectionFailed => e
+        fail!(:failed_to_connect, e)
       end
       
+      
+      
       uid do
         @uid ||= begin
           access_token[:openid]
@@ -54,9 +99,9 @@ module OmniAuth
       end
       
       extra do
-        {
-          :raw_info => raw_info
-        }
+      {
+        :raw_info => raw_info
+      }
       end
 
       def raw_info
@@ -69,6 +114,44 @@ module OmniAuth
           ).parsed
         end
       end
+      protected
+
+      def deep_symbolize(hash)
+        hash.inject({}) do |h, (k,v)|
+          h[k.to_sym] = v.is_a?(Hash) ? deep_symbolize(v) : v
+          h
+        end
+      end
+      
+      def build_access_token
+        verifier = request.params['code']
+        request_params = {:code=>verifier,
+              :grant_type=>'authorization_code',:parse=>:json
+              }.merge(token_params.to_hash(:symbolize_keys => true))
+        client.get_token(request_params,{:mode=>:query})
+        
+      end
+      
+      def refresh_access_token(old_token)
+        request_params = { :grant_type=> 'refresh_token',
+                    :refresh_token  => old_token.refresh_token,
+                    :appid=>options.appid,
+                    :parse=>:json
+              }.merge(token_params.to_hash(:symbolize_keys => true))
+        client({:token_url=>'https://api.weixin.qq.com/sns/oauth2/refresh_token'}).get_token(request_params,{:mode=>:query})
+      end
+      
+      class CallbackError < StandardError
+        attr_accessor :error, :error_reason
+        def initialize(error, error_reason=nil)
+          self.error = error
+          self.error_reason = error_reason
+        end
+  
+        def message
+          [self.error, self.error_reason].compact.join(' | ')
+        end
+      end
     end
   end
 end

data/lib/omniauth/wechat/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Wechat
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/omniauth-wechat.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'omniauth', '~> 1.0'
-  spec.add_dependency 'omniauth-oauth2', '~> 1.0'
+  spec.add_dependency 'oauth2', '~> 0.9.0'
   spec.add_dependency 'multi_json'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-wechat
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - victor
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth2
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement