From 8fe642437c2f051012ae909aa9f3e3ffeae2b3a6 Mon Sep 17 00:00:00 2001
From: Jeff Lai <winfield301@gmail.com>
Date: Wed, 30 Mar 2016 14:56:04 +0800
Subject: [PATCH] Check if token is empty

---
 lib/dingtalk/api/base.rb  | 8 ++++----
 lib/dingtalk/api/suite.rb | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/dingtalk/api/base.rb b/lib/dingtalk/api/base.rb
index 7e854c0..f6998d5 100644
--- a/lib/dingtalk/api/base.rb
+++ b/lib/dingtalk/api/base.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
 
diff --git a/lib/dingtalk/api/suite.rb b/lib/dingtalk/api/suite.rb
index 313825d..8f01b2c 100644
--- a/lib/dingtalk/api/suite.rb
+++ b/lib/dingtalk/api/suite.rb
@@ -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
--
libgit2 0.21.0