wx_pay 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f7728aa39f6881fdc10e4f9ce5eb0ea4e8f1aa4
-  data.tar.gz: 06ef45d78a887b2472f7dc3fabe6a32432c18567
+  metadata.gz: 509e50b1a6926828e434a63bf8621fd853709ac0
+  data.tar.gz: fee8d3226f9576f72209bcc74ed02b514483ecc2
 SHA512:
-  metadata.gz: 7724c41f2256d30f2813bc2ab5a70e4917abe6627566e6cd9dd7ad6f9edf849690dfed287c8dd6ad018593fe0ac06a6babf8f83a455bfa8e4abb6fe344b261e7
-  data.tar.gz: 861bae20ef39e12fcaf639240c2aa3aa039ee7fdf765193bd69a789520ae972d98397b7882b2460ab690387ac6e601900692862be3d661cf09f638c4bdd00af6
+  metadata.gz: 448dbfed70032ce996f2ec727f2af69ac2c2d9a0e03ee01baa4ec91a9f8b87c5dbd7340b5c6255fd216d8cb86c508d015c989abee0b3b707783e2ac5de4e54ed
+  data.tar.gz: b203b3950ff9663896e8d4cde3ad2042cd525a418be4e4f0bc0978fb00fb5ab3c1a5a42810623f9b9ea25f0533950e9361dab8ca69b5b0d9a699b7a2ac44bf3f

data/lib/wx_pay.rb

@@ -8,7 +8,7 @@ module WxPay
   @debug_mode = true
 
   class<< self
-    attr_accessor :appid, :mch_id, :key, :extra_rest_client_options, :debug_mode
+    attr_accessor :appid, :mch_id, :key, :appsecret, :extra_rest_client_options, :debug_mode
     attr_reader :apiclient_cert, :apiclient_key
 
     def set_apiclient_by_pkcs12(str, pass)

data/lib/wx_pay/service.rb

@@ -1,10 +1,30 @@
 require 'rest_client'
+require 'json'
+require 'cgi'
+require 'securerandom'
 require 'active_support/core_ext/hash/conversions'
 
 module WxPay
   module Service
     GATEWAY_URL = 'https://api.mch.weixin.qq.com'
 
+    def self.generate_authorize_url(redirect_uri, state = nil)
+      state ||= SecureRandom.hex 16
+      "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{WxPay.appid}&redirect_uri=#{CGI::escape redirect_uri}&response_type=code&scope=snsapi_base&state=#{state}"
+    end
+
+    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"
+
+      ::JSON.parse(RestClient::Request.execute(
+        {
+          method: :get,
+          url: url
+        }.merge(options)
+      ), quirks_mode: true)
+    end
+
     INVOKE_UNIFIEDORDER_REQUIRED_FIELDS = [:body, :out_trade_no, :total_fee, :spbill_create_ip, :notify_url, :trade_type]
     def self.invoke_unifiedorder(params, options = {})
       params = {
@@ -193,9 +213,9 @@ module WxPay
         nonce_str: SecureRandom.uuid.tr('-', '')
       }.merge(params)
 
-      check_required_options(params, ORDER_QUERY_REQUIRED_FIELDS)
 
       r = WxPay::Result.new(Hash.from_xml(invoke_remote("#{GATEWAY_URL}/pay/orderquery", make_payload(params), options)))
+      check_required_options(params, ORDER_QUERY_REQUIRED_FIELDS)
 
       yield r if block_given?
 
@@ -267,7 +287,7 @@ module WxPay
       private
 
       def check_required_options(options, names)
-        return if !WxPay.debug_mode?
+        return unless WxPay.debug_mode?
         names.each do |name|
           warn("WxPay Warn: missing required option: #{name}") unless options.has_key?(name)
         end

data/lib/wx_pay/version.rb

@@ -1,3 +1,3 @@
 module WxPay
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wx_pay
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client