kubaninc / dingtalk

Download as
Browse Code ยป

Commit 8fe642437c2f051012ae909aa9f3e3ffeae2b3a6

Authored by Jeff Lai
1 parent 89a69ca5
Exists in master

Check if token is empty

Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
lib/dingtalk/api/base.rb
  Diff comments   View file @8fe6424
@@ -12,7 +12,8 @@ module Dingtalk @@ -12,7 +12,8 @@ module Dingtalk
12 end 12 end
13 13
14 def access_token 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 end 17 end
17 18
18 def set_access_token 19 def set_access_token
@@ -20,7 +21,8 @@ module Dingtalk @@ -20,7 +21,8 @@ module Dingtalk
20 end 21 end
21 22
22 def js_ticket 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 end 26 end
25 27
26 def set_js_ticket 28 def set_js_ticket
@@ -45,8 +47,6 @@ module Dingtalk @@ -45,8 +47,6 @@ module Dingtalk
45 47
46 def http_get(url, params = {}) 48 def http_get(url, params = {})
47 res = RestClient.get(request_url(url)) 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 JSON.parse(res) 50 JSON.parse(res)
51 end 51 end
52 52
lib/dingtalk/api/suite.rb
  Diff comments   View file @8fe6424
@@ -18,7 +18,8 @@ module Dingtalk @@ -18,7 +18,8 @@ module Dingtalk
18 end 18 end
19 19
20 def suite_access_token 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 end 23 end
23 24
24 def set_suite_access_token 25 def set_suite_access_token