wx_pay 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161782a3a1d52339e8ff2e0f3bfc408071fca7452e0390832e78af0294154f19
-  data.tar.gz: b8251fb2072d5dda662e27e7f2e27d88a785f5cb0737dca9c1f955817ad1f07c
+  metadata.gz: 58376390f703eda446bc3b8c692d11c9aeb001e6fde882515ecb1fce1f490aa4
+  data.tar.gz: fa597c10df24591e2e62c460b64c4c73a5deb46e41ec4f85bd9a99cd4b05cac5
 SHA512:
-  metadata.gz: f14c5ff39a759e960b3578f68a94a6120cef8b69fc9ed5349b40182f493b733999064fdb0105e1f525283146fbf3ea96e90381b38d1f2fbf5eca018dd3a88d26
-  data.tar.gz: aad7882af734bafc4e3bca5a91f49dd1442726a42ca31e041cdc6b005b9d4d7bde6e9feba91b13b37ce0532692b17a8419feb64e03bff3239ead289694a7d97d
+  metadata.gz: 5815550a0ae5ce7568c6389329f0a4c3f856fa6de917e706f3c856bc4aed6b19fa57bd5477c40e6bf6df7ff228939e7bba05e70945d514dc4f982990fbb09af8
+  data.tar.gz: 3eb50fdd268f845f2a7e931f37de8672bb8128f23bfb9d99b88c1931db63b5afc85aadbb2c421e6c3d58e4b05a35484a99fcd31280fb750d81539b65ffbb89cb

data/lib/wx_pay/service.rb

@@ -361,6 +361,30 @@ module WxPay
       r
     end
 
+    DOWNLOAD_FUND_FLOW_REQUIRED_FIELDS = [:bill_date, :account_type]
+    def self.download_fund_flow(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, DOWNLOAD_FUND_FLOW_REQUIRED_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 = invoke_remote("/pay/downloadfundflow", make_payload(params, WxPay::Sign::SIGN_TYPE_HMAC_SHA256), options)
+
+      yield r if block_given?
+
+      r
+    end
+
     def self.sendgroupredpack(params, options={})
       params = {
         wxappid: options.delete(:appid) || WxPay.appid,
@@ -420,13 +444,13 @@ module WxPay
         end
       end
 
-      def xmlify_payload(params)
-        sign = WxPay::Sign.generate(params)
+      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>"
       end
 
-      def make_payload(params)
+      def make_payload(params, sign_type = WxPay::Sign::SIGN_TYPE_MD5)
         if WxPay.sandbox_mode?
           r = get_sandbox_signkey
           if r['return_code'] == WxPay::Result::SUCCESS_FLAG
@@ -439,7 +463,7 @@ module WxPay
             warn("WxPay Warn: fetch sandbox sign key failed #{r['return_msg']}")
           end
         end
-        xmlify_payload(params)
+        xmlify_payload(params, sign_type)
       end
 
       def invoke_remote(url, payload, options = {})

data/lib/wx_pay/sign.rb

@@ -2,14 +2,26 @@ require 'digest/md5'
 
 module WxPay
   module Sign
-    def self.generate(params)
+
+    SIGN_TYPE_MD5 = 'MD5'
+    SIGN_TYPE_HMAC_SHA256 = 'HMAC-SHA256'
+
+    def self.generate(params, sign_type = SIGN_TYPE_MD5)
       key = params.delete(:key)
 
       query = params.sort.map do |k, v|
         "#{k}=#{v}" if v.to_s != ''
       end.compact.join('&')
 
-      Digest::MD5.hexdigest("#{query}&key=#{key || WxPay.key}").upcase
+      string_sign_temp = "#{query}&key=#{key || WxPay.key}"
+
+      if sign_type == SIGN_TYPE_MD5
+        Digest::MD5.hexdigest(string_sign_temp).upcase
+      elsif sign_type == SIGN_TYPE_HMAC_SHA256
+        OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), key, string_sign_temp).upcase
+      else
+        warn("WxPay Warn: unknown sign_type : #{sign_type}")
+      end
     end
 
     def self.verify?(params, options = {})

data/lib/wx_pay/version.rb

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

data/test/wx_pay/sign_test.rb

@@ -14,19 +14,29 @@ class WxPay::SignTest < MiniTest::Test
       total_fee: 1
     }
 
-    @sign = '729A68AC3DE268DBD9ADE442382E7B24'
+    @sign_md5 = '729A68AC3DE268DBD9ADE442382E7B24'
+    @sign_hmac_sha256 = 'A58C01F990B45A4D0E496F835B2739E391C6C734927B1DA740DC873E607FB42A'
   end
 
   def test_generate_sign
-    assert_equal @sign, WxPay::Sign.generate(@params)
+    assert_equal @sign_md5, WxPay::Sign.generate(@params)
+  end
+
+  def test_generate_sign_md5
+    assert_equal @sign_md5, WxPay::Sign.generate(@params, WxPay::Sign::SIGN_TYPE_MD5)
+  end
+
+  def test_generate_sign_hmac_sha256
+    @params.merge!(key: "key")
+    assert_equal @sign_hmac_sha256, WxPay::Sign.generate(@params, WxPay::Sign::SIGN_TYPE_HMAC_SHA256)
   end
 
   def test_verify_sign
-    assert WxPay::Sign.verify?(@params.merge(:sign => @sign))
+    assert WxPay::Sign.verify?(@params.merge(:sign => @sign_md5))
   end
 
   def test_verify_sign_when_fails
-    assert !WxPay::Sign.verify?(@params.merge(:danger => 'danger', :sign => @sign))
+    assert !WxPay::Sign.verify?(@params.merge(:danger => 'danger', :sign => @sign_md5))
   end
 
   def test_accept_pars_key_to_generate_sign

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An unofficial simple wechat pay gem