wework 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1665ffec3b44a0c13996c34dbe527cf8003f723
-  data.tar.gz: 86e3e8182349a38cb70e9dd5f10645ebce9dc2cd
+  metadata.gz: 2edfd8447ee2705141dc3e3b9f794ef762e0a52e
+  data.tar.gz: d24518f8cd4da0e921b3b4c0ad73894872569845
 SHA512:
-  metadata.gz: d2b5df0b9ee2fd1447a2c2e9c83101cbe29a49a49bdb18aa318bf375c41cad7d915beb8642fcecfc473e34a3d992b2e1e28d4a334905d21a9e824006e99119f7
-  data.tar.gz: e28aabdd329db56fd5132b5da3ebd7053f8e171ccb9a35ab03b35d5076e20c2584319a47570eb87834e588a4a0d47a6fb604c07ab84a01a86e04467efe9c5e29
+  metadata.gz: ce2c7829cbdedd5aab33764a7285820e169ed9ba299a4b7710f2a3199e2e76c48536a12a635ac4e31a73f22a39c5a52c37c2c55f9401665af839a41dea78b8cf
+  data.tar.gz: 29d325d1cd6aba6e2d9b2715f1b402e4e5c703a296db776d06f89327df17f57fc9c25844d8364a4f50e41f76ffe767eb51700e1e9c784a61a9f8859bc1892ca8

data/README.md

@@ -2,6 +2,23 @@
 
 Wework is a ruby API wrapper for work wechat.
 
+## Version 0.1.4
+* 异步任务接口 [doc](https://work.weixin.qq.com/api/doc#10138)
+
+## Version 0.1.3
+
+* `access_token` 和 `jsapi_ticket` 管理存储 (默认 redis, 支持其它扩展)
+* 通信录相关接口 [Wework::Api::Contact](https://github.com/mycolorway/wework/blob/master/lib/wework/api/contact.rb)
+* 企业微信应用接口 [Wework::Api::Agent](https://github.com/mycolorway/wework/blob/master/lib/wework/api/agent.rb)
+* API 集成 [Wework::Engine](https://github.com/mycolorway/wework/blob/master/lib/wework/engine.rb)
+* 网页授权及[JS-SDK签名算法](https://work.weixin.qq.com/api/doc#10029/附录1-JS-SDK使用权限签名算法)
+
+### TODO：
+
+* 完善测试用例
+* 消息接收 [doc](https://work.weixin.qq.com/api/doc#10427)
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/wework/api/agent.rb

@@ -44,14 +44,6 @@ module Wework
         get 'menu/delete', params: {agentid: agent_id}
       end
 
-      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
-      end
-
       def message_send user_ids, department_ids, payload={}
         payload[:agentid] = agent_id
         payload[:touser] = Array.wrap(user_ids).join('|') if user_ids.present?
@@ -87,9 +79,12 @@ module Wework
         message_send user_ids, department_ids, {news: {articles: news}, msgtype: 'news'}
       end
 
+      private
+
       def agent_id
         @app_id.to_i
       end
+
     end
   end
 end

data/lib/wework/api/base.rb

@@ -7,6 +7,7 @@ require 'wework/js_ticket/redis_store'
 module Wework
   module Api
     class Base
+      include Wework::Cipher
 
       attr_reader :corp_id, :app_id, :app_secret
       attr_accessor :options
@@ -21,14 +22,6 @@ module Wework
         @options      = options
       end
 
-      def token_store
-        @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
@@ -51,6 +44,17 @@ module Wework
         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
+      end
+
+      private
+
       def with_access_token(params = {}, tries = 2)
         params ||= {}
         yield(params.merge(access_token: access_token))
@@ -58,6 +62,14 @@ module Wework
         token_store.refresh_token
         retry unless (tries -= 1).zero?
       end
+
+      def token_store
+        @token_store ||= Token::RedisStore.new self
+      end
+
+      def jsticket_store
+        @jsticket_store ||= JsTicket::RedisStore.new self
+      end
     end
   end
 end

data/lib/wework/api/contact.rb

@@ -49,6 +49,33 @@ module Wework
       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
     end
   end
 end

data/lib/wework/cipher.rb

@@ -0,0 +1,71 @@
+require 'openssl/cipher'
+require 'base64'
+
+module Wework
+  module Cipher
+    extend ActiveSupport::Concern
+
+    BLOCK_SIZE = 32
+    CIPHER = 'AES-256-CBC'.freeze
+
+    def encrypt(plain, encoding_aes_key)
+      cipher = OpenSSL::Cipher.new(CIPHER)
+      cipher.encrypt
+
+      cipher.padding = 0
+      key_data = Base64.decode64(encoding_aes_key + '=')
+      cipher.key = key_data
+      cipher.iv = key_data[0..16]
+
+      cipher.update(plain) + cipher.final
+    end
+
+    def decrypt(msg, encoding_aes_key)
+      cipher = OpenSSL::Cipher.new(CIPHER)
+      cipher.decrypt
+
+      cipher.padding = 0
+      key_data = Base64.decode64(encoding_aes_key + '=')
+      cipher.key = key_data
+      cipher.iv = key_data[0..16]
+
+      plain = cipher.update(msg) + cipher.final
+      decode_padding(plain)
+    end
+
+    # app_id or corp_id
+    def pack(content, app_id)
+      random = SecureRandom.hex(8)
+      text = content.force_encoding('ASCII-8BIT')
+      msg_len = [text.length].pack('N')
+
+      encode_padding("#{random}#{msg_len}#{text}#{app_id}")
+    end
+
+    def unpack(msg)
+      msg = decode_padding(msg)
+      msg_len = msg[16, 4].reverse.unpack('V')[0]
+      content = msg[20, msg_len]
+      app_id = msg[(20 + msg_len)..-1]
+
+      [content, app_id]
+    end
+
+    private
+
+    def encode_padding(data)
+      length = data.bytes.length
+      amount_to_pad = BLOCK_SIZE - (length % BLOCK_SIZE)
+      amount_to_pad = BLOCK_SIZE if amount_to_pad == 0
+      padding = ([amount_to_pad].pack('c') * amount_to_pad)
+      data + padding
+    end
+
+    def decode_padding(plain)
+      pad = plain.bytes[-1]
+      # no padding
+      pad = 0 if pad < 1 || pad > BLOCK_SIZE
+      plain[0...(plain.length - pad)]
+    end
+  end
+end

data/lib/wework/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - seandong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -120,6 +120,7 @@ files:
 - lib/wework/api/agent.rb
 - lib/wework/api/base.rb
 - lib/wework/api/contact.rb
+- lib/wework/cipher.rb
 - lib/wework/config.rb
 - lib/wework/engine.rb
 - lib/wework/js_ticket/redis_store.rb