wx_pay 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58376390f703eda446bc3b8c692d11c9aeb001e6fde882515ecb1fce1f490aa4
-  data.tar.gz: fa597c10df24591e2e62c460b64c4c73a5deb46e41ec4f85bd9a99cd4b05cac5
+  metadata.gz: 8cbb707c3e377f06aed3ae84c7d405a1091a45e62585ecebfecfab13f3de7c44
+  data.tar.gz: ee75f73c3842d83640437145b71f6438bfe998c55fcf1de668842ab278b560b2
 SHA512:
-  metadata.gz: 5815550a0ae5ce7568c6389329f0a4c3f856fa6de917e706f3c856bc4aed6b19fa57bd5477c40e6bf6df7ff228939e7bba05e70945d514dc4f982990fbb09af8
-  data.tar.gz: 3eb50fdd268f845f2a7e931f37de8672bb8128f23bfb9d99b88c1931db63b5afc85aadbb2c421e6c3d58e4b05a35484a99fcd31280fb750d81539b65ffbb89cb
+  metadata.gz: 5e445241334bbff574199d93041717b307a1ee07fdddc7128ac99b483b438773753733f648b9a1422dcbdf4b764ffbe40ed34c7b1b2ade8f18454f0c5bac39fd
+  data.tar.gz: 1f0c1b37452a65b5a2a5dcfbbf88e4083c22eca317a1978364baf038407b74892ff99c380b84c4feaa7c427b081696ccebb2beb56bdd6ab4abdf07c656641d2e

data/lib/wx_pay.rb

@@ -11,7 +11,7 @@ module WxPay
 
   class<< self
     attr_accessor :appid, :mch_id, :key, :appsecret, :extra_rest_client_options, :debug_mode
-    attr_accessor :sandbox_mode, :sandbox_key, :sandbox_mch_id
+    attr_accessor :sandbox_mode, :manual_get_sandbox_key
     attr_reader :apiclient_cert, :apiclient_key
 
     def set_apiclient_by_pkcs12(str, pass)
@@ -37,5 +37,9 @@ module WxPay
     def sandbox_mode?
       @sandbox_mode
     end
+
+    def manual_get_sandbox_key?
+      @manual_get_sandbox_key
+    end
   end
 end

data/lib/wx_pay/service.rb

@@ -17,19 +17,27 @@ module WxPay
 
     def self.authenticate(authorization_code, options = {})
       options = WxPay.extra_rest_client_options.merge(options)
-      url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=#{WxPay.appid}&secret=#{WxPay.appsecret}&code=#{authorization_code}&grant_type=authorization_code"
+      payload = {
+        appid: options.delete(:appid) || WxPay.appid,
+        secret: options.delete(:appsecret) || WxPay.appsecret,
+        code: authorization_code,
+        grant_type: 'authorization_code'
+      }
+      url = "https://api.weixin.qq.com/sns/oauth2/access_token"
 
       ::JSON.parse(RestClient::Request.execute(
         {
           method: :get,
+          payload: payload,
           url: url
         }.merge(options)
       ), quirks_mode: true)
     end
 
-    def self.get_sandbox_signkey
+    def self.get_sandbox_signkey(mch_id = WxPay.mch_id, options = {})
       params = {
-        mch_id: WxPay.mch_id,
+        mch_id: mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }
       r = WxPay::Result.new(Hash.from_xml(invoke_remote("/pay/getsignkey", xmlify_payload(params))))
@@ -39,11 +47,18 @@ module WxPay
 
     def self.authenticate_from_weapp(js_code, options = {})
       options = WxPay.extra_rest_client_options.merge(options)
-      url = "https://api.weixin.qq.com/sns/jscode2session?appid=#{WxPay.appid}&secret=#{WxPay.appsecret}&js_code=#{js_code}&grant_type=authorization_code"
+      payload = {
+        appid: options.delete(:appid) || WxPay.appid,
+        secret: options.delete(:appsecret) || WxPay.appsecret,
+        js_code: authorization_code,
+        grant_type: 'authorization_code'
+      }
+      url = "https://api.weixin.qq.com/sns/jscode2session"
 
       ::JSON.parse(RestClient::Request.execute(
         {
           method: :get,
+          payload: payload,
           url: url
         }.merge(options)
       ), quirks_mode: true)
@@ -152,6 +167,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
@@ -286,6 +302,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
@@ -309,6 +326,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
@@ -332,6 +350,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
@@ -349,6 +368,7 @@ module WxPay
       params = {
         appid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', ''),
       }.merge(params)
 
@@ -389,6 +409,7 @@ module WxPay
       params = {
         wxappid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
@@ -411,6 +432,7 @@ module WxPay
       params = {
         wxappid: options.delete(:appid) || WxPay.appid,
         mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        key: options.delete(:key) || WxPay.key,
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
@@ -428,6 +450,31 @@ module WxPay
 
       r
     end
+    
+    # 用于商户对已发放的红包进行查询红包的具体信息，可支持普通红包和裂变包。
+    GETHBINFO_FIELDS = [:mch_billno, :bill_type]
+    def self.gethbinfo(params, options = {})
+      params = {
+        appid: options.delete(:appid) || WxPay.appid,
+        mch_id: options.delete(:mch_id) || WxPay.mch_id,
+        nonce_str: SecureRandom.uuid.tr('-', ''),
+        key: options.delete(:key) || WxPay.key
+      }.merge(params)
+
+      check_required_options(params, GETHBINFO_FIELDS)
+
+      options = {
+        ssl_client_cert: options.delete(:apiclient_cert) || WxPay.apiclient_cert,
+        ssl_client_key: options.delete(:apiclient_key) || WxPay.apiclient_key,
+        verify_ssl: OpenSSL::SSL::VERIFY_NONE
+      }.merge(options)
+
+      r = WxPay::Result.new(Hash.from_xml(invoke_remote("/mmpaymkttransfers/gethbinfo", make_payload(params), options)))
+
+      yield r if block_given?
+
+      r
+    end
 
     class << self
       private
@@ -446,23 +493,23 @@ module WxPay
 
       def xmlify_payload(params, sign_type = WxPay::Sign::SIGN_TYPE_MD5)
         sign = WxPay::Sign.generate(params, sign_type)
-        params.delete(:key) if params[:key]
-        "<xml>#{params.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
+        "<xml>#{params.except(:key).sort.map { |k, v| "<#{k}>#{v}</#{k}>" }.join}<sign>#{sign}</sign></xml>"
       end
 
       def make_payload(params, sign_type = WxPay::Sign::SIGN_TYPE_MD5)
-        if WxPay.sandbox_mode?
+        # TODO: Move this out
+        if WxPay.sandbox_mode? && !WxPay.manual_get_sandbox_key?
           r = get_sandbox_signkey
           if r['return_code'] == WxPay::Result::SUCCESS_FLAG
-            params = params.merge({
-              :mch_id => r['mch_id'] || WxPay.mch_id,
-              :key => r['sandbox_signkey']
-            })
-            WxPay.sandbox_key = r['sandbox_signkey']
+            params = params.merge(
+              mch_id: r['mch_id'] || WxPay.mch_id,
+              key: r['sandbox_signkey']
+            )
           else
             warn("WxPay Warn: fetch sandbox sign key failed #{r['return_msg']}")
           end
         end
+
         xmlify_payload(params, sign_type)
       end
 

data/lib/wx_pay/sign.rb

@@ -9,11 +9,14 @@ module WxPay
     def self.generate(params, sign_type = SIGN_TYPE_MD5)
       key = params.delete(:key)
 
+      new_key = params["key"] #after
+      key = params.delete("key") if params["key"] #after
+
       query = params.sort.map do |k, v|
         "#{k}=#{v}" if v.to_s != ''
       end.compact.join('&')
 
-      string_sign_temp = "#{query}&key=#{key || WxPay.key}"
+      string_sign_temp = "#{query}&key=#{key || new_key || WxPay.key}" #after
 
       if sign_type == SIGN_TYPE_MD5
         Digest::MD5.hexdigest(string_sign_temp).upcase
@@ -25,14 +28,14 @@ module WxPay
     end
 
     def self.verify?(params, options = {})
+      return true if WxPay.sandbox_mode?
+
       params = params.dup
-      params = params.merge(options)
-      if WxPay.sandbox_mode?
-        params = params.merge(:key => WxPay.sandbox_key)
-      end
+      params["appid"] = options[:appid] if options[:appid]
+      params["mch_id"] = options[:mch_id]  if options[:mch_id]
+      params["key"] = options[:key] if options[:key]
 
       sign = params.delete('sign') || params.delete(:sign)
-
       generate(params) == sign
     end
   end

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.19.0'.freeze
 end

data/test/wx_pay/service_test.rb

@@ -48,7 +48,7 @@ class ServiceTest < MiniTest::Test
       mch_id: 'mch_id',
       key: 'key'
     }
-    xml_str = '<xml><body>测试商品</body><out_trade_no>test003</out_trade_no><total_fee>1</total_fee><spbill_create_ip>127.0.0.1</spbill_create_ip><notify_url>http://making.dev/notify</notify_url><trade_type>JSAPI</trade_type><openid>OPENID</openid><app_id>app_id</app_id><mch_id>mch_id</mch_id><sign>172A2D487A37D13FDE32B874BA823DD6</sign></xml>'
+    xml_str = '<xml><app_id>app_id</app_id><body>测试商品</body><mch_id>mch_id</mch_id><notify_url>http://making.dev/notify</notify_url><openid>OPENID</openid><out_trade_no>test003</out_trade_no><spbill_create_ip>127.0.0.1</spbill_create_ip><total_fee>1</total_fee><trade_type>JSAPI</trade_type><sign>172A2D487A37D13FDE32B874BA823DD6</sign></xml>'
     assert_equal xml_str, WxPay::Service.send(:make_payload, params)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-19 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -131,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: An unofficial simple wechat pay gem