wechat 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae9351f61a2b192bcb892dcdf95f85a540738b5a
-  data.tar.gz: 6d2b9e4c9ebb1e68195abe00ccec070f991f8b92
+  metadata.gz: 1b273bb48c285ec8d726d97d680156b5180f9a68
+  data.tar.gz: 92b12bbec57a35485761ecf3dc42d38b404dbf38
 SHA512:
-  metadata.gz: 1e8ccc4da8e5fec561612d22f3c2c7890d8447bd401e5c78541bf984378ecf2cc32473bc3d3b65a7dce7532b1872a0044b81ec9d54160f3f3552651476deb519
-  data.tar.gz: fe059c2d7670b4fdf92c18386adc4158fd4c8c8d6fabfb0844a20954d5dc6a38470a0796adc8e990413ee29ff757cd594b2060bf87aeab079b047384355df823
+  metadata.gz: f044872a1d3403b948bb63cb9661cc0f2de98dd4b02b1a4bf22a94cc1a1863e99d2685090bfcd48b9cb567f61d6245468c53c9584e8d604efcf4c3ccfbc5af52
+  data.tar.gz: 4e1ba0770dc92898a9962d55d6e0738ce128cbd391ecb4f4a35bf240596baf3232877332cc743f5d84ea9e2d9cb76f398260eea3c33e94f769c44c131ffe37c7

data.tar.gz.sig

@@ -1,3 +1 @@
-x�gS�����xtv-(�ϥ93	k��fg?dm�� �A���*[;l�Бh)�k%mN���2X�^�5�_Jc�Q���j�P,q�{)3�Nsĭ(10���D�^
-���S8�!s��T�5N�
-�7��-�4�WO�H_X~"��-(����U3�f�����(Ո�!�z���v�elF�7��Oi����x�}�˭��d��*?���J���<q�B7Z"�VC�.ݰķ��+k53\9���	���U	
+��P��Dp�X���Lp1U�D����� ���S3@�D�vg�z��d�z1iO�[�|����k_>��

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.8.3 (released at 11/26/2016)
+
+# Fix wechat template key has camelCase problem, by @RyanChenDji #159
+# Fix long time of oauth2_state bug for wechat_oauth2 methods, by @IvanChou #162
+
 ## v0.8.2 (released at 11/2/2016)
 
 # Bug which if not using multi-account but using web login.

data/lib/wechat/controller_api.rb

@@ -12,61 +12,68 @@ module Wechat
     end
 
     def wechat_oauth2(scope = 'snsapi_base', page_url = nil, &block)
-      appid = self.class.corpid || self.class.appid
-      if appid.blank?
+      appid = self.class.corpid || self.class.appid || lambda do
         self.class.wechat # to initialize wechat_api_client at first time call wechat_oauth2
-        appid = self.class.corpid || self.class.appid
-        raise 'Can not get corpid or appid, so please configure it first to using wechat_oauth2' if appid.blank?
-      end
-      page_url ||= if self.class.trusted_domain_fullname
-                     "#{self.class.trusted_domain_fullname}#{request.original_fullpath}"
-                   else
-                     request.original_url
-                   end
-      redirect_uri = CGI.escape(page_url)
-      if scope == 'snsapi_login'
-        oauth2_url = "https://open.weixin.qq.com/connect/qrconnect?appid=#{appid}&redirect_uri=#{redirect_uri}&response_type=code&scope=#{scope}&state=#{wechat.jsapi_ticket.oauth2_state}#wechat_redirect"
-      else
-        oauth2_url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{appid}&redirect_uri=#{redirect_uri}&response_type=code&scope=#{scope}&state=#{wechat.jsapi_ticket.oauth2_state}#wechat_redirect"
-      end
+        self.class.corpid || self.class.appid
+      end.call
+      raise 'Can not get corpid or appid, so please configure it first to using wechat_oauth2' if appid.blank?
 
-      return oauth2_url unless block_given?
-      if self.class.corpid
-        wechat_corp_oauth2(oauth2_url, &block)
-      else
-        wechat_public_oauth2(oauth2_url, &block)
-      end
+      wechat.jsapi_ticket.ticket if wechat.jsapi_ticket.oauth2_state.nil?
+      oauth2_params = {
+        appid: appid,
+        redirect_uri: page_url,
+        scope: scope,
+        response_type: 'code',
+        state: wechat.jsapi_ticket.oauth2_state
+      }
+
+      return generate_oauth2_url(oauth2_params) unless block_given?
+      self.class.corpid ? wechat_corp_oauth2(oauth2_params, &block) : wechat_public_oauth2(oauth2_params, &block)
     end
 
     private
 
-    def wechat_public_oauth2(oauth2_url)
-      if cookies.signed_or_encrypted[:we_openid].blank? && params[:code].blank?
-        redirect_to oauth2_url
-      elsif cookies.signed_or_encrypted[:we_openid].blank? &&
-            params[:code].present? &&
-            params[:state].to_s == wechat.jsapi_ticket.oauth2_state.to_s # params[:state] maybe '' and wechat.jsapi_ticket.oauth2_state may be nil
+    def wechat_public_oauth2(oauth2_params)
+      openid  = cookies.signed_or_encrypted[:we_openid]
+      unionid = cookies.signed_or_encrypted[:we_unionid]
+      if openid.present?
+        yield openid, { 'openid' => openid, 'unionid' => unionid }
+      elsif params[:code].present? && params[:state] == oauth2_params[:state]
         access_info = wechat.web_access_token(params[:code])
         cookies.signed_or_encrypted[:we_openid] = { value: access_info['openid'], expires: self.class.oauth2_cookie_duration.from_now }
         cookies.signed_or_encrypted[:we_unionid] = { value: access_info['unionid'], expires: self.class.oauth2_cookie_duration.from_now }
         yield access_info['openid'], access_info
       else
-        yield cookies.signed_or_encrypted[:we_openid], { 'openid' => cookies.signed_or_encrypted[:we_openid],
-                                                         'unionid' => cookies.signed_or_encrypted[:we_unionid] }
+        redirect_to generate_oauth2_url(oauth2_params)
       end
     end
 
-    def wechat_corp_oauth2(oauth2_url)
-      if cookies.signed_or_encrypted[:we_deviceid].blank? && params[:code].blank?
-        redirect_to oauth2_url
-      elsif cookies.signed_or_encrypted[:we_deviceid].blank? && params[:code].present? && params[:state] == wechat.jsapi_ticket.oauth2_state
+    def wechat_corp_oauth2(oauth2_params)
+      userid   = cookies.signed_or_encrypted[:we_userid]
+      deviceid = cookies.signed_or_encrypted[:we_deviceid]
+      if userid.present? && deviceid.present?
+        yield userid, { 'UserId' => userid, 'DeviceId' => deviceid }
+      elsif params[:code].present? && params[:state] == oauth2_params[:state]
         userinfo = wechat.getuserinfo(params[:code])
         cookies.signed_or_encrypted[:we_userid] = { value: userinfo['UserId'], expires: self.class.oauth2_cookie_duration.from_now }
         cookies.signed_or_encrypted[:we_deviceid] = { value: userinfo['DeviceId'], expires: self.class.oauth2_cookie_duration.from_now }
         yield userinfo['UserId'], userinfo
       else
-        yield cookies.signed_or_encrypted[:we_userid], { 'UserId' => cookies.signed_or_encrypted[:we_userid],
-                                                         'DeviceId' => cookies.signed_or_encrypted[:we_deviceid] }
+        redirect_to generate_oauth2_url(oauth2_params)
+      end
+    end
+
+    def generate_oauth2_url(oauth2_params)
+      if oauth2_params[:redirect_uri].blank?
+        page_url = (td = self.class.trusted_domain_fullname) ? "#{td}#{request.original_fullpath}" : request.original_url
+        safe_query = request.query_parameters.reject { |k, _| %w(code state access_token).include? k }.to_query
+        oauth2_params[:redirect_uri] = page_url.sub(request.query_string, safe_query)
+      end
+
+      if oauth2_params[:scope] == 'snsapi_login'
+        "https://open.weixin.qq.com/connect/qrconnect?#{oauth2_params.to_query}#wechat_redirect"
+      else
+        "https://open.weixin.qq.com/connect/oauth2/authorize?#{oauth2_params.to_query}#wechat_redirect"
       end
     end
   end

data/lib/wechat/message.rb

@@ -131,7 +131,7 @@ module Wechat
     end
 
     def template(opts = {})
-      template_fields = camelize_hash_keys(opts.symbolize_keys.slice(:template_id, :topcolor, :url, :data))
+      template_fields = opts.symbolize_keys.slice(:template_id, :topcolor, :url, :data)
       update(MsgType: 'template', Template: template_fields)
     end
 
@@ -152,12 +152,13 @@ module Wechat
     TO_JSON_ALLOWED = %w(touser msgtype content image voice video file music news articles template agentid).freeze
 
     def to_json
+      keep_camel_case_key = message_hash[:MsgType] == 'template'
       json_hash = deep_recursive(message_hash) do |key, value|
         key = key.to_s
-        [(TO_JSON_KEY_MAP[key] || key.downcase), value]
+        [(TO_JSON_KEY_MAP[key] || (keep_camel_case_key ? key : key.downcase)), value]
       end
+      json_hash = json_hash.transform_keys(&:downcase).select { |k, _v| TO_JSON_ALLOWED.include? k }
 
-      json_hash = json_hash.select { |k, _v| TO_JSON_ALLOWED.include? k }
       case json_hash['msgtype']
       when 'text'
         json_hash['text'] = { 'content' => json_hash.delete('content') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Skinnyworm
@@ -31,7 +31,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport