third_party_wxa 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5181c81669d9ffcab63dec9f5e0b38974cdaa921b84a04e1351dd733913c25d2
-  data.tar.gz: 49b88037162ecf8d47cb83d8065b5315a413785ad037a433979b55e3edc07039
+  metadata.gz: 3f9b989909e595300c5dadc3025adf32adceb591898cf561a93ebee95294a619
+  data.tar.gz: a908be134d4376272ed6e49fcbd08df9ddbf6caad03410705c90eae25f6e4a2e
 SHA512:
-  metadata.gz: a64db30017d173865733b8efa550c7e12b6ce13dac9900df4e80fbc8f85b29e55f1b97c282e879b183e8177e09815a84c5dbab3ca9c0b3d97617f6b0043f642f
-  data.tar.gz: be5426ac91569f95d8a430ba9a84f6912268abee11321fbd4a1fa1fea00a979df9ac1d77740e8989fea9ca3e391ba657fa28d50791e2adeff926b841295899f9
+  metadata.gz: d049c25477f43c5da6bc59278e6149da7d8a1663d65663d644d50762245df88c98a0c6a259973e25d287cabcdc3af6472b51c156867c03a519c128a9a7f6a3ab
+  data.tar.gz: 387a2af728331edd00e8d51ad2e265e49cd22b6ee242dd1e989b167d52ed4bfc19578f672a8fb6735e4bdfdf625ab6deedfde8444b715bc00e0a76b523fe40ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    third_party_wxa (0.1.8)
+    third_party_wxa (0.1.9)
       json (>= 1.8.6)
       redis
       rest-client (>= 2.0)

data/lib/third_party_wxa/api/authorize.rb

@@ -2,6 +2,25 @@ module ThirdPartyWxa
 	module Api
 		module Authorize
 
+			# https://api.weixin.qq.com/cgi-bin/component/api_component_token
+			def component_access_token_api
+				params = {component_appid: appid, component_appsecret: appsecret, component_verify_ticket: component_verify_ticket} 
+				ThirdPartyWxa.http_post_without_component_access_token 'cgi-bin',
+														 				'component/api_component_token', 
+														 				params
+			end
+
+
+			# 通过component_access_token获取pre_auth_code
+			# https://api.weixin.qq.com/cgi-bin/component/api_create_preauthcode?component_access_token=xxx
+			def pre_auth_code_api
+				params = {component_appid: appid}
+				ThirdPartyWxa.http_post_without_component_access_token 'cgi-bin',
+								 										'component/api_create_preauthcode',
+								 										 params,
+								 										 {component_access_token: get_component_access_token}
+			end
+
 			def componentloginpage_url redirect, sign, type=2
 				redirect_uri = "#{redirect}?sign=#{sign}"
 				"https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=#{appid}&pre_auth_code=#{get_pre_auth_code}&auth_type=#{type}&redirect_uri=#{redirect_uri}"

data/lib/third_party_wxa/api/code.rb

@@ -0,0 +1,74 @@
+module ThirdPartyWxa
+	module Api
+		module Code
+
+			# 1、为授权的小程序帐号上传小程序代码
+			# post https://api.weixin.qq.com/wxa/commit?access_token=TOKEN
+			def commit options={}
+				rest = options.slice!(:template_id, :ext_json, :user_version, :user_desc)
+				http_post_with_token rest, 'wxa', 'commit', options
+			end
+
+			# 2、获取体验小程序的体验二维码
+			# get https://api.weixin.qq.com/wxa/get_qrcode?access_token=TOKEN&path=page%2Findex%3Faction%3D1
+			def get_qrcode options={}
+				rest = options.slice!(:path)
+				http_get_with_token rest, 'wxa', 'get_qrcode', options
+			end
+
+			# 3、获取授权小程序帐号已设置的类目
+			# get https://api.weixin.qq.com/wxa/get_category?access_token=TOKEN
+			def get_category options={}
+				http_get_with_token options, 'wxa', 'get_category'
+			end
+
+			# 4、获取小程序的第三方提交代码的页面配置（仅供第三方开发者代小程序调用）
+			# get https://api.weixin.qq.com/wxa/get_page?access_token=TOKEN
+			def get_page options={}
+				http_get_with_token options, 'wxa', 'get_page'
+			end
+
+			# 5、将第三方提交的代码包提交审核（仅供第三方开发者代小程序调用）
+			# post https://api.weixin.qq.com/wxa/submit_audit?access_token=TOKEN
+			def submit_audit options={}
+				rest = options.slice!(:item_list, :feedback_info, :feedback_stuff)
+				http_post_with_token rest, 'wxa', 'submit_audit', options
+			end
+
+			# 7、查询某个指定版本的审核状态（仅供第三方代小程序调用）
+			# post https://api.weixin.qq.com/wxa/get_auditstatus?access_token=TOKEN 
+			def get_auditstatus options={}
+				rest = options.slice!(:auditid)
+				http_post_with_token rest, 'wxa', 'get_auditstatus', options
+			end
+
+			# 8、查询最新一次提交的审核状态（仅供第三方代小程序调用）
+			# get https://api.weixin.qq.com/wxa/get_latest_auditstatus?access_token=TOKEN
+			def get_latest_auditstatus options
+				http_get_with_token options, 'wxa', 'get_latest_auditstatus'
+			end
+
+			# 9、发布已通过审核的小程序（仅供第三方代小程序调用)
+			# post https://api.weixin.qq.com/wxa/release?access_token=TOKEN
+			def release options={}
+				http_post_with_token options, 'wxa', 'release', {}
+			end
+
+			# 10、修改小程序线上代码的可见状态（仅供第三方代小程序调用）
+			# https://api.weixin.qq.com/wxa/change_visitstatus?access_token=TOKEN
+			def change_visitstatus options={}
+				rest = options.slice!(:action)
+				http_post_with_token rest, 'wxa', 'change_visitstatus', options
+			end
+
+			# 11. 小程序版本回退（仅供第三方代小程序调用）
+			# get https://api.weixin.qq.com/wxa/revertcoderelease?access_token=TOKEN
+			def revertcoderelease options={}
+				http_get_with_token options, 'wxa', 'revertcoderelease'
+			end
+
+			#
+
+		end
+	end
+end

data/lib/third_party_wxa/api/login.rb

@@ -0,0 +1,19 @@
+module ThirdPartyWxa
+	module Api
+		module Login
+
+			# code 换取 session_key
+			# get https://api.weixin.qq.com/sns/component/jscode2session?appid=APPID&js_code=JSCODE&grant_type=authorization_code&component_appid=COMPONENT_APPID&component_access_token=ACCESS_TOKEN
+			# support local store only now
+			def jscode2session options
+				params = {
+					component_appid: appid,
+					component_access_token: get_component_access_token,
+					grant_type: 'authorization_code'
+				}.merge!(options.slice(:appid, :js_code))
+				http_get 'sns', 'component/jscode2session', params
+			end
+
+		end
+	end
+end

data/lib/third_party_wxa/api/member.rb

@@ -4,25 +4,21 @@ module ThirdPartyWxa
 
 			# 1、绑定微信用户为小程序体验者
  		 	# https://api.weixin.qq.com/wxa/bind_tester?access_token=TOKEN
- 		 	def bind_tester sign, test_id
- 		 		http_post_with_token sign, 'wxa', 'bind_tester', {wechatid: test_id}
+ 		 	def bind_tester options={}
+ 		 		http_post_with_token options, 'wxa', 'bind_tester', {wechatid: options.delete(:wechatid)}
  		 	end
 
  		 	# 2、解除绑定小程序的体验者
   			# https://api.weixin.qq.com/wxa/unbind_tester?access_token=TOKEN
-  			def unbind_tester sign, test_id
-  				http_post_with_token sign, 'wxa', 'unbind_tester', {wechatid: test_id}
+  			def unbind_tester options={}
+  				http_post_with_token options, 'wxa', 'unbind_tester', {wechatid: options.delete(:wechatid)}
   			end
 
   			# 3. 获取体验者列表
   			# https://api.weixin.qq.com/wxa/memberauth?access_token=TOKEN
-  			def get_experiencer sign
-  				http_post_with_token sign, 'wxa', 'memberauth', {action:"get_experiencer"}
-  			end
-
-  			# 发送消息
-  			def send_message sign, query_auth_code
-  				http_post_with_token sign, 'cgi-bin', 'memberauth', {"touser": "OPENID", "msgtype": "text", "text": {"content":"#{query_auth_code}_from_api"}}
+  			def get_experiencer options={}
+          options.delete(:action)
+  				http_post_with_token options, 'wxa', 'memberauth', {action:"get_experiencer"}
   			end
 
 

data/lib/third_party_wxa/api/qrcode.rb

@@ -5,18 +5,22 @@ module ThirdPartyWxa
 			# 获取小程序码
 			# 接口A: 适用于需要的码数量较少的业务场景 接口地址：
 			# https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN
-			def get_wxa_code(sign, path , width = 430 )
-				params
-				http_post_with_token sign, 'wxa', 'getwxacode', {path: path, width: width}
+			def get_wxa_code options = {}
+				path = options.delete(:path)
+				width = options.delete(:width) || 430 
+				http_post_with_token options, 
+									'wxa', 
+									'getwxacode', 
+									{path: path, width: width}
 			end
 
-			# 获取体验小程序的体验二维码
-			# https://api.weixin.qq.com/wxa/ get_qrcode?access_token=TOKEN&path=page%2Findex%3Faction%3D1
-			def get_qrcode(sign, path = nil)
-				params = {}
-				params.merge!({path: path}) if path.present?
-				http_get_with_token sign, 'wxa', 'get_qrcode', params
-			end
+			# # 获取体验小程序的体验二维码
+			# # https://api.weixin.qq.com/wxa/ get_qrcode?access_token=TOKEN&path=page%2Findex%3Faction%3D1
+			# def get_qrcode(sign, path = nil)
+			# 	params = {}
+			# 	params.merge!({path: path}) if path.present?
+			# 	http_get_with_token sign, 'wxa', 'get_qrcode', params
+			# end
 
 		end
 	end

data/lib/third_party_wxa/api/server.rb

@@ -0,0 +1,22 @@
+module ThirdPartyWxa
+	module Api
+		module Server
+
+			# 1、设置小程序服务器域名
+			# post https://api.weixin.qq.com/wxa/modify_domain?access_token=TOKEN
+			def modify_domain options={}
+				rest = options.slice!(:action, :requestdomain, :wsrequestdomain, :uploaddomain, :downloaddomain)
+				http_post_with_token rest, 'wxa', 'modify_domain', options
+			end
+
+			# 2、设置小程序业务域名（仅供第三方代小程序调用）
+			# post https://api.weixin.qq.com/wxa/setwebviewdomain?access_token=TOKEN
+			def setwebviewdomain options={}
+				rest = options.slice!(:action, :webviewdomain)
+				http_post_with_token rest, 'wxa', 'setwebviewdomain', options
+			end
+
+
+		end
+	end
+end

data/lib/third_party_wxa/plugin.rb

@@ -1,12 +1,13 @@
 module ThirdPartyWxa
 	class Plugin
 
-		include Api::Token
-		include Api::Template
+		include Api::Authorize
+		include Api::Code
+		include Api::Login
 		include Api::Member
 		include Api::Qrcode
-		include Api::Proxy
-		include Api::Authorize
+		include Api::Server
+		include Api::Template
 
 		attr_accessor :appid, :appsecret
 		attr_accessor :component_verify_ticket, :ticket_expire_at
@@ -21,9 +22,9 @@ module ThirdPartyWxa
 			p "third party wxa use #{@token_store.class.to_s}"
 		end
 
-		def set_tickect ticket, expires_in
+		def set_tickect ticket, expire_in
 			@component_verify_ticket = ticket
-			@ticket_expire_at = ThirdPartyWxa.cal_expire_at expires_in
+			@ticket_expire_at = ThirdPartyWxa.cal_expire_at expire_in
 			self
 		end
 
@@ -40,7 +41,7 @@ module ThirdPartyWxa
 		def set_component_access_token
 			res = component_access_token_api
 			@component_access_token = res['component_access_token']
-			@component_expire_at = ThirdPartyWxa.cal_expire_at res['expires_in']
+			@component_expire_at = ThirdPartyWxa.cal_expire_at res['expire_in']
 			self
 		end
 
@@ -57,7 +58,7 @@ module ThirdPartyWxa
 		def set_pre_auth_code
 			res = pre_auth_code_api
 			@pre_auth_code = res['pre_auth_code']
-			@pre_expire_at = ThirdPartyWxa.cal_expire_at res['expires_in'], 60
+			@pre_expire_at = ThirdPartyWxa.cal_expire_at res['expire_in'], 60
 			self
 		end
 
@@ -65,20 +66,20 @@ module ThirdPartyWxa
 			Token::Store.init_with(self)
 		end
 
-		def authorizer_access_token_valid? sign
-			token_store.authorizer_access_token_valid sign
+		def authorizer_access_token_valid? options={}
+			token_store.authorizer_access_token_valid options
 		end
 
-		def get_authorizer_access_token sign
-			token_store.get_authorizer_access_token sign
+		def get_authorizer_access_token options={}
+			token_store.get_authorizer_access_token options
 		end
 
-		def exchange_authorizer_access_token code, sign = nil
-			token_store.exchange_authorizer_access_token code, sign
+		def exchange_authorizer_access_token options={}
+			token_store.exchange_authorizer_access_token options
 		end
 
-		def refresh_authorizer_access_token auth_appid, refresh_token
-			token_store.refresh_authorizer_access_token auth_appid, refresh_token
+		def refresh_authorizer_access_token options={}
+			token_store.refresh_authorizer_access_token options
 		end
 
 		def http_get scope, url, url_params={}
@@ -91,13 +92,13 @@ module ThirdPartyWxa
 			ThirdPartyWxa.http_post_without_component_access_token scope, url, post_params, url_params
 		end
 
-		def http_get_with_token sign, scope, url, url_params={}
-			url_params.merge! auth_token_params
+		def http_get_with_token options, scope, url, url_params={}
+			url_params.merge! auth_token_params(options)
 			ThirdPartyWxa.http_get_without_component_access_token scope, url, url_params
 		end
 
-		def http_post_with_token sign, scope, url, post_params={}, url_params={}
-			url_params.merge! auth_token_params
+		def http_post_with_token options, scope, url, post_params={}, url_params={}
+			url_params.merge! auth_token_params(options)
 			ThirdPartyWxa.http_post_without_component_access_token scope, url, post_params, url_params
 		end
 
@@ -107,8 +108,8 @@ module ThirdPartyWxa
 			{access_token: get_component_access_token}
 		end
 
-		def auth_token_params sign
-			{access_token: get_authorizer_access_token(sign)}
+		def auth_token_params options
+			{access_token: get_authorizer_access_token(options)}
 		end
 
 		def wx_redis

data/lib/third_party_wxa/token/local_store.rb

@@ -7,16 +7,16 @@ module ThirdPartyWxa
 				raise 'local_store --- please check expire_time yourself'
 			end
 
-			def get_authorizer_access_token *args
-				raise 'local_store --- get token from your local store'
+			def get_authorizer_access_token options
+				options.del(:access_token)
 			end
 
-			def exchange_authorizer_access_token code, sign=nil
-				plugin.authorizer_access_token_api code
+			def exchange_authorizer_access_token options
+				plugin.authorizer_access_token_api options.delete(:code)
 			end
 
-			def refresh_authorizer_access_token auth_appid, refresh_token
-				plugin.authorizer_access_token_fresh auth_appid, refresh_tokne
+			def refresh_authorizer_access_token options
+				plugin.authorizer_access_token_fresh options.delete(:appid), options.delete(:refresh_token)
 			end
 
 

data/lib/third_party_wxa/token/redis_store.rb

@@ -4,42 +4,42 @@ module ThirdPartyWxa
 		class RedisStore < Store
 
 
-			def authorizer_access_token_valid? sign
-				expire_at = wx_redis.hget sign, 'expire_at'
-				return false if wx_redis.hget(sign, 'access_token').blank? || expire_at.blank?
+			def authorizer_access_token_valid? options
+				expire_at = wx_redis.hget options[:redis_key], 'expire_at'
+				return false if wx_redis.hget(options[:redis_key], 'access_token').blank? || expire_at.blank?
 				Time.now.to_i <= expire_at.to_i
 			end
 
-			def get_authorizer_access_token sign
-				if !authorizer_access_token_valid? # raise exception?
-					if wx_redis.hget(sign, 'refresh_token').present?
-						auth_appid = wx_redis.hget(sign, 'appid')
-						refresh_token = wx_redis.hget(sign, 'refresh_token')
+			def get_authorizer_access_token options
+				if !authorizer_access_token_valid?(options)  # raise exception?
+					if wx_redis.hget(options[:redis_key], 'refresh_token').present?
+						auth_appid = wx_redis.hget(options[:redis_key], 'appid')
+						refresh_token = wx_redis.hget(options[:redis_key], 'refresh_token')
 						refresh_authorizer_access_token auth_appid, refresh_token
 					else
 						raise 'refresh token is missing, please authorize again'
 					end
 				end
-				wx_redis.hget(sign, 'access_token')
+				wx_redis.hget(options[:redis_key], 'access_token')
 			end
 
-			def exchange_authorizer_access_token code, sign
-				res = plugin.authorizer_access_token_api code
+			def exchange_authorizer_access_token options
+				res = plugin.authorizer_access_token_api options[:code]
 				authorizer_access_token = res['authorization_info']['authorizer_access_token']
 				authorizer_appid = res['authorization_info']['authorizer_appid']
 				authorizer_expire_at = ThirdPartyWxa.cal_expire_at res['authorization_info']['expires_in']
 				authorizer_refresh_token = res['authorization_info']['authorizer_refresh_token']
-				wx_redis.hset sign, 'access_token', authorizer_access_token, 'appid', authorizer_appid,
+				wx_redis.hset options[:redis_key], 'access_token', authorizer_access_token, 'appid', authorizer_appid,
 								'expire_at', authorizer_expire_at, 'refresh_token', authorizer_refresh_token
 				authorizer_access_token
 			end
 
-			def refresh_authorizer_access_token auth_appid, refresh_tokne
+			def refresh_authorizer_access_token auth_appid, refresh_token
 				res = plugin.authorizer_access_token_fresh auth_appid, refresh_tokne
 				authorizer_access_token = res['authorizer_access_token']
 				authorizer_expire_at = ThirdPartyWxa.cal_expire_at res['expires_in']
 				authorizer_refresh_token = res['authorizer_refresh_token']
-				wx_redis.hset sign, 'access_token', authorizer_access_token,
+				wx_redis.hset options[:redis_key], 'access_token', authorizer_access_token,
 								'expire_at', authorizer_expire_at, 'refresh_token', authorizer_refresh_token
 				authorizer_access_token
 			end

data/lib/third_party_wxa/version.rb

@@ -1,3 +1,3 @@
 module ThirdPartyWxa
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: third_party_wxa
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - hzy
@@ -97,11 +97,13 @@ files:
 - lib/third_party_wxa.rb
 - lib/third_party_wxa/api.rb
 - lib/third_party_wxa/api/authorize.rb
+- lib/third_party_wxa/api/base_info.rb
+- lib/third_party_wxa/api/code.rb
+- lib/third_party_wxa/api/login.rb
 - lib/third_party_wxa/api/member.rb
-- lib/third_party_wxa/api/proxy.rb
 - lib/third_party_wxa/api/qrcode.rb
+- lib/third_party_wxa/api/server.rb
 - lib/third_party_wxa/api/template.rb
-- lib/third_party_wxa/api/token.rb
 - lib/third_party_wxa/config.rb
 - lib/third_party_wxa/plugin.rb
 - lib/third_party_wxa/token/local_store.rb

data/lib/third_party_wxa/api/proxy.rb

@@ -1,49 +0,0 @@
-module ThirdPartyWxa
-	module Api
-		module Proxy
-
-			# 获取授权小程序帐号的可选类目
-			# https://api.weixin.qq.com/wxa/get_category?access_token=TOKEN
-			def  get_category sign
-				http_get_with_token sign, 'wxa', 'get_category'
-			end
-
-			# 获取小程序的第三方提交代码的页面配置（仅供第三方开发者代小程序调用）
-			# https://api.weixin.qq.com/wxa/get_page?access_token=TOKEN
-			def get_page sign
-				http_get_with_token 'sign', 'wxa', 'get_page'
-			end
-
-			# 将第三方提交的代码包提交审核（仅供第三方开发者代小程序调用
-			# https://api.weixin.qq.com/wxa/submit_audit?access_token=TOKEN
-			def submit_audit sign, config_json
-				http_post_with_token 'sign', 'wxa', 'submit_audit', config_json
-			end
-
-			# 7、查询某个指定版本的审核状态（仅供第三方代小程序调用
-			# https://api.weixin.qq.com/wxa/get_auditstatus?access_token=TOKEN
-			def get_auditstatus sign, auditid
-				http_post_with_token sign, 'wxa', 'get_auditstatus', {auditid: auditid}
-			end
-
-			# 8、查询最新一次提交的审核状态（仅供第三方代小程序调用）
-			# https://api.weixin.qq.com/wxa/get_latest_auditstatus?access_token=TOKEN
-			def get_latest_auditstatus sign
-				http_get_with_token 'sign', 'wxa', 'get_latest_auditstatus'
-			end
-
-			# 9、发布已通过审核的小程序（仅供第三方代小程序调用）
-  			# https://api.weixin.qq.com/wxa/release?access_token=TOKEN
-  			def release sign
-  				http_post_with_token sign, 'wxa', 'release'
-  			end
-
-  			# 10、修改小程序线上代码的可见状态（仅供第三方代小程序调用）close为不可见，open为可见
-  			# https://api.weixin.qq.com/wxa/change_visitstatus?access_token=TOKEN
-  			def change_visitstatus sign, action
-  				http_post_with_token sign, 'wxa', 'change_visitstatus', {action: action}
-  			end
-
-		end
-	end
-end

data/lib/third_party_wxa/api/token.rb

@@ -1,22 +0,0 @@
-module ThirdPartyWxa
-	module Api
-		module Token
-
-			# https://api.weixin.qq.com/cgi-bin/component/api_component_token
-			def component_access_token_api
-				params = {component_appid: appid, component_appsecret: appsecret, component_verify_ticket: component_verify_ticket} 
-				ThirdPartyWxa.http_post_without_component_access_token 'cgi-bin', 'component/api_component_token', params
-			end
-
-
-			# 通过component_access_token获取pre_auth_code
-			# https://api.weixin.qq.com/cgi-bin/component/api_create_preauthcode?component_access_token=xxx
-			def pre_auth_code_api
-				params = {component_appid: appid}
-				ThirdPartyWxa.http_post_without_component_access_token 'cgi-bin', 'component/api_create_preauthcode', params, {component_access_token: get_component_access_token}
-			end
-
-
-		end
-	end
-end