wechat 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38d17166a10c49de46d4e87c787b0869163e13d3
-  data.tar.gz: 3c80f22d8adc8219c4e0b32824d2df63269a6aa6
+  metadata.gz: eee061e4522d5960256e017183c61f615ef94a0d
+  data.tar.gz: 510a350df936a6d4d9465997ba253b4ef3e78634
 SHA512:
-  metadata.gz: bf6b9c04a09cc228db3366c6b311731404af1a2e01581c5602d96897be3a3ddb3b52d9e0c3e4013c6307bc135f3ba8db7b85ecfa3f8880f3b9a5179e8c933619
-  data.tar.gz: d1091b3c0c44c974c42c9e88a16eadcf256d00c4108c527dc9b3969e24f22e4b7d24a559cf3f61779a09a5bbee90cdd744aa60f4d9522ee5ecb33e4239caa732
+  metadata.gz: f21668a1dc3cbb3fac9336e57d214a4d9d99a1814e30e1474b1a0e9d12dd47c47bc69c5f6af02c4b6bb89f09ab76ade708ebaebfb838eba4110268730ac69688
+  data.tar.gz: efa6851ddb7f3f948daccdc148c412f8a73e2211c123c4417ddd3e7195cdeb3030e8f046162328e3c11ded6b96cf3c5143e35d92757fe6770f530ef18ed876a4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v0.6.7 (released at 12/18/2015)
+
+* Add timeout configuration option, close #74
+* New getuserinfo and oauth2_url to support getting FromUserName from web page.
+
 ## v0.6.6 (released at 12/15/2015)
 
 * Add jsapi_ticket support for Enterprise Account

data/README.md

@@ -118,7 +118,8 @@ production:
   agentid:    <%= ENV['WECHAT_AGENTID'] %>
   access_token:  <%= ENV['WECHAT_ACCESS_TOKEN'] %>
   token:      <%= ENV['WECHAT_TOKEN'] %>
-  skip_verify_ssl: false
+  timeout:    30,
+  skip_verify_ssl: true
   encoding_aes_key:  <%= ENV['WECHAT_ENCODING_AES_KEY'] %>
   jsapi_ticket: <%= ENV['WECHAT_JSAPI_TICKET'] %>
 
@@ -133,6 +134,10 @@ test:
 
 注意在Rails项目根目录下运行`wechat`命令行工具会优先使用`config/wechat.yml`中的`default`配置，如果失败则使用`~\.wechat.yml`中的配置，以便于在生产环境下管理多个微信账号应用。
 
+##### 配置微信服务器超时
+
+微信服务器有时请求会花很长时间，如果不配置，默认为20秒，可视情况配置。
+
 ##### 配置跳过SSL认证
 
 Wechat服务器有报道曾出现[RestClient::SSLCertificateNotVerified](http://qydev.weixin.qq.com/qa/index.php?qa=11037)错误，此时可以选择关闭SSL验证。`skip_verify_ssl: true`
@@ -191,6 +196,7 @@ Wechat commands:
   wechat menu                                              # 当前菜单
   wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
   wechat menu_delete                                       # 删除菜单
+  wechat oauth2_url [REDIRECT_URI]                         # 生成OAuth2.0验证URL
   wechat qrcode_create_limit_scene [SCENE_ID_OR_STR]       # 请求永久二维码
   wechat qrcode_create_scene [SCENE_ID, EXPIRE_SECONDS]    # 请求临时二维码
   wechat qrcode_download [TICKET, QR_CODE_PIC_PATH]        # 通过ticket下载二维码
@@ -236,6 +242,7 @@ Wechat commands:
   wechat menu_create [MENU_YAML_PATH]                      # 创建菜单
   wechat menu_delete                                       # 删除菜单
   wechat message_send [OPENID, TEXT_MESSAGE]               # 发送文字消息
+  wechat oauth2_url [REDIRECT_URI]                         # 生成OAuth2.0验证URL
   wechat qrcode_download [TICKET, QR_CODE_PIC_PATH]        # 通过ticket下载二维码
   wechat tag [TAG_ID]                                      # 获取标签成员
   wechat tag_add_department [TAG_ID, PARTY_IDS]            # 增加标签部门

data/bin/wechat

@@ -13,6 +13,7 @@ require 'active_support/json'
 require 'fileutils'
 require 'yaml'
 require 'wechat/api_loader'
+require 'cgi'
 
 class App < Thor
   package_name 'Wechat'
@@ -284,6 +285,12 @@ class App < Thor
     puts wechat_api.user(open_id)
   end
 
+  desc 'oauth2_url [REDIRECT_URI]', '生成OAuth2.0验证URL'
+  def oauth2_url(redirect_uri)
+    appid = Wechat.config.corpid || Wechat.config.appid
+    puts oauth2_url(redirect_uri, appid)
+  end
+
   desc 'user_update_remark [OPEN_ID, REMARK]', '设置备注名'
   def user_update_remark(openid, remark)
     puts wechat_api.user_update_remark(openid, remark)

data/lib/action_controller/wechat_responder.rb

@@ -6,6 +6,7 @@ module ActionController
       self.corpid = opts[:corpid] || Wechat.config.corpid
       self.agentid = opts[:agentid] || Wechat.config.agentid
       self.encrypt_mode = opts[:encrypt_mode] || Wechat.config.encrypt_mode || corpid.present?
+      self.timeout = opts[:timeout] || 20
       self.skip_verify_ssl = opts[:skip_verify_ssl]
       self.token = opts[:token] || Wechat.config.token
       self.encoding_aes_key = opts[:encoding_aes_key] || Wechat.config.encoding_aes_key
@@ -14,9 +15,9 @@ module ActionController
         self.wechat = Wechat.api
       else
         if corpid.present?
-          self.wechat = Wechat::CorpApi.new(corpid, opts[:corpsecret], opts[:access_token], agentid, skip_verify_ssl, opts[:jsapi_ticket])
+          self.wechat = Wechat::CorpApi.new(corpid, opts[:corpsecret], opts[:access_token], agentid, timeout, skip_verify_ssl, opts[:jsapi_ticket])
         else
-          self.wechat = Wechat::Api.new(opts[:appid], opts[:secret], opts[:access_token], skip_verify_ssl, opts[:jsapi_ticket])
+          self.wechat = Wechat::Api.new(opts[:appid], opts[:secret], opts[:access_token], timeout, skip_verify_ssl, opts[:jsapi_ticket])
         end
       end
     end

data/lib/generators/wechat/templates/config/wechat.yml

@@ -19,6 +19,8 @@ production:
 #  appid:      <%= ENV['WECHAT_APPID'] %>
 #  secret:     <%= ENV['WECHAT_APP_SECRET'] %>
   token:      <%%= ENV['WECHAT_TOKEN'] %>
+  timeout:    30,
+  skip_verify_ssl: true
   access_token:  <%%= ENV['WECHAT_ACCESS_TOKEN'] %>
   encrypt_mode: false # if true must fill encoding_aes_key
   encoding_aes_key:  <%%= ENV['WECHAT_ENCODING_AES_KEY'] %>

data/lib/wechat/api.rb

@@ -8,8 +8,8 @@ module Wechat
     API_BASE = 'https://api.weixin.qq.com/cgi-bin/'
     OAUTH2_BASE = 'https://api.weixin.qq.com/sns/oauth2/'
 
-    def initialize(appid, secret, token_file, skip_verify_ssl, jsapi_ticket_file)
-      @client = Client.new(API_BASE, skip_verify_ssl)
+    def initialize(appid, secret, token_file, timeout, skip_verify_ssl, jsapi_ticket_file)
+      @client = Client.new(API_BASE, timeout, skip_verify_ssl)
       @access_token = AccessToken.new(@client, appid, secret, token_file)
       @jsapi_ticket = JsapiTicket.new(@client, @access_token, jsapi_ticket_file)
     end

data/lib/wechat/api_loader.rb

@@ -7,9 +7,9 @@ module Wechat
       js_token_file = options[:js_token_file] || c.jsapi_ticket || '/var/tmp/wechat_jsapi_ticket'
 
       if c.appid && c.secret && token_file.present?
-        Wechat::Api.new(c.appid, c.secret, token_file, c.skip_verify_ssl, js_token_file)
+        Wechat::Api.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.skip_verify_ssl, js_token_file)
+        Wechat::CorpApi.new(c.corpid, c.corpsecret, token_file, c.agentid, c.timeout, c.skip_verify_ssl, js_token_file)
       else
         puts <<-HELP
 Need create ~/.wechat.yml with wechat appid and secret
@@ -35,6 +35,7 @@ HELP
         config[:access_token] ||= Rails.root.join('tmp/access_token').to_s
         config[:jsapi_ticket] ||= Rails.root.join('tmp/jsapi_ticket').to_s
       end
+      config[:timeout] ||= 20
       config.symbolize_keys!
       @config = OpenStruct.new(config)
     end
@@ -68,6 +69,7 @@ HELP
         token: ENV['WECHAT_TOKEN'],
         access_token: ENV['WECHAT_ACCESS_TOKEN'],
         encrypt_mode: ENV['WECHAT_ENCRYPT_MODE'],
+        timeout: ENV['WECHAT_TIMEOUT'],
         skip_verify_ssl: ENV['WECHAT_SKIP_VERIFY_SSL'],
         encoding_aes_key: ENV['WECHAT_ENCODING_AES_KEY'],
         jsapi_ticket: ENV['WECHAT_JSAPI_TICKET'] }

data/lib/wechat/client.rb

@@ -2,30 +2,23 @@ require 'rest_client'
 
 module Wechat
   class Client
-    attr_reader :base, :verify_ssl
+    attr_reader :base, :timeout, :verify_ssl
 
-    def initialize(base, skip_verify_ssl)
+    def initialize(base, timeout, skip_verify_ssl)
       @base = base
-      @verify_ssl = !skip_verify_ssl
+      @timeout = timeout
+      @verify_ssl = skip_verify_ssl ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
     end
 
     def get(path, header = {})
       request(path, header) do |url, header|
-        if verify_ssl
-          RestClient.get(url, header)
-        else
-          RestClient::Request.execute(url: url, method: :get, headers: header, verify_ssl: OpenSSL::SSL::VERIFY_NONE)
-        end
+        RestClient::Request.execute(method: :get, url: url, headers: header, timeout: timeout, verify_ssl: verify_ssl)
       end
     end
 
     def post(path, payload, header = {})
       request(path, header) do |url, header|
-        if verify_ssl
-          RestClient.post(url, payload, header)
-        else
-          RestClient::Request.execute(url: url, method: :post, payload: payload, headers: header, verify_ssl: OpenSSL::SSL::VERIFY_NONE)
-        end
+        RestClient::Request.execute(method: :post, url: url, payload: payload, headers: header, timeout: timeout, verify_ssl: verify_ssl)
       end
     end
 

data/lib/wechat/corp_api.rb

@@ -2,6 +2,7 @@ require 'wechat/api_base'
 require 'wechat/client'
 require 'wechat/access_token'
 require 'wechat/corp_jsapi_ticket'
+require 'cgi'
 
 module Wechat
   class CorpAccessToken < AccessToken
@@ -18,8 +19,8 @@ module Wechat
 
     API_BASE = 'https://qyapi.weixin.qq.com/cgi-bin/'
 
-    def initialize(appid, secret, token_file, agentid, skip_verify_ssl, jsapi_ticket_file)
-      @client = Client.new(API_BASE, skip_verify_ssl)
+    def initialize(appid, secret, token_file, agentid, timeout, skip_verify_ssl, jsapi_ticket_file)
+      @client = Client.new(API_BASE, timeout, skip_verify_ssl)
       @access_token = CorpAccessToken.new(@client, appid, secret, token_file)
       @agentid = agentid
       @jsapi_ticket = CorpJsapiTicket.new(@client, @access_token, jsapi_ticket_file)
@@ -37,6 +38,15 @@ module Wechat
       get 'user/get', params: { userid: userid }
     end
 
+    def getuserinfo(code)
+      get 'user/getuserinfo', params: { code: code }
+    end
+
+    def oauth2_url(redirect_uri, appid)
+      redirect_uri = CGI.escape(redirect_uri)
+      "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{appid}&redirect_uri=#{redirect_uri}&response_type=code&scope=snsapi_base#wechat_redirect"
+    end
+
     def convert_to_openid(userid)
       post 'user/convert_to_openid', JSON.generate(userid: userid, agentid: agentid)
     end

data/lib/wechat/responder.rb

@@ -12,7 +12,7 @@ module Wechat
     end
 
     module ClassMethods
-      attr_accessor :wechat, :token, :corpid, :agentid, :encrypt_mode, :skip_verify_ssl, :encoding_aes_key
+      attr_accessor :wechat, :token, :corpid, :agentid, :encrypt_mode, :timeout, :skip_verify_ssl, :encoding_aes_key
 
       def on(message_type, with: nil, respond: nil, &block)
         fail 'Unknow message type' unless [:text, :image, :voice, :video, :link, :event, :click, :view, :scan, :batch_job, :location, :fallback].include?(message_type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wechat
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Skinnyworm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport