third_party_wxa 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 280928b0721a0434248e99da225d36754c1ccfa37871ceff0da650149aeae8a4
-  data.tar.gz: dd5825c6eef9f208ef353abc6b2375c7c93af1875654775f3aa09cedf97521c9
+  metadata.gz: d9a1361eab458413e4dbb16d7e239c177be96ebcf92dc89ab016e876c88647a8
+  data.tar.gz: 93a74483b992a8cb255c65555eb9476e1bafc3201e5557eb8f9527403cf6b7f9
 SHA512:
-  metadata.gz: 7ccee3ffb383e9ae8325ef9162a872d129d3cea7a95c885eef036ff5b49d31167832c5265e35c5f1b7aaa4b7c4e7910474b88b4ef5205c02542d3d304190d949
-  data.tar.gz: cc7b50cf0f3c00f56f1069d67d63aa4a26b51f1a2876be8cbe49499103efbe59403254fe349ae3bf23ae6b34ff6c08e4de3a7a129ea4ffd24950d7a8ea575767
+  metadata.gz: 10bc4b22d61c06e568609d88d4d41c6f13c3ba9f1ef3e11705a1773a809d3c4b338bb01a4f662f28029d77473c8018690a57ca3edd9f105d32ec6baea536cd2c
+  data.tar.gz: 7674429c7029324b75cf00cbc16b38815e2ed1d382068fbeb86642441d1dadc7210ac944b5dc55c87d5cdbaa753bce1609bbe0e25d621343a6231835268af216

data/Gemfile.lock

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

data/lib/third_party_wxa/api/authorize.rb

@@ -17,12 +17,12 @@ module ThirdPartyWxa
 			end
 
 			#https:// api.weixin.qq.com /cgi-bin/component/api_authorizer_token?component_access_token=xxxxx
-			def authorizer_access_token_fresh
+			def authorizer_access_token_fresh auth_appid, refresh_token
 				
 				params = {
 				"component_appid": appid,
-				"authorizer_appid": wx_redis.hget(sign, 'appid'),
-				"authorizer_refresh_token": wx_redis.hget(sign, 'refresh_token'),
+				"authorizer_appid": auth_appid,
+				"authorizer_refresh_token": refresh_token,
 				}
 				http_post 'cgi-bin', 'component/api_authorizer_token', params
 			end

data/lib/third_party_wxa/plugin.rb

@@ -61,42 +61,24 @@ module ThirdPartyWxa
 			self
 		end
 
+		def token_store
+			Token::Store.init_with(self)
+		end
+
 		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
+			token_store.authorizer_access_token_valid sign
 		end
 
 		def get_authorizer_access_token sign
-			if !authorizer_access_token_valid? # raise exception?
-				if wx_redis.hget(sign, 'refresh_token').present?
-					refresh_authorizer_access_token
-				else
-					raise 'refresh token is missing, please authorize again'
-				end
-			end
-			wx_redis.hget(sign, 'access_token')
-		end
-
-		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']
-			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 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
+			token_store.get_authorizer_access_token sign
+		end
+
+		def exchange_authorizer_access_token code, sign = nil
+			token_store.exchange_authorizer_access_token code, sign
+		end
+
+		def refresh_authorizer_access_token auth_appid, refresh_token
+			token_store.refresh_authorizer_access_token auth_appid, refresh_token
 		end
 
 		def http_get scope, url, url_params={}

data/lib/third_party_wxa/token/local_store.rb

@@ -0,0 +1,26 @@
+module ThirdPartyWxa
+	module Token
+
+		class LocalStore < Store
+
+			def authorizer_access_token_valid *args
+				raise 'local_store --- please check expire_time yourself'
+			end
+
+			def get_authorizer_access_token *args
+				raise 'local_store --- get token from your local store'
+			end
+
+			def exchange_authorizer_access_token code, sign=nil
+				plugin.authorizer_access_token_api code
+			end
+
+			def refresh_authorizer_access_token auth_appid, refresh_token
+				plugin.authorizer_access_token_fresh auth_appid, refresh_tokne
+			end
+
+
+		end
+
+	end
+end

data/lib/third_party_wxa/token/redis_store.rb

@@ -0,0 +1,51 @@
+module ThirdPartyWxa
+	module Token
+
+		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?
+				expire_at <= Time.now.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')
+						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')
+			end
+
+			def exchange_authorizer_access_token code, sign
+				res = plugin.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']
+				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 auth_appid, refresh_tokne
+				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,
+								'expire_at', authorizer_expire_at, 'refresh_token', authorizer_refresh_token
+				authorizer_access_token
+			end
+
+
+		end
+
+	end
+end

data/lib/third_party_wxa/token/store.rb

@@ -0,0 +1,26 @@
+module ThirdPartyWxa
+	module Token
+
+		class Store
+			attr_accessor :plugin
+
+			def initialize plugin
+				@plugin = plugin
+			end
+
+			def self.init_with plugin
+				if ThirdPartyWxa.wx_redis.nil?
+					LocalStore.new plugin
+				else
+					RedisStore.new plugin
+				end
+			end
+
+			def wx_redis
+				ThirdPartyWxa.wx_redis
+			end
+
+		end
+
+	end
+end

data/lib/third_party_wxa/version.rb

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

data/lib/third_party_wxa.rb

@@ -5,6 +5,14 @@ require 'third_party_wxa/config'
 require "third_party_wxa/api"
 require 'third_party_wxa/plugin'
 module ThirdPartyWxa
+
+	module Token
+		autoload(:Store,       		"third_party_wxa/token/store")
+		autoload(:LocalStore,       "third_party_wxa/token/local_store")
+		autoload(:RedisStore,       "third_party_wxa/token/redis_store")
+	end
+
+
   	BASE = 'https://api.weixin.qq.com/'.freeze
   	# scope => [cgi-bin, wxa]
 	class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: third_party_wxa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - hzy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -104,6 +104,9 @@ files:
 - 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
+- lib/third_party_wxa/token/redis_store.rb
+- lib/third_party_wxa/token/store.rb
 - lib/third_party_wxa/version.rb
 - third_party_wxa.gemspec
 homepage: https://github.com/cs-cj/third_party_wxa