refactor storage

lib/weixin_authorize/adapter/client_storage.rb

@@ -11,7 +11,7 @@ module WeixinAuthorize
       client.expired_at <= Time.now.to_i
       client.expired_at <= Time.now.to_i
     end
     end
 
 
-    def authenticate
+    def refresh_token
       super
       super
     end
     end
 
 

lib/weixin_authorize/adapter/redis_storage.rb

@@ -12,7 +12,7 @@ module WeixinAuthorize
       weixin_redis.hvals(client.redis_key).empty?
       weixin_redis.hvals(client.redis_key).empty?
     end
     end
 
 
-    def authenticate
+    def refresh_token
       super
       super
       weixin_redis.hmset(client.redis_key, :access_token, client.access_token,
       weixin_redis.hmset(client.redis_key, :access_token, client.access_token,
                          :expired_at, client.expired_at)
                          :expired_at, client.expired_at)

lib/weixin_authorize/adapter/storage.rb

@@ -18,25 +18,29 @@ module WeixinAuthorize
     end
     end
 
 
     def valid?
     def valid?
+      valid["valid"]
+    end
+
+    def valid
       valid_result = http_get_access_token
       valid_result = http_get_access_token
       if valid_result.code == OK_CODE
       if valid_result.code == OK_CODE
         set_access_token_for_client(valid_result.result)
         set_access_token_for_client(valid_result.result)
-        return true
+        return {"valid" => true, "handler" => valid_result}
       end
       end
-      false
+      {"valid" => false, "handler" => valid_result}
     end
     end
 
 
     def token_expired?
     def token_expired?
       raise NotImplementedError, "Subclasses must implement a token_expired? method"
       raise NotImplementedError, "Subclasses must implement a token_expired? method"
     end
     end
 
 
-    def authenticate
-      raise "APPID or APPSECRET is invalid" if !valid?
+    def refresh_token
+      handle_valid_exception
       set_access_token_for_client
       set_access_token_for_client
     end
     end
 
 
     def access_token
     def access_token
-      authenticate if token_expired?
+      refresh_token if token_expired?
     end
     end
 
 
     def set_access_token_for_client(access_token_infos=nil)
     def set_access_token_for_client(access_token_infos=nil)
@@ -53,6 +57,16 @@ module WeixinAuthorize
       {grant_type: "client_credential", appid: client.app_id, secret: client.app_secret}
       {grant_type: "client_credential", appid: client.app_id, secret: client.app_secret}
     end
     end
 
 
+    private
+
+      def handle_valid_exception
+        valid_result = valid
+        if !valid_result["valid"]
+          result_handler = valid_result["handler"]
+          raise ValidAccessTokenException, "#{result_handler.code}:#{result_handler.en_msg}(#{result_handler.cn_msg})"
+        end
+      end
+
   end
   end
 
 
 end
 end