Revert "Same sequence of json store", because read_ticket_from_store …

…must return ticket. This reverts commit db5aa21.
Eric-Guo · Jan 23, 2016 · 53c82e6 · 53c82e6
1 parent 1e05257
commit 53c82e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/wechat/ticket/jsapi_base.rb b/lib/wechat/ticket/jsapi_base.rb
@@ -45,9 +45,9 @@ def signature(url)
 
       def read_ticket_from_store
         td = read_ticket
-        @access_ticket = td.fetch('ticket')
         @ticket_life_in_seconds = td.fetch('ticket_expires_in').to_i
         @got_ticket_at = td.fetch('got_ticket_at').to_i
+        @access_ticket = td.fetch('ticket') # return access_ticket same time
       rescue JSON::ParserError, Errno::ENOENT, KeyError, TypeError
         refresh
       end

diff --git a/lib/wechat/token/access_token_base.rb b/lib/wechat/token/access_token_base.rb
@@ -22,9 +22,9 @@ def token
 
       def read_token_from_store
         td = read_token
-        @access_token = td.fetch('access_token')
         @token_life_in_seconds = td.fetch('token_expires_in').to_i
         @got_token_at = td.fetch('got_token_at').to_i
+        @access_token = td.fetch('access_token') # return access_token same time
       rescue JSON::ParserError, Errno::ENOENT, KeyError, TypeError
         refresh
       end