omniauth-wechat 0.1.8 → 0.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzA5MGMyY2Q1ZWQzOTRlYjdhZDk4M2Q2NTc1ZGQ4NGVkMjEyNjllZA==
+    MTI5MDA3NzliYTkwMzRkYThkYmNkNzIxYWU0ZDRlNzdmZTE4YTIzZQ==
   data.tar.gz: !binary |-
-    MWNmNzk2NTgyODkwNjZhZGJlMjI5NWFmNjFhNWEyYjBiZThjNTQzYw==
+    YzkyMzI0ODY5NjliMjU2MTZjYTQwNmRmMmFkNGFmNzM0NzQyZmNhNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmFmOTM0MjA3MTI5MjIxZGY2OTgyMTkzNDJiM2QzYmExMGJkNTYzODUzMWRl
-    OGUxZDQxZGZmNzRjMzUwNjQ3OTMzM2M5MGY3ZjI0NTM5ZDFiZGMyMzRjYmJh
-    MmEzNmU1NzUxNzYxYjRjNjYwZmJjNDI2ZTA5ZjUxZmIyOGFhNTY=
+    Y2MzMjZhMjIzYzU5NDQzMzMzOTVkYWM0OWE3NTAxMTA2NzI5OGMyNmI2NWJl
+    MzM2NTA4NTkxOGZkZTlmNjY0M2Q5NTZhNWE2MGZkMmVmMzAwODRiM2EzYzE4
+    MmJlZTE3ZmNmNDAwZTBkYjQwZTRjY2M1NWRmNmY4OWIzOWFkOWU=
   data.tar.gz: !binary |-
-    ZjQwYjM0Yjg5OWJhZDU3MmYxYzRlOGIyY2UzNDZiOTIyYzljMTQ1YjFmMTEz
-    NzRjOWQ0ZTk5OTM2NGZjODA0ZDMwODM4MWY1YjVlNDFhN2VjMjRiNzhkYzBm
-    YmZlMmUxOWJjYWY4NDUyOWRkNTQ4NWMwZjEyMGMwNDQyNDdlNWI=
+    MTEyNTU3YzM1MDU2ZWE1YmNhZTc1N2JjNjMzZDFjZGNhMWZiMmY5ZTMxOWQ5
+    Nzc4ODI4NDdhMTE1YmQ0MDJmYjRiODViNDRjYTE2NDU2MmJiZjNlMGFhZjZj
+    MDg3OWI4NjVhMWQ3ZmZlM2Q3OWY4OTljYzQyM2QxYTIxNDZlOGQ=

data/lib/omniauth/strategies/wechat.rb

@@ -48,11 +48,12 @@ module OmniAuth
       end
       
       def authorize_params
-        options.authorize_params[:state] = SecureRandom.hex(24)      
+        state_param = SecureRandom.hex(24)      
         options.authorize_params.merge({:appid=>options.appid,
           :redirect_uri => callback_url,
           :response_type => 'code',
-          :scope => 'snsapi_userinfo'
+          :scope => 'snsapi_userinfo',
+          :state=>state_param
          })
       end
 
@@ -125,19 +126,20 @@ module OmniAuth
       
       def build_access_token
         verifier = request.params['code']
-        request_params = {:code=>verifier,
+        request_params = token_params.to_hash(:symbolize_keys => true).merge({
+              :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',
+        request_params = {:appid=>options.appid, 
+                    :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
       

data/lib/omniauth/wechat/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Wechat
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-wechat
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - victor