wework 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2edfd8447ee2705141dc3e3b9f794ef762e0a52e
-  data.tar.gz: d24518f8cd4da0e921b3b4c0ad73894872569845
+  metadata.gz: 714896d468c99ed325dfa1b8e94afd4ad6de85a8
+  data.tar.gz: ca5b3a044abd35673167c57033e8efbc554b8cb5
 SHA512:
-  metadata.gz: ce2c7829cbdedd5aab33764a7285820e169ed9ba299a4b7710f2a3199e2e76c48536a12a635ac4e31a73f22a39c5a52c37c2c55f9401665af839a41dea78b8cf
-  data.tar.gz: 29d325d1cd6aba6e2d9b2715f1b402e4e5c703a296db776d06f89327df17f57fc9c25844d8364a4f50e41f76ffe767eb51700e1e9c784a61a9f8859bc1892ca8
+  metadata.gz: efe9dabd28e852f5082311c9116cfef327d36f007a2c3bd17c47f03b5df57e0cd6c16e21245c81ee640293923a63c0ce3f47a5e57321f071bf0a01315ca85ea4
+  data.tar.gz: 02e82e258a1b8be84959777890007f5d29051093eadc5bb53bc108fffab60eb65503d1314e6233c3686885e81de33af7213a863a0b52d8721c961d3c6d1cf990

data/lib/wework.rb

@@ -13,8 +13,8 @@ require 'wework/api/contact'
 module Wework
   API_ENDPOINT        = 'https://qyapi.weixin.qq.com/cgi-bin/'.freeze
   AUTHORIZE_ENDPOINT  = 'https://open.weixin.qq.com/connect/oauth2/authorize'.freeze
-  ACCESS_TOKEN_PREFIX = 'TOKEN'.freeze
-  JSAPI_TOKEN_PREFIX  = 'JST'.freeze
+  ACCESS_TOKEN_PREFIX = 'WX_TOKEN'.freeze
+  JSAPI_TOKEN_PREFIX  = 'WX_JST'.freeze
   CONTACT_AGENT_ID    = 'CONTACT'.freeze
   HTTP_OK_STATUS      = [200, 201].freeze
   SUCCESS_CODE        = 0

data/lib/wework/api/base.rb

@@ -26,6 +26,10 @@ module Wework
         @request ||= Wework::Request.new(API_ENDPOINT, false)
       end
 
+      def valid?
+        access_token.present?
+      end
+
       def get(path, headers = {})
         with_access_token(headers[:params]) do |params|
           request.get path, headers.merge(params: params)

data/lib/wework/js_ticket/redis_store.rb

@@ -9,7 +9,7 @@ module Wework
 
       def jsapi_ticket
         super
-        redis.hget(key, "jsapi_ticket")
+        redis.hget(key, "ticket")
       end
 
       def expired?
@@ -18,14 +18,16 @@ module Wework
 
       def refresh_token
         result = super
-        expires_at = Time.now.to_i + result['expires_in'].to_i - 100
-        redis.hmset(
-          key,
-          "jsapi_ticket", result['ticket'],
-          "expires_at", expires_at
-        )
-
-        redis.expireat(key, expires_at)
+        if result.success?
+          expires_at = Time.now.to_i + result.expires_in.to_i - 100
+          redis.hmset(
+            key,
+            "ticket", result.ticket,
+            "expires_at", expires_at
+          )
+
+          redis.expireat(key, expires_at)
+        end
       end
 
       private

data/lib/wework/token/redis_store.rb

@@ -18,15 +18,16 @@ module Wework
 
       def refresh_token
         result = super
-
-        expires_at = Time.now.to_i + result['expires_in'].to_i - 100
-        redis.hmset(
-          key,
-          "access_token", result['access_token'],
-          "expires_at", expires_at
-        )
-
-        redis.expireat(key, expires_at)
+        if result.success?
+          expires_at = Time.now.to_i + result.expires_in.to_i - 100
+          redis.hmset(
+            key,
+            "access_token", result.access_token,
+            "expires_at", expires_at
+          )
+
+          redis.expireat(key, expires_at)
+        end
       end
 
       private

data/lib/wework/version.rb

@@ -1,3 +1,3 @@
 module Wework
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - seandong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http