wework 0.3.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c98841b29ce00aabf378c3af49d92a9630154ef
-  data.tar.gz: e3b52725ac3c261041b0ee6c8a29ef1ab925b213
+SHA256:
+  metadata.gz: 9599e4575016ec45c4efe18b2e9d80cb27873f3cb8675ff379e7a1f9da774954
+  data.tar.gz: fc49b09c054faecde4feb2e9eab2754e39b6340b1a1be78b6ab81c3bc1260679
 SHA512:
-  metadata.gz: 9214b0af6797808be69002d24daa4090e863a9854add081e61f6d817789e6627275b44ec2bbcf27451e72bea0afa9987ca446b7930e866c23e1814e95577c17f
-  data.tar.gz: f9f43733cb23887ad7490862378bb567f38b898abf0aa99a25188a3ed6d0f0acca720041a64693ec789c3c241a29da780b3522224bc3cea61dbf3b46a48eafd0
+  metadata.gz: 54a4da5b3fcd4f14c58ecb1f95e44348b95f80b970fc4ddf9b15491e80db824bcf39763ecce2473379c41500f308c8b51056120a26c8a1b9ba51b4dd74245859
+  data.tar.gz: 557479ed57faeae92f92f9633ca3a68fa0584a8529e2cc1a54afa273f1fb64a2f3fdf66a4e79692c5aa0e34d7080979487ecf36c0985cda26758fb881e5816d6

data/.gitignore

@@ -8,5 +8,4 @@
 /spec/reports/
 /tmp/
 *.gem
-config.yml
 .DS_Store

data/README.md

@@ -2,6 +2,13 @@
 
 Wework is a ruby API wrapper for work wechat.
 
+[![CircleCI](https://circleci.com/gh/mycolorway/wework/tree/suite.svg?style=svg)](https://circleci.com/gh/mycolorway/wework/tree/suite)
+
+## Version 1.1.0
+* 支持第三方应用接口
+* 支持小程序接口
+
+
 ## Version 0.1.4
 * 异步任务接口 [doc](https://work.weixin.qq.com/api/doc#10138)
 

data/lib/wework.rb

@@ -2,22 +2,27 @@ require 'redis'
 require 'active_support/all'
 #require 'active_support/core_ext/object/blank'
 
-Dir["#{File.dirname(__FILE__)}/wework/*.rb"].each do |path|
-  require path
-end
+LIB_PATH = "#{File.dirname(__FILE__)}/wework"
+Dir["#{LIB_PATH}/api/methods/*.rb",  "#{LIB_PATH}/token/*.rb"].each { |path| require path }
 
+require 'wework/version'
+require 'wework/cipher'
+require 'wework/config'
 require 'wework/api/base'
 require 'wework/api/agent'
 require 'wework/api/contact'
+require 'wework/api/suite'
+require 'wework/api/corp'
+require 'wework/api/provider'
+
 
 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 = 'WX_TOKEN'.freeze
-  JSAPI_TOKEN_PREFIX  = 'WX_JST'.freeze
-  CONTACT_AGENT_ID    = 'CONTACT'.freeze
-  HTTP_OK_STATUS      = [200, 201].freeze
-  SUCCESS_CODE        = 0
+  API_ENDPOINT            = 'https://qyapi.weixin.qq.com/cgi-bin/'.freeze
+  AUTHORIZE_ENDPOINT      = 'https://open.weixin.qq.com/connect/oauth2/authorize'.freeze
+  SSO_AUTHORIZE_ENDPOINT  = 'https://open.work.weixin.qq.com/wwopen/sso/3rd_qrConnect'.freeze
+  APP_AUTHORIZE_ENDPOINT  = 'https://open.work.weixin.qq.com/3rdapp/install'.freeze
+  HTTP_OK_STATUS          = [200, 201].freeze
+  SUCCESS_CODE            = 0
 
   # Exceptions
   class RedisNotConfigException < RuntimeError; end

data/lib/wework/api/agent.rb

@@ -1,94 +1,30 @@
-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}&agentid=#{app_id}&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"     => corp_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
-
-      def set_info data={}
-        post 'agent/set', data.merge(agentid: agent_id)
-      end
-
-      def menu_create menu
-        post 'menu/create', menu, params: {agentid: agent_id}
-      end
-
-      def menu_get
-        get 'menu/get', params: {agentid: agent_id}
-      end
-
-      def menu_delete
-        get 'menu/delete', params: {agentid: agent_id}
-      end
-
-      def message_send user_ids, department_ids, payload={}
-        payload[:agentid] = agent_id
-        payload[:touser] = Array.wrap(user_ids).join('|') if user_ids.present?
-        payload[:toparty] = Array.wrap(department_ids).join('|') if department_ids.present?
-        post 'message/send', payload
-      end
-
-      def text_message_send user_ids, department_ids, content
-        message_send user_ids, department_ids, {text: {content: content}, msgtype: 'text'}
-      end
 
-      def image_message_send user_ids, department_ids, media_id
-        message_send user_ids, department_ids, {image: {media_id: media_id}, msgtype: 'image'}
-      end
-
-      def voice_message_send user_ids, department_ids, media_id
-        message_send user_ids, department_ids, {voice: {media_id: media_id}, msgtype: 'voice'}
-      end
+      include Methods::Agent
+      include Methods::Message
+      include Methods::Menu
+      include Methods::Checkin
+      include Methods::Approval
 
-      def file_message_send user_ids, department_ids, media_id
-        message_send user_ids, department_ids, {file: {media_id: media_id}, msgtype: 'file'}
-      end
+      attr_reader :agent_id
 
-      def video_message_send user_ids, department_ids, video={}
-        message_send user_ids, department_ids, {video: video, msgtype: 'video'}
+      def initialize(options={})
+        @agent_id = options.delete(:agent_id)
+        @agent_id = @agent_id.to_i if @agent_id && @agent_id.match?(/\A\d+\Z/)
+        super(options)
       end
 
-      def textcard_message_send user_ids, department_ids, textcard={}
-        message_send user_ids, department_ids, {textcard: textcard, msgtype: 'textcard'}
-      end
-
-      def news_message_send user_ids, department_ids, news=[]
-        message_send user_ids, department_ids, {news: {articles: news}, msgtype: 'news'}
+      def jsapi_ticket
+        jsticket_store.ticket
       end
 
       private
 
-      def agent_id
-        @app_id.to_i
+      def jsticket_store
+        @jsticket_store ||= Token::JsTicket.new self
       end
-
     end
   end
-end
+end

data/lib/wework/api/base.rb

@@ -1,24 +1,19 @@
-require 'wework/token/store'
-require 'wework/token/redis_store'
-
-require 'wework/js_ticket/store'
-require 'wework/js_ticket/redis_store'
+require 'wework/request'
 
 module Wework
   module Api
     class Base
-      include Wework::Cipher
 
-      attr_reader :corp_id, :app_id, :app_secret
-      attr_accessor :options
+      include Methods::Media
+      include Methods::User
+      include Methods::Department
 
-      delegate :access_token, to: :token_store
-      delegate :jsapi_ticket, to: :jsticket_store
+      attr_accessor :corp_id, :secret, :options
 
-      def initialize(corp_id, app_id, app_secret, options={})
-        @corp_id      = corp_id
-        @app_id       = app_id
-        @app_secret   = app_secret
+      def initialize options={}
+        @corp_id      = options.delete(:corp_id)
+        @secret       = options.delete(:secret)
+        @token_store  = options.delete(:token_store)
         @options      = options
       end
 
@@ -27,58 +22,55 @@ module Wework
       end
 
       def valid?
-        access_token.present?
+        return false if corp_id.nil?
+        token_store.token.present?
       rescue AccessTokenExpiredError
         false
       rescue => e
-        Rails.logger.error "[WEWORK] (valid?) fetch access token error(#{corp_id}##{app_id}): #{e.inspect}" if defined?(Rails)
+        Rails.logger.error "[WEWORK] (valid?) fetch access token error(#{corp_id}): #{e.inspect}" if defined?(Rails)
         false
       end
 
       def get(path, headers = {})
-        with_access_token(headers[:params]) do |params|
+        with_token(headers[:params]) do |params|
           request.get path, headers.merge(params: params)
         end
       end
 
       def post(path, payload, headers = {})
-        with_access_token(headers[:params]) do |params|
+        with_token(headers[:params]) do |params|
           request.post path, payload, headers.merge(params: params)
         end
       end
 
       def post_file(path, file, headers = {})
-        with_access_token(headers[:params]) do |params|
+        with_token(headers[:params]) do |params|
           request.post_file path, file, headers.merge(params: params)
         end
       end
 
-      # public API
-      def media_upload type, file
-        post_file 'media/upload', file, params: { type: type }
-      end
-
-      def media_get(media_id)
-        get 'media/get', params: { media_id: media_id }, as: :file
+      def access_token
+        token_store.token
       end
 
       private
 
-      def with_access_token(params = {}, tries = 2)
+      def with_token(params = {}, tries = 2)
         params ||= {}
-        yield(params.merge(access_token: access_token))
+        yield(params.merge(token_params))
       rescue AccessTokenExpiredError
-        token_store.refresh_token
+        token_store.update_token
         retry unless (tries -= 1).zero?
       end
 
       def token_store
-        @token_store ||= Token::RedisStore.new self
+        @token_store ||= Token::AppToken.new self
       end
 
-      def jsticket_store
-        @jsticket_store ||= JsTicket::RedisStore.new self
+      def token_params
+        {access_token: access_token}
       end
+
     end
   end
 end

data/lib/wework/api/contact.rb

@@ -1,81 +1,7 @@
 module Wework
   module Api
     class Contact < Base
-
-      def initialize(corp_id, corp_secret)
-        super(corp_id, CONTACT_AGENT_ID, corp_secret)
-      end
-
-      def user_create data={}
-        post 'user/create', data
-      end
-
-      def user_get userid
-        get 'user/get', params: {userid: userid}
-      end
-
-      def user_update userid, data={}
-        post 'user/update', data.merge(userid: userid)
-      end
-
-      def user_delete userid
-        get 'user/delete', params: {userid: userid}
-      end
-
-      def user_batchdelete useridlist=[]
-        post 'user/batchdelete', {useridlist: useridlist}
-      end
-
-      def user_simplelist department_id, fetch_child=0
-        get 'user/simplelist', params: {department_id: department_id, fetch_child: fetch_child}
-      end
-
-      def user_list department_id, fetch_child=0
-        get 'user/list', params: {department_id: department_id, fetch_child: fetch_child}
-      end
-
-      def department_create data={}
-        post 'department/create', data
-      end
-
-      def department_update department_id, data={}
-        post 'department/update', data.merge(id: department_id)
-      end
-
-      def department_delete department_id
-        get 'department/delete', params: {id: department_id}
-      end
-
-      def department_list department_id=0
-        get 'department/list', params: {id: department_id}
-      end
-
-      def batch_syncuser media_id, callback_url=nil, token=nil, encodingaeskey=nil
-        post 'batch/syncuser', batch_params(media_id, callback_url, token, encodingaeskey)
-      end
-
-      def batch_replaceuser media_id, callback_url=nil, token=nil, encodingaeskey=nil
-        post 'batch/replaceuser', batch_params(media_id, callback_url, token, encodingaeskey)
-      end
-
-      def batch_replaceparty media_id, callback_url=nil, token=nil, encodingaeskey=nil
-        post 'batch/replaceparty', batch_params(media_id, callback_url, token, encodingaeskey)
-      end
-
-      def batch_getresult job_id
-        get 'batch/getresult', params: {jobid: job_id}
-      end
-
-      private
-
-      def batch_params media_id, callback_url, token, encodingaeskey
-        params = {media_id: media_id}
-        if callback_url.present? && token.present? && encodingaeskey.present?
-          params[:callback] = {url: callback_url, token: token, encodingaeskey: encodingaeskey}
-        end
-
-        params
-      end
+      include Methods::Batch
     end
   end
 end

data/lib/wework/api/corp.rb

@@ -0,0 +1,29 @@
+module Wework
+  module Api
+    class Corp < Base
+
+      include Wework::Cipher
+      include Methods::User
+      include Methods::Department
+
+      attr_reader :suite, :permanent_code
+
+      def initialize(options={})
+        @suite = options.delete(:suite)
+        @permanent_code = options.delete(:permanent_code)
+        super(options)
+      end
+
+      def agent(agent_id)
+        Wework::Api::Agent.new(corp_id: corp_id, agent_id: agent_id, token_store: token_store)
+      end
+
+      private
+
+      def token_store
+        @token_store ||= Token::CorpToken.new self
+      end
+
+    end
+  end
+end

data/lib/wework/api/methods/agent.rb

@@ -0,0 +1,49 @@
+require "erb"
+
+module Wework
+  module Api
+    module Methods
+      module Agent
+        def authorize_url(redirect_uri, scope="snsapi_base", state="wxwork")
+          # 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
+          uri = ERB::Util.url_encode(redirect_uri)
+          "#{AUTHORIZE_ENDPOINT}?appid=#{corp_id}&redirect_uri=#{uri}&response_type=code&scope=#{scope}&agentid=#{agent_id}&state=#{state}#wechat_redirect"
+        end
+
+        def get_oauth_userinfo code
+          get 'user/getuserinfo', params: {code: code}
+        end
+
+        def get_user_detail user_ticket
+          post 'user/getuserdetail', {user_ticket: user_ticket}
+        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"     => corp_id,
+            "nonceStr"  => noncestr,
+            "timestamp" => timestamp,
+            "url"       => url,
+            "signature" => Digest::SHA1.hexdigest(str),
+            "rawString" => str
+          }
+        end
+
+        def get_session_with_jscode(js_code, grant_type='authorization_code')
+          post 'miniprogram/jscode2session', {}, params: {js_code: js_code, grant_type: grant_type}
+        end
+
+        def get_agent
+          get 'agent/get', params: {agentid: agent_id}
+        end
+
+        def set_agent data={}
+          post 'agent/set', data.merge(agentid: agent_id)
+        end
+      end
+    end
+  end
+end