wechat 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e557486566741fde96f95013826e225fb60a8655
-  data.tar.gz: bbcfb11df1063caf51f64ca68ab23c4ce41b0360
+  metadata.gz: ae9351f61a2b192bcb892dcdf95f85a540738b5a
+  data.tar.gz: 6d2b9e4c9ebb1e68195abe00ccec070f991f8b92
 SHA512:
-  metadata.gz: d6b1b39c6d6e7cd385842041b8125534db5a3f8007e2e0e7e4e79700c6691f27edeb00e34bb79e3077b22a611f06ecb7f37212cb8e5fc0fac4d746d9efd5e984
-  data.tar.gz: e6149d522aeefda20229604a835604a6d106f8f3a90194a5c498cb411cdeb1619e07752e84752951f3679a0e0530e5182fd687d7e5c02fa10362124fbd402d8e
+  metadata.gz: 1e8ccc4da8e5fec561612d22f3c2c7890d8447bd401e5c78541bf984378ecf2cc32473bc3d3b65a7dce7532b1872a0044b81ec9d54160f3f3552651476deb519
+  data.tar.gz: fe059c2d7670b4fdf92c18386adc4158fd4c8c8d6fabfb0844a20954d5dc6a38470a0796adc8e990413ee29ff757cd594b2060bf87aeab079b047384355df823

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v0.8.2 (released at 11/2/2016)
+
+# Bug which if not using multi-account but using web login.
+
+## v0.8.1 (released at 11/2/2016)
+
+* After allow sub controller using wechat_api, it's possible not initialise at first time. by @IvanChou #155
+* Support web application login scope snsapi_login.
+* Add unionid support for public account.
+* Remove OpenId in Enterprise OAuth2 as it's not supported by Tecent.
+
 ## v0.8.0 (released at 10/24/2016)
 
 * Complete support multi-wechat public account. by @xiewenwei #150

data/lib/action_controller/wechat_responder.rb

@@ -2,23 +2,23 @@ module ActionController
   module WechatResponder
     def wechat_api(opts = {})
       include Wechat::ControllerApi
-      self.wechat_api_client = load_controller_wechat(opts)
+      self.wechat_cfg_account = opts[:account].present? ? opts[:account].to_sym : :default
+      self.wechat_api_client = load_controller_wechat(wechat_cfg_account, opts)
     end
 
     def wechat_responder(opts = {})
       include Wechat::Responder
-      self.wechat_api_client = load_controller_wechat(opts)
+      self.wechat_cfg_account = opts[:account].present? ? opts[:account].to_sym : :default
+      self.wechat_api_client = load_controller_wechat(wechat_cfg_account, opts)
     end
 
     def wechat
-      self.wechat_api_client ||= load_controller_wechat
+      self.wechat_api_client ||= load_controller_wechat(wechat_cfg_account)
     end
 
     private
 
-    def load_controller_wechat(opts = {})
-      account = opts[:account].present? ? opts[:account].to_sym : :default
-
+    def load_controller_wechat(account, opts = {})
       self.token = opts[:token] || Wechat.config(account).token
       self.appid = opts[:appid] || Wechat.config(account).appid
       self.corpid = opts[:corpid] || Wechat.config(account).corpid

data/lib/wechat/api_loader.rb

@@ -23,6 +23,7 @@ HELP
     @configs = nil
 
     def self.config(account = :default)
+      account = :default if account.nil?
       @configs ||= loading_config!
       @configs[account.to_sym] || raise("Wechat configuration for #{account} is missing.")
     end

data/lib/wechat/controller_api.rb

@@ -3,7 +3,7 @@ module Wechat
     extend ActiveSupport::Concern
 
     module ClassMethods
-      attr_accessor :wechat_api_client, :token, :appid, :corpid, :agentid, :encrypt_mode, :timeout,
+      attr_accessor :wechat_api_client, :wechat_cfg_account, :token, :appid, :corpid, :agentid, :encrypt_mode, :timeout,
                     :skip_verify_ssl, :encoding_aes_key, :trusted_domain_fullname, :oauth2_cookie_duration
     end
 
@@ -13,13 +13,22 @@ module Wechat
 
     def wechat_oauth2(scope = 'snsapi_base', page_url = nil, &block)
       appid = self.class.corpid || self.class.appid
+      if appid.blank?
+        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)
-      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"
+      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
 
       return oauth2_url unless block_given?
       if self.class.corpid
@@ -39,9 +48,11 @@ module Wechat
             params[:state].to_s == wechat.jsapi_ticket.oauth2_state.to_s # params[:state] maybe '' and wechat.jsapi_ticket.oauth2_state may be nil
         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] }
+        yield cookies.signed_or_encrypted[:we_openid], { 'openid' => cookies.signed_or_encrypted[:we_openid],
+                                                         'unionid' => cookies.signed_or_encrypted[:we_unionid] }
       end
     end
 
@@ -52,12 +63,10 @@ module Wechat
         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 }
-        cookies.signed_or_encrypted[:we_openid] = { value: userinfo['OpenId'], 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],
-                                                         'OpenId' => cookies.signed_or_encrypted[:we_openid] }
+                                                         'DeviceId' => cookies.signed_or_encrypted[:we_deviceid] }
       end
     end
   end

data/lib/wechat.rb

@@ -25,7 +25,7 @@ module Wechat
 
   def self.api(account = :default)
     @wechat_apis ||= {}
-    @wechat_apis[account.to_sym] ||= ApiLoader.with({account: account})
+    @wechat_apis[account.to_sym] ||= ApiLoader.with(account: account)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Skinnyworm
@@ -31,7 +31,7 @@ cert_chain:
   R5k6Ma92sW8jupX4cqbSu9rntdVQkNRpoHIrfU0MZT0cKsg/D1zMteylxrO3KMsz
   SPQRv+nrI1J0zevFqb8010heoR8SDyUA0Mm3+Q==
   -----END CERTIFICATE-----
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: DSL for wechat message handling and API