wework 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da08105f38235bd4f06667e179d9c033a82146f1
-  data.tar.gz: cb7194f21cbb79a9c1ffa8e88e8e7362a167b663
+  metadata.gz: b1665ffec3b44a0c13996c34dbe527cf8003f723
+  data.tar.gz: 86e3e8182349a38cb70e9dd5f10645ebce9dc2cd
 SHA512:
-  metadata.gz: 7ca30a8f14e08e9a5e47a22e7bee4235da1849cbbae5044ea81a1385458880a1c6470f5428b66d47d912caa240639995f4a0e21a9ba28dba629870b837e1defb
-  data.tar.gz: 720dc74a741a7e828c577326aafe2f76764bda9077efc2dcd04315e8b627599dae4444365099dad454794412cfcc86303d4af99e572ce3ec0fcc95c7222aa630
+  metadata.gz: d2b5df0b9ee2fd1447a2c2e9c83101cbe29a49a49bdb18aa318bf375c41cad7d915beb8642fcecfc473e34a3d992b2e1e28d4a334905d21a9e824006e99119f7
+  data.tar.gz: e28aabdd329db56fd5132b5da3ebd7053f8e171ccb9a35ab03b35d5076e20c2584319a47570eb87834e588a4a0d47a6fb604c07ab84a01a86e04467efe9c5e29

data/lib/wework/api/agent.rb

@@ -1,8 +1,33 @@
+require "erb"
+
 module Wework
   module Api
     class Agent < Base
       # user agent: UA is mozilla/5.0 (iphone; cpu iphone os 10_2 like mac os x) applewebkit/602.3.12 (khtml, like gecko) mobile/14c92 wxwork/1.3.2 micromessenger/6.2
 
+      def authorize_url(redirect_uri, scope="snsapi_base", state="wxwork")
+        uri = ERB::Util.url_encode(redirect_uri)
+        "#{AUTHORIZE_ENDPOINT}?appid=#{corp_id}&redirect_uri=#{uri}&response_type=code&scope=#{scope}&state=#{state}#wechat_redirect"
+      end
+
+      def get_oauth_userinfo code
+        get 'user/getuserinfo', params: {code: code}
+      end
+
+      def get_jssign_package url
+        timestamp = Time.now.to_i
+        noncestr = SecureRandom.hex(8)
+        str = "jsapi_ticket=#{jsapi_ticket}&noncestr=#{noncestr}&timestamp=#{timestamp}&url=#{url}"
+        {
+          "appId"     => app_id,
+          "nonceStr"  => noncestr,
+          "timestamp" => timestamp,
+          "url"       => url,
+          "signature" => Digest::SHA1.hexdigest(str),
+          "rawString" => str
+        }
+      end
+
       def get_info
         get 'agent/get', params: {agentid: agent_id}
       end
@@ -63,7 +88,7 @@ module Wework
       end
 
       def agent_id
-        @agent_id.to_i
+        @app_id.to_i
       end
     end
   end

data/lib/wework/api/base.rb

@@ -1,18 +1,23 @@
 require 'wework/token/store'
 require 'wework/token/redis_store'
 
+require 'wework/js_ticket/store'
+require 'wework/js_ticket/redis_store'
+
 module Wework
   module Api
     class Base
-      attr_reader :corp_id, :agent_id, :agent_secret
+
+      attr_reader :corp_id, :app_id, :app_secret
       attr_accessor :options
 
       delegate :access_token, to: :token_store
+      delegate :jsapi_ticket, to: :jsticket_store
 
-      def initialize(corp_id, agent_id, agent_secret, options={})
+      def initialize(corp_id, app_id, app_secret, options={})
         @corp_id      = corp_id
-        @agent_id     = agent_id
-        @agent_secret = agent_secret
+        @app_id       = app_id
+        @app_secret   = app_secret
         @options      = options
       end
 
@@ -20,6 +25,10 @@ module Wework
         @token_store ||= Token::RedisStore.new self
       end
 
+      def jsticket_store
+        @jsticket_store ||= JsTicket::RedisStore.new self
+      end
+
       def request
         @request ||= Wework::Request.new(API_ENDPOINT, false)
       end

data/lib/wework/js_ticket/redis_store.rb

@@ -0,0 +1,39 @@
+module Wework
+  module JsTicket
+    class RedisStore < Store
+
+      def initialize(agent)
+        raise RedisNotConfigException if redis.nil?
+        super
+      end
+
+      def jsapi_ticket
+        super
+        redis.hget(key, "jsapi_ticket")
+      end
+
+      def expired?
+        redis.hvals(key).empty?
+      end
+
+      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)
+      end
+
+      private
+
+      def redis
+        Wework.redis
+      end
+
+    end
+  end
+end

data/lib/wework/js_ticket/store.rb

@@ -0,0 +1,31 @@
+module Wework
+  module JsTicket
+    class Store
+
+      attr_accessor :app
+
+      def initialize(app)
+        @app = app
+      end
+
+      def jsapi_ticket
+        refresh_token if expired?
+      end
+
+      def expired?
+        raise NotImplementedError, "Subclasses must implement a token_expired? method"
+      end
+
+      def refresh_token
+        app.get 'get_jsapi_ticket'
+      end
+
+      private
+
+      def key
+        @key ||= Digest::MD5.hexdigest("#{JSAPI_TOKEN_PREFIX}_#{app.app_id}_#{app.app_secret}")
+      end
+
+    end
+  end
+end

data/lib/wework/token/store.rb

@@ -2,10 +2,10 @@ module Wework
   module Token
     class Store
 
-      attr_accessor :agent
+      attr_accessor :app
 
-      def initialize(agent)
-        @agent = agent
+      def initialize(app)
+        @app = app
       end
 
       def access_token
@@ -17,13 +17,13 @@ module Wework
       end
 
       def refresh_token
-        agent.request.get 'gettoken', params: {corpid: agent.corp_id, corpsecret: agent.agent_secret}
+        app.request.get 'gettoken', params: {corpid: app.corp_id, corpsecret: app.app_secret}
       end
 
       private
 
       def key
-        @key ||= Digest::MD5.hexdigest("#{ACCESS_TOKEN_PREFIX}_#{agent.agent_id}_#{agent.agent_secret}")
+        @key ||= Digest::MD5.hexdigest("#{ACCESS_TOKEN_PREFIX}_#{app.app_id}_#{app.app_secret}")
       end
 
     end

data/lib/wework/version.rb

@@ -1,3 +1,3 @@
 module Wework
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

data/lib/wework.rb

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

data/wework.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["sindon@gmail.com"]
 
   spec.summary       = spec.description = %q{Ruby API wrapper for work wechat.}
-  spec.homepage      = "https://github.com/seandong/wework"
+  spec.homepage      = "https://github.com/mycolorway/wework"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - seandong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -122,12 +122,14 @@ files:
 - lib/wework/api/contact.rb
 - lib/wework/config.rb
 - lib/wework/engine.rb
+- lib/wework/js_ticket/redis_store.rb
+- lib/wework/js_ticket/store.rb
 - lib/wework/request.rb
 - lib/wework/token/redis_store.rb
 - lib/wework/token/store.rb
 - lib/wework/version.rb
 - wework.gemspec
-homepage: https://github.com/seandong/wework
+homepage: https://github.com/mycolorway/wework
 licenses:
 - MIT
 metadata: {}