third_party_wxa 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66bfa1f3a1b0b0c5751fd8f20dcf0d0e0c18dea450228b6d72a803b7cb45210
-  data.tar.gz: 2da07b762878137f36e1e7cd6ced3cf64517b6f728ab671a01579a74f0ee2a7c
+  metadata.gz: 5d86a2b49ebb8160b49e2dc745611a5ea9ae9b88e3a89994ae2300ad6ab752a8
+  data.tar.gz: 28c917e3dd5c60b91773970dcfe64ef163e6991a0dd7d8277f01e260c4515909
 SHA512:
-  metadata.gz: 4cbc09cbb8e022709ce40013b9b251c59393aee5f4624fd64c9e975188314a16011737bd16394bd641856f763720fa3068ba63153a817a2f99131240b34387ae
-  data.tar.gz: 157b4a42a5534b54b884ce02710de75cff1ba3f24aa1e9d1304638321e543cfcdfcbb17a43d1b17aed91b23741d57d895e9b3e51960dc099d8922fc262dd02cb
+  metadata.gz: efbc0f2c2146249d6650c500479e66183938ce1bcc6e62b043823aedeb08ae178ec5db325d5d6abf6200fd39167c1ce95acf6f356396c8c634c1d7560465d0a8
+  data.tar.gz: 0b99ea68184fdff32c52515104cad80ab20c44f3cea89ca97114448c1ec431e29b332c6b27d99da45d93c62edd052f65288be736aec14e2c4e5db7e0eaf04717

data/lib/third_party_wxa/api.rb

@@ -1,4 +1,4 @@
 Dir["#{File.dirname(__FILE__)}/api/*.rb"].each do |path|
-	p path
+	# p path
   	require path
 end

data/lib/third_party_wxa/config.rb

@@ -1,7 +1,7 @@
 module ThirdPartyWxa
 
 	class << self
-		
+
 		attr_accessor :config
 
 		def configure
@@ -20,10 +20,14 @@ module ThirdPartyWxa
 			config.appsecret
 		end
 
+		def redis_key
+			config.redis_key
+		end
+
 	end
 
 	class Config
-    	attr_accessor :redis, :appid, :appsecret
+    	attr_accessor :redis, :appid, :appsecret, :redis_key
   	end
 
 end

data/lib/third_party_wxa/plugin.rb

@@ -13,49 +13,31 @@ 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 :token_store
+		attr_accessor :token_store, :redis_key
 
 		def initialize ticket = nil
 			@appid = ThirdPartyWxa.appid
 			@appsecret = ThirdPartyWxa.appsecret
 			@component_verify_ticket = ticket
 			@token_store = token_store_init
+			@redis_key = ThirdPartyWxa.redis_key || 'third_party_wxa_component_token'
 			p "third party wxa use #{@token_store.class.to_s}"
 		end
 
-		def test_case
-			a = {z: 1, x: 2, c: 3}
-			p a.slice!(:z, :x)
-			p a
-			nil
-		end
-
 		def set_tickect ticket, expire_in
 			@component_verify_ticket = ticket
 			@ticket_expire_at = ThirdPartyWxa.cal_expire_at expire_in
 			self
 		end
 
-		def component_access_token_valid?
-			return false if @component_access_token.nil? || @component_expire_at.nil?
-			Time.now.to_i <= @component_expire_at
-		end
-
 		def get_component_access_token
 			m = Mutex.new
 			m.synchronize{
-				set_component_access_token if !component_access_token_valid?
-				@component_access_token
+				token_store.set_token if !token_store.valid?
+				token_store.get_token
 			}
 		end
 
-		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']
-			self
-		end
-
 		def pre_auth_code_valid?
 			return false if @pre_auth_code.nil? || @pre_expire_at.nil?
 			Time.now.to_i <= @pre_expire_at
@@ -77,20 +59,12 @@ module ThirdPartyWxa
 			Token::Store.init_with(self)
 		end
 
-		def authorizer_access_token_valid? options={}
-			token_store.authorizer_access_token_valid options
-		end
-
 		def get_authorizer_access_token options={}
-			token_store.get_authorizer_access_token options
-		end
-
-		def exchange_authorizer_access_token options={}
-			token_store.exchange_authorizer_access_token options
+			authorizer_access_token_api options.delete(:code)
 		end
 
 		def refresh_authorizer_access_token options={}
-			token_store.refresh_authorizer_access_token options
+			authorizer_access_token_fresh options.delete(:appid), options.delete(:refresh_token)
 		end
 
 		def http_get scope, url, url_params={}
@@ -120,7 +94,7 @@ module ThirdPartyWxa
 		end
 
 		def auth_token_params options
-			{access_token: get_authorizer_access_token(options)}
+			{access_token: options.delete(:access_token)}
 		end
 
 		def wx_redis

data/lib/third_party_wxa/token/local_store.rb

@@ -3,20 +3,20 @@ module ThirdPartyWxa
 
 		class LocalStore < Store
 
-			def authorizer_access_token_valid *args
-				raise 'local_store --- please check expire_time yourself'
+			def valid?
+				return false if plugin.component_access_token.nil? || plugin.component_expire_at.nil?
+				Time.now.to_i <= plugin.component_expire_at
 			end
 
-			def get_authorizer_access_token options
-				options.delete(:access_token)
+			def set_token
+				res = plugin.component_access_token_api
+				plugin.component_access_token = res['component_access_token']
+				plugin.component_expire_at = ThirdPartyWxa.cal_expire_at res['expires_in']
+				plugin
 			end
 
-			def exchange_authorizer_access_token options
-				plugin.authorizer_access_token_api options.delete(:code)
-			end
-
-			def refresh_authorizer_access_token options
-				plugin.authorizer_access_token_fresh options.delete(:appid), options.delete(:refresh_token)
+			def get_token
+				plugin.component_access_token
 			end
 
 

data/lib/third_party_wxa/token/redis_store.rb

@@ -3,45 +3,25 @@ module ThirdPartyWxa
 
 		class RedisStore < Store
 
-
-			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
+			def valid?
+				return false if wx_redis.hget(plugin.redis_key, 'component_access_token').blank?
+				Time.now.to_i <= wx_redis.hget(plugin.redis_key, 'component_expire_at').to_i
 			end
 
-			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(options[:redis_key], 'access_token')
+			def set_token
+				res = plugin.component_access_token_api
+				wx_redis.hmset plugin.redis_key,
+											'component_access_token', res['component_access_token'],
+											'component_expire_at', ThirdPartyWxa.cal_expire_at(res['expires_in'])
+				plugin
 			end
 
-			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 options[:redis_key], 'access_token', authorizer_access_token, 'appid', authorizer_appid,
-								'expire_at', authorizer_expire_at, 'refresh_token', authorizer_refresh_token
-				authorizer_access_token
+			def get_token
+				wx_redis.hget(plugin.redis_key, 'component_access_token')
 			end
 
-			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 options[:redis_key], 'access_token', authorizer_access_token,
-								'expire_at', authorizer_expire_at, 'refresh_token', authorizer_refresh_token
-				authorizer_access_token
+			def wx_redis
+				ThirdPartyWxa.wx_redis
 			end
 
 

data/lib/third_party_wxa/token/store.rb

@@ -16,6 +16,12 @@ module ThirdPartyWxa
 				end
 			end
 
+			def valid?
+			end
+
+			def set_token
+			end
+
 			def wx_redis
 				ThirdPartyWxa.wx_redis
 			end

data/lib/third_party_wxa/version.rb

@@ -1,3 +1,3 @@
 module ThirdPartyWxa
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: third_party_wxa
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - hzy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-19 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client