Check if token is empty

Jeff Lai
1 parent 89a69ca5
Showing 2 changed files with 6 additions and 5 deletions Show diff stats
lib/dingtalk/api/base.rb
lib/dingtalk/api/suite.rb
@@ -12,7 +12,8 @@ module Dingtalk
       end
  
       def access_token
-        redis.get("#{corp_id}_#{ACCESS_TOKEN}") || set_access_token
+        token = redis.get("#{corp_id}_#{ACCESS_TOKEN}")
+        token.to_s.empty? ? set_access_token : token
       end
  
       def set_access_token
@@ -20,7 +21,8 @@ module Dingtalk
       end
  
       def js_ticket
-        redis.get("#{corp_id}_#{JS_TICKET}") || set_js_ticket
+        ticket = redis.get("#{corp_id}_#{JS_TICKET}")
+        ticket.to_s.empty? ? set_js_ticket : ticket
       end
  
       def set_js_ticket
@@ -45,8 +47,6 @@ module Dingtalk
  
         def http_get(url, params = {})
           res = RestClient.get(request_url(url))
-          #p = default_params.merge(params)
-          #res = RestClient.get(request_url(url), p.to_json, content_type: :json)
           JSON.parse(res)
         end
  
@@ -18,7 +18,8 @@ module Dingtalk
       end
  
       def suite_access_token
-        redis.get(SUITE_ACCESS_TOKEN) || set_suite_access_token
+        token = redis.get(SUITE_ACCESS_TOKEN)
+        token.to_s.empty? ? set_suite_access_token : token
       end
  
       def set_suite_access_token
...	...	@@ -12,7 +12,8 @@ module Dingtalk
12	12	end
13	13
14	14	def access_token
15		- redis.get("#{corp_id}_#{ACCESS_TOKEN}") \|\| set_access_token
	15	+ token = redis.get("#{corp_id}_#{ACCESS_TOKEN}")
	16	+ token.to_s.empty? ? set_access_token : token
16	17	end
17	18
18	19	def set_access_token
...	...	@@ -20,7 +21,8 @@ module Dingtalk
20	21	end
21	22
22	23	def js_ticket
23		- redis.get("#{corp_id}_#{JS_TICKET}") \|\| set_js_ticket
	24	+ ticket = redis.get("#{corp_id}_#{JS_TICKET}")
	25	+ ticket.to_s.empty? ? set_js_ticket : ticket
24	26	end
25	27
26	28	def set_js_ticket
...	...	@@ -45,8 +47,6 @@ module Dingtalk
45	47
46	48	def http_get(url, params = {})
47	49	res = RestClient.get(request_url(url))
48		- #p = default_params.merge(params)
49		- #res = RestClient.get(request_url(url), p.to_json, content_type: :json)
50	50	JSON.parse(res)
51	51	end
52	52
...	...
...	...	@@ -18,7 +18,8 @@ module Dingtalk
18	18	end
19	19
20	20	def suite_access_token
21		- redis.get(SUITE_ACCESS_TOKEN) \|\| set_suite_access_token
	21	+ token = redis.get(SUITE_ACCESS_TOKEN)
	22	+ token.to_s.empty? ? set_suite_access_token : token
22	23	end
23	24
24	25	def set_suite_access_token
...	...