third_party_wxa 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dffc2691e88b602b30d03ebe706b6dfb571e5b3c8dbffd8fbba08177fa4cb96
-  data.tar.gz: 2711574efa8242f31566cf14338c8a1585c89c433b02e46bfdbc38e2d20de4a7
+  metadata.gz: 280928b0721a0434248e99da225d36754c1ccfa37871ceff0da650149aeae8a4
+  data.tar.gz: dd5825c6eef9f208ef353abc6b2375c7c93af1875654775f3aa09cedf97521c9
 SHA512:
-  metadata.gz: 5c539156efc90e1c249537b70e5ffd1b997ce74de3a4ab0888b4ffad3986a287271cd5c2088c208b0a7545a5b4f23b7203728c4e9ea6b22144686dd9cbc52e5c
-  data.tar.gz: 7df3a2d3d98a0f43cacdee0dfedb55d6e7e5c66cd069e82e3fe3593adb1b5a2b0b63a59dc9c2549d83f2b0e16b8b989003e0f7de62dfd0fd8172222fdd91fc7c
+  metadata.gz: 7ccee3ffb383e9ae8325ef9162a872d129d3cea7a95c885eef036ff5b49d31167832c5265e35c5f1b7aaa4b7c4e7910474b88b4ef5205c02542d3d304190d949
+  data.tar.gz: cc7b50cf0f3c00f56f1069d67d63aa4a26b51f1a2876be8cbe49499103efbe59403254fe349ae3bf23ae6b34ff6c08e4de3a7a129ea4ffd24950d7a8ea575767

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    third_party_wxa (0.1.3)
+    third_party_wxa (0.1.4)
       json (>= 1.8.6)
+      redis
       rest-client (>= 2.0)
 
 GEM
@@ -18,6 +19,7 @@ GEM
     mime-types-data (3.2018.0812)
     netrc (0.11.0)
     rake (10.4.2)
+    redis (4.1.2)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)

data/lib/third_party_wxa/api/authorize.rb

@@ -1,8 +1,10 @@
 module ThirdPartyWxa
 	module Api
 		module Authorize
-			def componentloginpage_url redirect, type=2
-				"https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=#{appid}&pre_auth_code=#{get_pre_auth_code}&auth_type=#{type}&redirect_uri=#{redirect}"
+
+			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}"
 			end
 
 			def bindcomponent redirect, type=2
@@ -19,8 +21,8 @@ module ThirdPartyWxa
 				
 				params = {
 				"component_appid": appid,
-				"authorizer_appid": authorizer_appid,
-				"authorizer_refresh_token": authorizer_refresh_token,
+				"authorizer_appid": wx_redis.hget(sign, 'appid'),
+				"authorizer_refresh_token": wx_redis.hget(sign, 'refresh_token'),
 				}
 				http_post 'cgi-bin', 'component/api_authorizer_token', params
 			end

data/lib/third_party_wxa/api/member.rb

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

data/lib/third_party_wxa/api/proxy.rb

@@ -4,44 +4,44 @@ module ThirdPartyWxa
 
 			# 获取授权小程序帐号的可选类目
 			# https://api.weixin.qq.com/wxa/get_category?access_token=TOKEN
-			def  get_category
-				http_get_with_token 'wxa', 'get_category'
+			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
-				http_get_with_token 'wxa', 'get_page'
+			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 config_json
-				http_post_with_token 'wxa', 'submit_audit', config_json
+			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 auditid
-				http_post_with_token 'wxa', 'get_auditstatus', {auditid: auditid}
+			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
-				http_get_with_token 'wxa', 'get_latest_auditstatus'
+			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
-  				http_post_with_token 'wxa', 'release'
+  			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 action
-  				http_post_with_token 'wxa', 'change_visitstatus', {action: action}
+  			def change_visitstatus sign, action
+  				http_post_with_token sign, 'wxa', 'change_visitstatus', {action: action}
   			end
 
 		end

data/lib/third_party_wxa/api/qrcode.rb

@@ -5,17 +5,17 @@ module ThirdPartyWxa
 			# 获取小程序码
 			# 接口A: 适用于需要的码数量较少的业务场景 接口地址：
 			# https://api.weixin.qq.com/wxa/getwxacode?access_token=ACCESS_TOKEN
-			def get_wxa_code(path , width = 430 )
+			def get_wxa_code(sign, path , width = 430 )
 				params
-				http_post_with_token 'wxa', 'getwxacode', {path: path, width: width}
+				http_post_with_token sign, '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(path = nil )
+			def get_qrcode(sign, path = nil)
 				params = {}
 				params.merge!({path: path}) if path.present?
-				http_get_with_token 'wxa', 'get_qrcode', params
+				http_get_with_token sign, 'wxa', 'get_qrcode', params
 			end
 
 		end

data/lib/third_party_wxa/config.rb

@@ -0,0 +1,29 @@
+module ThirdPartyWxa
+
+	class << self
+		
+		attr_accessor :config
+
+		def configure
+			yield self.config ||= Config.new
+		end
+
+		def wx_redis
+			config.redis
+		end
+
+		def appid
+			config.appid
+		end
+
+		def appsecret
+			config.appsecret
+		end
+
+	end
+
+	class Config
+    	attr_accessor :redis, :appid, :appsecret
+  	end
+
+end

data/lib/third_party_wxa/plugin.rb

@@ -12,12 +12,13 @@ module ThirdPartyWxa
 		attr_accessor :component_verify_ticket, :ticket_expire_at
 		attr_accessor :component_access_token, :component_expire_at	#2小时
 		attr_accessor :pre_auth_code,	:pre_expire_at	#10分钟
-		attr_accessor :authorizer_appid
-		attr_accessor :authorizer_access_token, :authorizer_refresh_token, :authorizer_expire_at
+		# attr_accessor :authorizer_appid
+		# attr_accessor :authorizer_access_token, :authorizer_refresh_token, :authorizer_expire_at
+		# attr_accessor :authorizer
 
 		def initialize
-			@appid = ENV['appid']
-			@appsecret = ENV['appsecret']
+			@appid = ThirdPartyWxa.appid
+			@appsecret = ThirdPartyWxa.appsecret
 		end
 
 		def set_tickect ticket, expire_in
@@ -31,7 +32,7 @@ module ThirdPartyWxa
 			@component_expire_at <= Time.now.to_i
 		end
 
-		def get_component_access_token
+		def get_component_access_token 
 			set_component_access_token if !component_access_token_valid?
 			@component_access_token
 		end
@@ -60,37 +61,42 @@ module ThirdPartyWxa
 			self
 		end
 
-		def authorizer_access_token_valid?
-			return false if @authorizer_access_token.nil? || @authorizer_expire_at.blank?
-			@authorizer_expire_at <= Time.now.to_i
+		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?
+			expire_at <= Time.now.to_i
 		end
 
-		def get_authorizer_access_token
+		def get_authorizer_access_token sign
 			if !authorizer_access_token_valid? # raise exception?
-				if @authorizer_refresh_token.present?
+				if wx_redis.hget(sign, 'refresh_token').present?
 					refresh_authorizer_access_token
 				else
-					throw 'refresh token is missing, please authorize again'
+					raise 'refresh token is missing, please authorize again'
 				end
 			end
-			@authorizer_access_token
+			wx_redis.hget(sign, 'access_token')
 		end
 
-		def set_authorizer_access_token code
+		def set_authorizer_access_token sign, code
 			res = authorizer_access_token_api 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']['expire_in']
-			@authorizer_refresh_token = res['authorization_info']['authorizer_refresh_token']
-			self
+			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']['expire_in']
+			authorizer_refresh_token = res['authorization_info']['authorizer_refresh_token']
+			wx_redis.hset sign, '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
-			res = authorizer_access_token_fresh
-			@authorizer_access_token = res['authorizer_access_token']
-			@authorizer_expire_at = ThirdPartyWxa.cal_expire_at res['expires_in']
-			@authorizer_refresh_token = res['authorizer_refresh_token']
-			self
+		def refresh_authorizer_access_token sign
+			res = authorizer_access_token_fresh sign
+			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,
+							'expire_at', authorizer_expire_at, 'refresh_token', authorizer_refresh_token
+			authorizer_access_token
 		end
 
 		def http_get scope, url, url_params={}
@@ -103,12 +109,12 @@ module ThirdPartyWxa
 			ThirdPartyWxa.http_post_without_component_access_token scope, url, post_params, url_params
 		end
 
-		def http_get_with_token scope, url, url_params={}
+		def http_get_with_token sign, scope, url, url_params={}
 			url_params.merge! auth_token_params
 			ThirdPartyWxa.http_get_without_component_access_token scope, url, url_params
 		end
 
-		def http_post_with_token scope, url, post_params={}, url_params={}
+		def http_post_with_token sign, scope, url, post_params={}, url_params={}
 			url_params.merge! auth_token_params
 			ThirdPartyWxa.http_post_without_component_access_token scope, url, post_params, url_params
 		end
@@ -119,8 +125,12 @@ module ThirdPartyWxa
 			{access_token: get_component_access_token}
 		end
 
-		def auth_token_params
-			{access_token: get_authorizer_access_token}
+		def auth_token_params sign
+			{access_token: get_authorizer_access_token(sign)}
+		end
+
+		def wx_redis
+			ThirdPartyWxa.wx_redis
 		end
 
 

data/lib/third_party_wxa/version.rb

@@ -1,3 +1,3 @@
 module ThirdPartyWxa
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/third_party_wxa.rb

@@ -1,5 +1,7 @@
-require "third_party_wxa/version"
 require 'rest_client'
+require 'redis'
+# require "third_party_wxa/version"
+require 'third_party_wxa/config'
 require "third_party_wxa/api"
 require 'third_party_wxa/plugin'
 module ThirdPartyWxa

data/third_party_wxa.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rest-client', ['>= 2.0']
   spec.add_dependency 'json', ['>=1.8.6']
+  spec.add_dependency 'redis'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: third_party_wxa
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - hzy
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.6
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,7 @@ files:
 - lib/third_party_wxa/api/qrcode.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/version.rb
 - third_party_wxa.gemspec