omniauth-wechat 0.0.9 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzk4NzUxYTdmZDc1NGI1N2Y0MTRhM2ExNzFjZjYxZGM1MjNmYWE2NA==
+    Njc1ZDViNzVlNDRmMDcxNjEyMTVmMWNhOTZlMWVlNzExZmUwYWFiZA==
   data.tar.gz: !binary |-
-    MTUwMDUwYThmYzcwMGYxYmY4NDA5ZDE3YTdjNjU0N2YyZjRhZmVhNw==
+    MjljNDhlMTQzNjYwNTBiODZlNmU4MmJhYmZhMGZkN2U0NWU2NmVkMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWFmYzljNTU5ODhmNzFjZTA5ZjEyYWM3NTRiNWE2ZjUzYzVjNDFjZWRmNTU3
-    MThiMzBjNWVhNjY3MTVkOWY2Y2YzNGZmZGEwNGFlNzZjY2Y2ODUwYjhhY2M4
-    N2U0ZGQzOWQzOTAzN2ExNWM2ZDAwZDk1ZDc3MTFmNGU2YWFmODQ=
+    ZTMwZTA5YTdiOGM3Y2Q3Yzk5YmFlMGQyNTU1OTFmZThjYzFmMGRmMjk1ZGU1
+    ZjMzNzgzYzEzNjJlZjc2ZGVmNDkyZGUwYTExMTQ0YmE2OTJmNTVjMmQ4MzYw
+    NzQ1ODQ3OWEwMDc0NzM3MjI0N2M5NWQ4M2MwYWZiZjM1N2Y0NTA=
   data.tar.gz: !binary |-
-    NGVjMGRkMTgyZTg3MGRjZThlMjc3NDZiY2M1YWE3NjMzYmFjNGYyZTA4ZTZi
-    NDYyZjAyYTAzY2JkMGZiYzNmNWU4ZWFjZWI4NzY1ZTA2YTZjYTE0Yjg4ZGRi
-    ZmZiOWYzMzQ1MjhjMWM3MTAwODk1NmVmY2ZiYTI4Nzc0Y2IyYzI=
+    NmI1M2U1OTBjMDkyM2Y0NTZhZjAxNGJmNGRiMmZkYzQwNzg5NDUwZTk0NDZh
+    NDg0OGJlYjRjZTBjNmYwMTkzNDFkZTQyMzRiZmQ1ZTQxZWRlZjIzMDdkMWMz
+    OWNjNzRkN2JiY2VkY2NjYmE0ODY1MWRjMjNjMDBkY2VkN2FhZGI=

data/lib/omniauth/strategies/wechat.rb

@@ -9,16 +9,19 @@ module OmniAuth
         :authorize_url => 'https://open.weixin.qq.com/connect/oauth2/authorize',
         :token_url => "https://api.weixin.qq.com/sns/oauth2/access_token"
       }
-      option :scope ,'snsapi_base'
       
       def request_phase
-        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(authorize_params))+'#wechat_redirect'
+        redirect client.auth_code.authorize_url(authorize_params)+'#wechat_redirect'
       end
       def authorize_params
         params = super
         params[:state]=request.params['state']
         session['omniauth.state'] = params[:state]
-        params.merge({:appid=>options.client_id})
+        {:appid=>options.client_id,
+          :redirect_uri => callback_url,
+          :response_type => 'code',
+          :status => params[:state]
+         }
       end
 
       def token_params
@@ -26,6 +29,14 @@ module OmniAuth
         params.merge({:appid=>options.client_id,:secret=>options.client_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'}
+        )
+      end
+      
       uid do
         @uid ||= begin
           access_token[:openid]
@@ -34,9 +45,9 @@ module OmniAuth
 
       info do 
         { 
-          :nickname => access_token[:openid],
-          :name => access_token[:openid],
-          :image => '',
+          :nickname => raw_info[:nickname],
+          :name => raw_info[:nickname],
+          :image => raw_info[:headimgurl],
         }
       end
       
@@ -48,13 +59,12 @@ module OmniAuth
 
       def raw_info
         @raw_info ||= begin
-          client.request(:get, "https://api.weixin.qq.com/sns/userinfo", :params => {
-              :format => :json,
-              :openid => uid,
-              :oauth_consumer_key => options[:client_id],
-              :access_token => access_token.token,
-              :lang =>'zh-CN'
-            }, :parse => :json).parsed
+          response =  access_token.get(
+            '/sns/userinfo',
+             {:params => {:openid => uid,
+                     :lang =>'zh-CN'},
+              :parse => :json}
+          ).parsed
         end
       end
     end

data/lib/omniauth/wechat/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Wechat
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-wechat
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - victor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth