wechat 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ba8ea75d218bce256ab3ac81dd380747abc5515713f69cfc7353db5c02a3ebb
-  data.tar.gz: 40c60efec124604c7141983de97b121735c45be33213f4395ad7df2c5f967d52
+  metadata.gz: de72dcc5a201ab7841963fb88eee52e109487969e7a2ab05324fae9977fd9dab
+  data.tar.gz: 3f1f797d0224c24d2625c8dfdad2cee66c85cfe98cd2511dace850493d2c11e4
 SHA512:
-  metadata.gz: ce2ff6717092db5798ab87791acc1ed75465c49a624ad7f7cb946748a3b144d98ff22758d29ed6699744379555bc95a0929358eeb3e19ae668c87b26dd0014b4
-  data.tar.gz: 104a924a1f55c75662b32f41600b81dde58bb33a8bc9c0d377517bb092aff8c72d5c51aa772b22e69c3308bc8523fd424f45a894d9686436358f8afa87cb17e1
+  metadata.gz: 5a5bf87045b07c01b3d140f981fa3e1dd29a2490e32d718ced9ed82fa55488511514beea467fde8726ed24805d63b874776e6f0f832130f25fa82d592ea5c8f3
+  data.tar.gz: f045e5886f34b243fe9fc86dcbe663efdd6292e076a515578436a4fcaeae778304554a59cbdfd01fc5ed5b6538d3ca23127acfe410764bb1c0b30c0a08a65368

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.10.0 (released at 5/31/2018)
+
+* Support multi wechat account at wechat_responder. by @tuliren #223
+* Support wechat mini program apis & signature check. by @oiahoon #225
+* Support sent template message with miniprogram. by @falm #228
+* Fix request_content could be nil. by @paicha #229
+
 ## v0.9.0 (released at 4/15/2018)
 
 * Support multi wechat account dynamically loading from DB. by @tuliren #222

data/README-CN.md

@@ -1,4 +1,4 @@
-WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.org/Eric-Guo/wechat.svg)](https://travis-ci.org/Eric-Guo/wechat) [![Code Climate](https://codeclimate.com/github/Eric-Guo/wechat.png)](https://codeclimate.com/github/Eric-Guo/wechat) [![Code Coverage](https://codeclimate.com/github/Eric-Guo/wechat/coverage.png)](https://codeclimate.com/github/Eric-Guo/wechat/coverage)
+WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.org/Eric-Guo/wechat.svg)](https://travis-ci.org/Eric-Guo/wechat) [![Maintainability](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/maintainability)](https://codeclimate.com/github/Eric-Guo/wechat/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/test_coverage)](https://codeclimate.com/github/Eric-Guo/wechat/test_coverage)
 ======
 
 [![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Eric-Guo/wechat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -238,7 +238,7 @@ Wechat服务器有报道曾出现[RestClient::SSLCertificateNotVerified](http://
 
 ```ruby
 class WechatFirstController < ActionController::Base
-   wechat_responder account: :new_account
+   wechat_responder account: :new_account, account_from_request: Proc.new{ |request| request.params[:wechat] }
 
    on :text, with:"help", respond: "help content"
 end
@@ -248,40 +248,14 @@ end
 
 ```ruby
 class WechatFirstController < ActionController::Base
-   wechat_responder appid: "app1", secret: "secret1", token: "token1", access_token: Rails.root.join("tmp/access_token1")
+   wechat_responder appid: "app1", secret: "secret1", token: "token1", access_token: Rails.root.join("tmp/access_token1"),
+                    account_from_request: Proc.new{ |request| request.params[:wechat] }
 
    on :text, with:"help", respond: "help content"
 end
 ```
 
-#### 为每个 request 配置不同的 `appid`
-
-若需要动态处理不同微信公众号的消息，您需要用数据库存储账户设置，然后调用 `wechat_oauth2` 或者 `Wechat#api`:
-
-```ruby
-class WechatReportsController < ApplicationController
-  wechat_api
-  layout 'wechat'
-
-  def index
-    # 通过自定义方法，从 request 中得到微信账户名称
-    account_name = get_account_from_url(request)
-
-    wechat_oauth2('snsapi_base', nil, account_name) do |openid|
-      @current_user = User.find_by(wechat_openid: openid)
-      @articles = @current_user.articles
-    end
-
-    Wechat.api(account_name)
-  end
-
-  private
-  # 预期的 URL: .../wechat/<account-name>/...
-  def get_account_from_url(request)
-    request.original_url.match(/wechat\/(.*)\//)[1]
-  end
-end
-```
+其中 `account_from_request` 是一个 `Proc`，接受 `request` 作为唯一参数，返回相应的微信账户名称。以上示例中，`controller` 会根据 `request` 中传入的 `wechat` 参数选择微信账户。如果没有提供 `account_from_request` 或者 `Proc` 的结果是 `nil`，则使用 `account` 或者完整配置。
 
 #### JS-SDK 支持
 
@@ -315,6 +289,11 @@ class CartController < ActionController::Base
       @current_user = User.find_by(wechat_openid: openid)
       @articles = @current_user.articles
     end
+
+    # 指定 account_name，可以使用任意微信账户
+    # wechat_oauth2('snsapi_base', nil, account_name) do |openid|
+    #  ...
+    # end
   end
 end
 ```

data/README.md

@@ -1,4 +1,4 @@
-WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.org/Eric-Guo/wechat.svg)](https://travis-ci.org/Eric-Guo/wechat) [![Code Climate](https://codeclimate.com/github/Eric-Guo/wechat.png)](https://codeclimate.com/github/Eric-Guo/wechat) [![Code Coverage](https://codeclimate.com/github/Eric-Guo/wechat/coverage.png)](https://codeclimate.com/github/Eric-Guo/wechat/coverage)
+WeChat [![Gem Version](https://badge.fury.io/rb/wechat.svg)](https://rubygems.org/gems/wechat) [![Build Status](https://travis-ci.org/Eric-Guo/wechat.svg)](https://travis-ci.org/Eric-Guo/wechat) [![Maintainability](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/maintainability)](https://codeclimate.com/github/Eric-Guo/wechat/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/12885358487c13e91e00/test_coverage)](https://codeclimate.com/github/Eric-Guo/wechat/test_coverage)
 ======
 
 [![Join the chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Eric-Guo/wechat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -207,6 +207,19 @@ test:
 
 For multiple accounts details reference [PR 150](https://github.com/Eric-Guo/wechat/pull/150)
 
+For wechat mini program, can specified by the item `type`:
+
+```yaml
+# Mini Program Accounts
+
+  mini_development:
+    <<: *default
+    appid: "my_appid"
+    secret: "my_secret"
+    # `mp` is short for **mini program**
+    type: 'mp' 
+```
+
 #### Database wechat account configuration
 After enabling database account configuration, the following table will be created:
 
@@ -251,7 +264,7 @@ Sometimes, you may want to host more than one enterprise/public wechat account i
 
 ```ruby
 class WechatFirstController < ActionController::Base
-   wechat_responder account: :new_account
+   wechat_responder account: :new_account, account_from_request: Proc.new{ |request| request.params[:wechat] }
 
    on :text, with:"help", respond: "help content"
 end
@@ -261,39 +274,14 @@ Or you can provide full list of options.
 
 ```ruby
 class WechatFirstController < ActionController::Base
-   wechat_responder appid: "app1", secret: "secret1", token: "token1", access_token: Rails.root.join("tmp/access_token1")
+   wechat_responder appid: "app1", secret: "secret1", token: "token1", access_token: Rails.root.join("tmp/access_token1"),
+                    account_from_request: Proc.new{ |request| request.params[:wechat] }
 
    on :text, with:"help", respond: "help content"
 end
 ```
 
-#### Configure individual request with different `appid`
-
-If you want the controller to dynamically apply different account configurations for each request, you need to enable database account configuration, and call `wechat_oauth2` or `Wechat#api`:
-
-```ruby
-class WechatReportsController < ApplicationController
-  wechat_api
-  layout 'wechat'
-
-  def index
-    account_name = get_account_from_url(request)
-
-    wechat_oauth2('snsapi_base', nil, account_name) do |openid|
-      @current_user = User.find_by(wechat_openid: openid)
-      @articles = @current_user.articles
-    end
-
-    Wechat.api(account_name)
-  end
-
-  private
-  # Expected URL: .../wechat/<account-name>/...
-  def get_account_from_url(request)
-    request.original_url.match(/wechat\/(.*)\//)[1]
-  end
-end
-```
+`account_from_request` is a `Proc` that takes in `request` as its parameter, and returns the corresponding wechat account name. In the above examples, `controller` will choose the account based on the `wechat` parameter passed in the `request`. If `account_from_request` is not specified, or this `Proc` evaluates to `nil`, configuration specified by `account` or the full list of options will be used.
 
 #### JS-SDK helper
 
@@ -327,6 +315,11 @@ class CartController < ActionController::Base
       @current_user = User.find_by(wechat_openid: openid)
       @articles = @current_user.articles
     end
+
+    # specify account_name to use arbitrary wechat account configuration
+    # wechat_oauth2('snsapi_base', nil, account_name) do |openid|
+    #  ...
+    # end
   end
 end
 ```
@@ -643,6 +636,9 @@ end
 
 Using `Wechat.api` to access the wechat api function at any place.
 
+## Checking the signature
+Using `Wechat.decrypt(encrypted_data,session_key, iv)` to decode the data. via. [Signature Checking](https://developers.weixin.qq.com/miniprogram/dev/api/signature.html)
+
 ## wechat_responder - Rails Responder Controller DSL
 
 In order to respond to the message user sent, Rails developer needs to create a wechat responder controller and define the routing in `routes.rb`

data/lib/action_controller/wechat_responder.rb

@@ -10,6 +10,7 @@ module ActionController
     def wechat_responder(opts = {})
       include Wechat::Responder
       account = opts.delete(:account)
+      self.account_from_request = opts.delete(:account_from_request)
       self.wechat_cfg_account = account ? account.to_sym : :default
       self.wechat_api_client = load_controller_wechat(wechat_cfg_account, opts)
     end

data/lib/wechat.rb

@@ -1,5 +1,8 @@
+require 'base64'
+require 'openssl/cipher'
 require 'wechat/api_loader'
 require 'wechat/api'
+require 'wechat/mp_api'
 require 'wechat/corp_api'
 require 'wechat/helpers'
 require 'action_controller/wechat_responder'
@@ -32,6 +35,18 @@ module Wechat
   def self.reload_config!
     ApiLoader.reload_config!
   end
+
+  def self.decrypt(encrypted_data, session_key, iv)
+    cipher = OpenSSL::Cipher.new('AES-128-CBC')
+    cipher.decrypt
+
+    cipher.key     = Base64.decode64(session_key)
+    cipher.iv      = Base64.decode64(iv)
+    decrypted_data = Base64.decode64(encrypted_data)
+    JSON.parse(cipher.update(decrypted_data) + cipher.final)
+  rescue Exception => e
+    { 'errcode': 41003, 'errmsg': e.message }
+  end
 end
 
 ActionView::Base.send :include, Wechat::Helpers if defined? ActionView::Base

data/lib/wechat/api.rb

@@ -2,225 +2,26 @@ require 'wechat/api_base'
 require 'wechat/http_client'
 require 'wechat/token/public_access_token'
 require 'wechat/ticket/public_jsapi_ticket'
+require 'wechat/concern/common'
 
 module Wechat
   class Api < ApiBase
-    API_BASE = 'https://api.weixin.qq.com/cgi-bin/'.freeze
-    WXA_BASE = 'https://api.weixin.qq.com/wxa/'.freeze
-
-    def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
-      @client = HttpClient.new(API_BASE, timeout, skip_verify_ssl)
-      @access_token = Token::PublicAccessToken.new(@client, appid, secret, token_file)
-      @jsapi_ticket = Ticket::PublicJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
-    end
-
-    def groups
-      get 'groups/get'
-    end
-
-    def group_create(group_name)
-      post 'groups/create', JSON.generate(group: { name: group_name })
-    end
-
-    def group_update(groupid, new_group_name)
-      post 'groups/update', JSON.generate(group: { id: groupid, name: new_group_name })
-    end
-
-    def group_delete(groupid)
-      post 'groups/delete', JSON.generate(group: { id: groupid })
-    end
-
-    def users(nextid = nil)
-      params = { params: { next_openid: nextid } } if nextid.present?
-      get('user/get', params || {})
-    end
-
-    def user(openid)
-      get 'user/info', params: { openid: openid }
-    end
-
-    def user_batchget(openids, lang = 'zh-CN')
-      post 'user/info/batchget', JSON.generate(user_list: openids.collect { |v| { openid: v, lang: lang } })
-    end
-
-    def user_group(openid)
-      post 'groups/getid', JSON.generate(openid: openid)
-    end
-
-    def user_change_group(openid, to_groupid)
-      post 'groups/members/update', JSON.generate(openid: openid, to_groupid: to_groupid)
-    end
-
-    def user_update_remark(openid, remark)
-      post 'user/info/updateremark', JSON.generate(openid: openid, remark: remark)
-    end
-
-    def qrcode_create_scene(scene_id_or_str, expire_seconds = 604800)
-      case scene_id_or_str
-      when 0.class
-        post 'qrcode/create', JSON.generate(expire_seconds: expire_seconds,
-                                            action_name: 'QR_SCENE',
-                                            action_info: { scene: { scene_id: scene_id_or_str } })
-      else
-        post 'qrcode/create', JSON.generate(expire_seconds: expire_seconds,
-                                            action_name: 'QR_STR_SCENE',
-                                            action_info: { scene: { scene_str: scene_id_or_str } })
-      end
-
-    end
-
-    def qrcode_create_limit_scene(scene_id_or_str)
-      case scene_id_or_str
-      when 0.class
-        post 'qrcode/create', JSON.generate(action_name: 'QR_LIMIT_SCENE',
-                                            action_info: { scene: { scene_id: scene_id_or_str } })
-      else
-        post 'qrcode/create', JSON.generate(action_name: 'QR_LIMIT_STR_SCENE',
-                                            action_info: { scene: { scene_str: scene_id_or_str } })
-      end
-    end
-
-    def shorturl(long_url)
-      post 'shorturl', JSON.generate(action: 'long2short', long_url: long_url)
-    end
-
-    def message_mass_sendall(message)
-      post 'message/mass/sendall', message.to_json
-    end
-
-    def message_mass_delete(msg_id)
-      post 'message/mass/delete', JSON.generate(msg_id: msg_id)
-    end
-
-    def message_mass_preview(message)
-      post 'message/mass/preview', message.to_json
-    end
-
-    def message_mass_get(msg_id)
-      post 'message/mass/get', JSON.generate(msg_id: msg_id)
-    end
-
-    def wxa_get_wxacode(path, width = 430)
-      post 'getwxacode', JSON.generate(path: path, width: width), base: WXA_BASE
-    end
-
-    def wxa_create_qrcode(path, width = 430)
-      post 'wxaapp/createwxaqrcode', JSON.generate(path: path, width: width)
-    end
-
-    def menu
-      get 'menu/get'
-    end
-
-    def menu_delete
-      get 'menu/delete'
-    end
-
-    def menu_create(menu)
-      # 微信不接受7bit escaped json(eg \uxxxx), 中文必须UTF-8编码, 这可能是个安全漏洞
-      post 'menu/create', JSON.generate(menu)
-    end
-
-    def menu_addconditional(menu)
-      # Wechat not accept 7bit escaped json(eg \uxxxx), must using UTF-8, possible security vulnerability?
-      post 'menu/addconditional', JSON.generate(menu)
-    end
-
-    def menu_trymatch(user_id)
-      post 'menu/trymatch', JSON.generate(user_id: user_id)
-    end
-
-    def menu_delconditional(menuid)
-      post 'menu/delconditional', JSON.generate(menuid: menuid)
-    end
-
-    def material(media_id)
-      get 'material/get', params: { media_id: media_id }, as: :file
-    end
-
-    def material_count
-      get 'material/get_materialcount'
-    end
-
-    def material_list(type, offset, count)
-      post 'material/batchget_material', JSON.generate(type: type, offset: offset, count: count)
-    end
-
-    def material_add(type, file)
-      post_file 'material/add_material', file, params: { type: type }
-    end
-
-    def material_delete(media_id)
-      post 'material/del_material', JSON.generate(media_id: media_id)
-    end
-
-    def custom_message_send(message)
-      post 'message/custom/send', message.to_json, content_type: :json
-    end
+    include Concern::Common
 
     def template_message_send(message)
       post 'message/template/send', message.to_json, content_type: :json
     end
 
-    def customservice_getonlinekflist
-      get 'customservice/getonlinekflist'
-    end
-
-    def tags
-      get 'tags/get'
-    end
-
-    def tag_create(tag_name)
-      post 'tags/create', JSON.generate(tag: { name: tag_name })
-    end
-
-    def tag_update(tagid, new_tag_name)
-      post 'tags/update', JSON.generate(tag: { id: tagid, name: new_tag_name })
-    end
-
-    def tag_delete(tagid)
-      post 'tags/delete', JSON.generate(tag: { id: tagid })
-    end
-
-    def tag_add_user(tagid, openids)
-      post 'tags/members/batchtagging', JSON.generate(openid_list: openids, tagid: tagid)
-    end
-
-    def tag_del_user(tagid, openids)
-      post 'tags/members/batchuntagging', JSON.generate(openid_list: openids, tagid: tagid)
-    end
-
-    def tag(tagid, next_openid = '')
-      post 'user/tag/get', JSON.generate(tagid: tagid, next_openid: next_openid)
-    end
-
-    OAUTH2_BASE = 'https://api.weixin.qq.com/sns/'.freeze
-
-    def web_access_token(code)
-      params = {
-        appid: access_token.appid,
-        secret: access_token.secret,
-        code: code,
-        grant_type: 'authorization_code'
-      }
-      client.get 'oauth2/access_token', params: params, base: OAUTH2_BASE
-    end
-
-    def web_auth_access_token(web_access_token, openid)
-      client.get 'auth', params: { access_token: web_access_token, openid: openid }, base: OAUTH2_BASE
+    def list_message_template
+      get 'template/get_all_private_template'
     end
 
-    def web_refresh_access_token(user_refresh_token)
-      params = {
-        appid: access_token.appid,
-        grant_type: 'refresh_token',
-        refresh_token: user_refresh_token
-      }
-      client.get 'oauth2/refresh_token', params: params, base: OAUTH2_BASE
+    def add_message_template(template_id_short)
+      post 'template/api_add_template', JSON.generate(template_id_short: template_id_short)
     end
 
-    def web_userinfo(web_access_token, openid, lang = 'zh_CN')
-      client.get 'userinfo', params: { access_token: web_access_token, openid: openid, lang: lang }, base: OAUTH2_BASE
+    def del_message_template(template_id)
+      post 'template/del_private_template', JSON.generate(template_id: template_id)
     end
   end
 end

data/lib/wechat/api_loader.rb

@@ -6,9 +6,10 @@ module Wechat
 
       token_file = options[:token_file] || c.access_token.presence || '/var/tmp/wechat_access_token'
       js_token_file = options[:js_token_file] || c.jsapi_ticket.presence || '/var/tmp/wechat_jsapi_ticket'
-
+      type = options[:type] || c.type
       if c.appid && c.secret && token_file.present?
-        Wechat::Api.new(c.appid, c.secret, token_file, c.timeout, c.skip_verify_ssl, js_token_file)
+        wx_class = (type == 'mp') ? Wechat::MpApi : Wechat::Api
+        wx_class.new(c.appid, c.secret, token_file, c.timeout, c.skip_verify_ssl, js_token_file)
       elsif c.corpid && c.corpsecret && token_file.present?
         Wechat::CorpApi.new(c.corpid, c.corpsecret, token_file, c.agentid, c.timeout, c.skip_verify_ssl, js_token_file)
       else

data/lib/wechat/cipher.rb

@@ -1,10 +1,5 @@
-require 'openssl/cipher'
-require 'base64'
-
 module Wechat
   module Cipher
-    extend ActiveSupport::Concern
-
     BLOCK_SIZE = 32
     CIPHER = 'AES-256-CBC'.freeze
 

data/lib/wechat/concern/common.rb

@@ -0,0 +1,217 @@
+module Wechat
+  module Concern
+    module Common
+      WXA_BASE    = 'https://api.weixin.qq.com/wxa/'.freeze
+      API_BASE    = 'https://api.weixin.qq.com/cgi-bin/'.freeze
+      OAUTH2_BASE = 'https://api.weixin.qq.com/sns/'.freeze
+
+      def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
+        @client = HttpClient.new(API_BASE, timeout, skip_verify_ssl)
+        @access_token = Token::PublicAccessToken.new(@client, appid, secret, token_file)
+        @jsapi_ticket = Ticket::PublicJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
+      end
+
+      def groups
+        get 'groups/get'
+      end
+
+      def group_create(group_name)
+        post 'groups/create', JSON.generate(group: { name: group_name })
+      end
+
+      def group_update(groupid, new_group_name)
+        post 'groups/update', JSON.generate(group: { id: groupid, name: new_group_name })
+      end
+
+      def group_delete(groupid)
+        post 'groups/delete', JSON.generate(group: { id: groupid })
+      end
+
+      def users(nextid = nil)
+        params = { params: { next_openid: nextid } } if nextid.present?
+        get('user/get', params || {})
+      end
+
+      def user(openid)
+        get 'user/info', params: { openid: openid }
+      end
+
+      def user_batchget(openids, lang = 'zh-CN')
+        post 'user/info/batchget', JSON.generate(user_list: openids.collect { |v| { openid: v, lang: lang } })
+      end
+
+      def user_group(openid)
+        post 'groups/getid', JSON.generate(openid: openid)
+      end
+
+      def user_change_group(openid, to_groupid)
+        post 'groups/members/update', JSON.generate(openid: openid, to_groupid: to_groupid)
+      end
+
+      def user_update_remark(openid, remark)
+        post 'user/info/updateremark', JSON.generate(openid: openid, remark: remark)
+      end
+
+      def qrcode_create_scene(scene_id_or_str, expire_seconds = 604800)
+        case scene_id_or_str
+        when 0.class
+          post 'qrcode/create', JSON.generate(expire_seconds: expire_seconds,
+                                              action_name: 'QR_SCENE',
+                                              action_info: { scene: { scene_id: scene_id_or_str } })
+        else
+          post 'qrcode/create', JSON.generate(expire_seconds: expire_seconds,
+                                              action_name: 'QR_STR_SCENE',
+                                              action_info: { scene: { scene_str: scene_id_or_str } })
+        end
+      end
+
+      def qrcode_create_limit_scene(scene_id_or_str)
+        case scene_id_or_str
+        when 0.class
+          post 'qrcode/create', JSON.generate(action_name: 'QR_LIMIT_SCENE',
+                                              action_info: { scene: { scene_id: scene_id_or_str } })
+        else
+          post 'qrcode/create', JSON.generate(action_name: 'QR_LIMIT_STR_SCENE',
+                                              action_info: { scene: { scene_str: scene_id_or_str } })
+        end
+      end
+
+      def shorturl(long_url)
+        post 'shorturl', JSON.generate(action: 'long2short', long_url: long_url)
+      end
+
+      def message_mass_sendall(message)
+        post 'message/mass/sendall', message.to_json
+      end
+
+      def message_mass_delete(msg_id)
+        post 'message/mass/delete', JSON.generate(msg_id: msg_id)
+      end
+
+      def message_mass_preview(message)
+        post 'message/mass/preview', message.to_json
+      end
+
+      def message_mass_get(msg_id)
+        post 'message/mass/get', JSON.generate(msg_id: msg_id)
+      end
+
+      def wxa_get_wxacode(path, width = 430)
+        post 'getwxacode', JSON.generate(path: path, width: width), base: WXA_BASE
+      end
+
+      def wxa_create_qrcode(path, width = 430)
+        post 'wxaapp/createwxaqrcode', JSON.generate(path: path, width: width)
+      end
+
+      def menu
+        get 'menu/get'
+      end
+
+      def menu_delete
+        get 'menu/delete'
+      end
+
+      def menu_create(menu)
+        # 微信不接受7bit escaped json(eg \uxxxx), 中文必须UTF-8编码, 这可能是个安全漏洞
+        post 'menu/create', JSON.generate(menu)
+      end
+
+      def menu_addconditional(menu)
+        # Wechat not accept 7bit escaped json(eg \uxxxx), must using UTF-8, possible security vulnerability?
+        post 'menu/addconditional', JSON.generate(menu)
+      end
+
+      def menu_trymatch(user_id)
+        post 'menu/trymatch', JSON.generate(user_id: user_id)
+      end
+
+      def menu_delconditional(menuid)
+        post 'menu/delconditional', JSON.generate(menuid: menuid)
+      end
+
+      def material(media_id)
+        get 'material/get', params: { media_id: media_id }, as: :file
+      end
+
+      def material_count
+        get 'material/get_materialcount'
+      end
+
+      def material_list(type, offset, count)
+        post 'material/batchget_material', JSON.generate(type: type, offset: offset, count: count)
+      end
+
+      def material_add(type, file)
+        post_file 'material/add_material', file, params: { type: type }
+      end
+
+      def material_delete(media_id)
+        post 'material/del_material', JSON.generate(media_id: media_id)
+      end
+
+      def custom_message_send(message)
+        post 'message/custom/send', message.to_json, content_type: :json
+      end
+
+      def customservice_getonlinekflist
+        get 'customservice/getonlinekflist'
+      end
+
+      def tags
+        get 'tags/get'
+      end
+
+      def tag_create(tag_name)
+        post 'tags/create', JSON.generate(tag: { name: tag_name })
+      end
+
+      def tag_update(tagid, new_tag_name)
+        post 'tags/update', JSON.generate(tag: { id: tagid, name: new_tag_name })
+      end
+
+      def tag_delete(tagid)
+        post 'tags/delete', JSON.generate(tag: { id: tagid })
+      end
+
+      def tag_add_user(tagid, openids)
+        post 'tags/members/batchtagging', JSON.generate(openid_list: openids, tagid: tagid)
+      end
+
+      def tag_del_user(tagid, openids)
+        post 'tags/members/batchuntagging', JSON.generate(openid_list: openids, tagid: tagid)
+      end
+
+      def tag(tagid, next_openid = '')
+        post 'user/tag/get', JSON.generate(tagid: tagid, next_openid: next_openid)
+      end
+
+      def web_access_token(code)
+        params = {
+          appid: access_token.appid,
+          secret: access_token.secret,
+          code: code,
+          grant_type: 'authorization_code'
+        }
+        client.get 'oauth2/access_token', params: params, base: OAUTH2_BASE
+      end
+
+      def web_auth_access_token(web_access_token, openid)
+        client.get 'auth', params: { access_token: web_access_token, openid: openid }, base: OAUTH2_BASE
+      end
+
+      def web_refresh_access_token(user_refresh_token)
+        params = {
+          appid: access_token.appid,
+          grant_type: 'refresh_token',
+          refresh_token: user_refresh_token
+        }
+        client.get 'oauth2/refresh_token', params: params, base: OAUTH2_BASE
+      end
+
+      def web_userinfo(web_access_token, openid, lang = 'zh_CN')
+        client.get 'userinfo', params: { access_token: web_access_token, openid: openid, lang: lang }, base: OAUTH2_BASE
+      end
+    end
+  end
+end

data/lib/wechat/http_client.rb

@@ -56,12 +56,11 @@ module Wechat
         # 42001: access_token timeout
         # 40014: invalid access_token
         # 40001, invalid credential, access_token is invalid or not latest hint
-        # 48001, api unauthorized hint, for qrcode creation # 71
-        when 42001, 40014, 40001, 48001
+        # 48001, api unauthorized hint, should not handle here # GH-230
+        when 42001, 40014, 40001
           raise AccessTokenExpiredError
+        # 40029, invalid code for mp # GH-225
         # 43004, require subscribe hint # GH-214
-        when 43004
-          Rails.logger.info "wechat gem template_message_send failure, errcode 43004, errmsg: #{data['errmsg']}"
         else
           raise ResponseError.new(data['errcode'], data['errmsg'])
         end

data/lib/wechat/message.rb

@@ -171,8 +171,11 @@ module Wechat
       update(MsgType: 'ref_mpnews', MpNews: { MediaId: media_id })
     end
 
+    TEMPLATE_KEYS = %i[template_id form_id page color
+                       emphasis_keyword topcolor url miniprogram data].freeze
+
     def template(opts = {})
-      template_fields = opts.symbolize_keys.slice(:template_id, :topcolor, :url, :data)
+      template_fields = opts.symbolize_keys.slice(*TEMPLATE_KEYS)
       update(MsgType: 'template', Template: template_fields)
     end
 
@@ -184,17 +187,20 @@ module Wechat
     end
 
     TO_JSON_KEY_MAP = {
-      'ToUserName' => 'touser',
-      'ToWxName' => 'towxname',
-      'MediaId' => 'media_id',
-      'MpNews' => 'mpnews',
-      'ThumbMediaId' => 'thumb_media_id',
-      'TemplateId' => 'template_id',
+      'ToUserName'       => 'touser',
+      'ToWxName'         => 'towxname',
+      'MediaId'          => 'media_id',
+      'MpNews'           => 'mpnews',
+      'ThumbMediaId'     => 'thumb_media_id',
+      'TemplateId'       => 'template_id',
+      'FormId'           => 'form_id',
       'ContentSourceUrl' => 'content_source_url',
-      'ShowCoverPic' => 'show_cover_pic'
+      'ShowCoverPic'     => 'show_cover_pic'
     }.freeze
 
-    TO_JSON_ALLOWED = %w(touser msgtype content image voice video file music news articles template agentid filter send_ignore_reprint mpnews towxname).freeze
+    TO_JSON_ALLOWED = %w[touser msgtype content image voice video file
+                         music news articles template agentid filter
+                         send_ignore_reprint mpnews towxname].freeze
 
     def to_json
       keep_camel_case_key = message_hash[:MsgType] == 'template'

data/lib/wechat/mp_api.rb

@@ -0,0 +1,46 @@
+require 'wechat/api_base'
+require 'wechat/http_client'
+require 'wechat/token/public_access_token'
+require 'wechat/ticket/public_jsapi_ticket'
+require 'wechat/concern/common'
+
+module Wechat
+  class MpApi < ApiBase
+    include Concern::Common
+
+    def template_message_send(message)
+      post 'message/wxopen/template/send', message.to_json, content_type: :json
+    end
+
+    def list_template_library(offset: 0, count: 20)
+      post 'wxopen/template/library/list', JSON.generate(offset: offset, count: count)
+    end
+
+    def list_template_library_keywords(id)
+      post 'wxopen/template/library/get', JSON.generate(id: id)
+    end
+
+    def add_message_template(id, keyword_id_list)
+      post 'wxopen/template/add', JSON.generate(id: id, keyword_id_list: keyword_id_list)
+    end
+
+    def list_message_template(offset: 0, count: 20)
+      post 'wxopen/template/list', JSON.generate(offset: offset, count: count)
+    end
+
+    def del_message_template(template_id)
+      post 'wxopen/template/del', JSON.generate(template_id: template_id)
+    end
+
+    def jscode2session(code)
+      params = {
+        appid: access_token.appid,
+        secret: access_token.secret,
+        js_code: code,
+        grant_type: 'authorization_code'
+      }
+
+      client.get 'jscode2session', params: params, base: OAUTH2_BASE
+    end
+  end
+end

data/lib/wechat/responder.rb

@@ -19,14 +19,18 @@ module Wechat
           skip_before_action :verify_authenticity_token, raise: false
         end
 
+        before_action :config_account, only: [:show, :create]
         before_action :verify_signature, only: [:show, :create]
       else
         skip_before_filter :verify_authenticity_token
+        before_filter :config_account, only: [:show, :create]
         before_filter :verify_signature, only: [:show, :create]
       end
     end
 
     module ClassMethods
+      attr_accessor :account_from_request
+
       def on(message_type, with: nil, respond: nil, &block)
         raise 'Unknow message type' unless [:text, :image, :voice, :video, :shortvideo, :link, :event, :click, :view, :scan, :batch_job, :location, :label_location, :fallback].include?(message_type)
         config = respond.nil? ? {} : { respond: respond }
@@ -170,8 +174,8 @@ module Wechat
     end
 
     def show
-      if self.class.corpid.present?
-        echostr, _corp_id = unpack(decrypt(Base64.decode64(params[:echostr]), self.class.encoding_aes_key))
+      if @we_corpid.present?
+        echostr, _corp_id = unpack(decrypt(Base64.decode64(params[:echostr]), @we_encoding_aes_key))
         if Rails::VERSION::MAJOR >= 4
           render plain: echostr
         else
@@ -207,17 +211,27 @@ module Wechat
 
     private
 
+    def config_account
+      account = self.class.account_from_request&.call(request)
+      config = account ? Wechat.config(account) : nil
+
+      @we_encrypt_mode = config&.encrypt_mode || self.class.encrypt_mode
+      @we_encoding_aes_key = config&.encoding_aes_key || self.class.encoding_aes_key
+      @we_token = config&.token || self.class.token
+      @we_corpid = config&.corpid || self.class.corpid
+    end
+
     def verify_signature
-      if self.class.encrypt_mode
+      if @we_encrypt_mode
         signature = params[:signature] || params[:msg_signature]
         msg_encrypt = params[:echostr] || request_encrypt_content
       else
         signature = params[:signature]
       end
 
-      msg_encrypt = nil unless self.class.corpid.present?
+      msg_encrypt = nil unless @we_corpid.present?
 
-      render plain: 'Forbidden', status: 403 if signature != Signature.hexdigest(self.class.token,
+      render plain: 'Forbidden', status: 403 if signature != Signature.hexdigest(@we_token,
                                                                                  params[:timestamp],
                                                                                  params[:nonce],
                                                                                  msg_encrypt)
@@ -226,8 +240,8 @@ module Wechat
     def post_xml
       data = request_content
 
-      if self.class.encrypt_mode && request_encrypt_content.present?
-        content, @app_id = unpack(decrypt(Base64.decode64(request_encrypt_content), self.class.encoding_aes_key))
+      if @we_encrypt_mode && request_encrypt_content.present?
+        content, @we_app_id = unpack(decrypt(Base64.decode64(request_encrypt_content), @we_encoding_aes_key))
         data = Hash.from_xml(content)
       end
 
@@ -265,8 +279,8 @@ module Wechat
     def process_response(response)
       msg = response[:MsgType] == 'success' ? 'success' : response.to_xml
 
-      if self.class.encrypt_mode
-        encrypt = Base64.strict_encode64(encrypt(pack(msg, @app_id), self.class.encoding_aes_key))
+      if @we_encrypt_mode
+        encrypt = Base64.strict_encode64(encrypt(pack(msg, @we_app_id), @we_encoding_aes_key))
         msg = gen_msg(encrypt, params[:timestamp], params[:nonce])
       end
 
@@ -274,7 +288,7 @@ module Wechat
     end
 
     def gen_msg(encrypt, timestamp, nonce)
-      msg_sign = Signature.hexdigest(self.class.token, timestamp, nonce, encrypt)
+      msg_sign = Signature.hexdigest(@we_token, timestamp, nonce, encrypt)
 
       { Encrypt: encrypt,
         MsgSignature: msg_sign,
@@ -284,7 +298,7 @@ module Wechat
     end
 
     def request_encrypt_content
-      request_content['xml']['Encrypt']
+      request_content&.dig('xml', 'Encrypt')
     end
 
     def request_content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Skinnyworm
@@ -31,7 +31,7 @@ cert_chain:
   fGxGnQhzVaW07NKOCRrAZlrF8iqso4JR7Vm9bhFdzxUPLr70njwHLtDS2CHgo1VW
   1xAjN8ZXXpAmVv7V6cI9RTmQHPu/fFn+E0sG9w==
   -----END CERTIFICATE-----
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,6 +53,26 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -82,25 +102,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :runtime
+        version: '5.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -115,20 +129,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -176,11 +176,13 @@ files:
 - lib/wechat/api_base.rb
 - lib/wechat/api_loader.rb
 - lib/wechat/cipher.rb
+- lib/wechat/concern/common.rb
 - lib/wechat/controller_api.rb
 - lib/wechat/corp_api.rb
 - lib/wechat/helpers.rb
 - lib/wechat/http_client.rb
 - lib/wechat/message.rb
+- lib/wechat/mp_api.rb
 - lib/wechat/responder.rb
 - lib/wechat/signature.rb
 - lib/wechat/ticket/corp_jsapi_ticket.rb
@@ -199,9 +201,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="