wework 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4a4454feadfb1cadf33e0431610e3a140ef18dec8b5671c690e95f4a5c19e42
-  data.tar.gz: a433e6117c9ce4b27962cfc455c62c26d0a972aa243446ccbdbf9fb31cc1da4b
+  metadata.gz: 9e3ed7c0371d7411dba8f0b23e88e220add94c7d30c4c3d2a5b56fd0e175460a
+  data.tar.gz: 389d38ad1070a6a15133aba8899029fd3dea09fabfe5aec29728d3ae09beac94
 SHA512:
-  metadata.gz: 754f7a608454a16aed92bb900d1be56ce8f660cc0bba8d7287209e0aa20676f67efe6071b377ae6e524d58047b44431f9bb084e01aa480932805196aa5edf7c4
-  data.tar.gz: 65f9f9525fd2796fe43a56a0eb447e5b1dbf5c4fab55fe692e5c2d2486feb75cf3a00ec99b41e12f5d4bcf974ad1ce84a890db2417855342afbafa3c3e5a4ede
+  metadata.gz: f118fe5ecd90f0bba3aea25b3f7c91a59e7d19253ee5935982d969ae9462407bea1d699a265da936d398880784f442952e8986e831c127317f2324ee99ef8863
+  data.tar.gz: eeb901426c8a76ad7114a4d0b0c1016bc5fc2b92a6dda6663782b0c4ab66efaff4ea253f69053e9ced266f52345cdf1a50660994dd31418fe755852d5efd4947

data/README.md

@@ -1,8 +1,8 @@
-# Wework
+# Wechat Work 「企业微信 API」
 
-Wework is a ruby API wrapper for work wechat.
+Wework is a ruby API wrapper for wechat work「企业微信」.
 
-[![CircleCI](https://circleci.com/gh/mycolorway/wework/tree/suite.svg?style=svg)](https://circleci.com/gh/mycolorway/wework/tree/suite)
+[![CircleCI](https://circleci.com/gh/mycolorway/wework/tree/suite.svg?style=svg)](https://circleci.com/gh/mycolorway/wework/tree/suite)   [![Gem Version](https://badge.fury.io/rb/wework.svg)](https://badge.fury.io/rb/wework)
 
 ## Installation
 
@@ -46,6 +46,33 @@ agent_api = $wework_suite.corp(
 )
 ```
 
+3). 第三方应用回调协议
+
+获取加密数据
+
+```ruby
+encrypt_str = if params[:xml].present?
+                params[:xml]['Encrypt']
+              else
+                Hash.from_xml(request.raw_post)['xml']['Encrypt']
+              end
+
+#首次校验接口 encrpt_str = params[:echostr]
+```
+
+消息签名
+
+```ruby
+$wework_suite.signature(timestamp, nonce, encrypt_str)
+```
+
+ 消息解密
+
+ ```ruby
+ $wework_suite.msg_decrypt(encrypt_data)
+ ```
+
+
 #### 自建应用
 
 初始化接口 [Wework::Api::Agent](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/agent.rb)
@@ -80,6 +107,21 @@ $provider_api = Wework::Api::Provider.new(
 )
 ```
 
+#### 小程序 encryptedData 解密
+
+```ruby
+require "openssl"
+CIPHER = 'AES-128-CBC'.freeze
+
+cipher = OpenSSL::Cipher.new(CIPHER)
+cipher.decrypt
+cipher.key = Base64.decode64(session_key)
+cipher.iv = Base64.decode64(iv)
+encrypted = Base64.decode64(encryptedData)
+data = cipher.update(encrypted) + cipher.final
+values = JSON.parse data
+```
+
 
 ## Methods
 
@@ -87,6 +129,8 @@ $provider_api = Wework::Api::Provider.new(
 
 [Wework::Api::Methods::User](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/user.rb)
 
+[Wework::Api::Methods::Tag](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/tag.rb)
+
 [Wework::Api::Methods::Department](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/department.rb)
 
 [Wework::Api::Methods::Message](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/message.rb)
@@ -99,9 +143,11 @@ $provider_api = Wework::Api::Provider.new(
 
 [Wework::Api::Methods::Checkin](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/checkin.rb)
 
+[Wework::Api::Methods::Batch](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/batch.rb)
+
 [Wework::Api::Methods::Provider](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/provider.rb)
 
-[Wework::Api::Methods::Suite](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/suite.rb)
+[Wework::Api::Methods::Service](https://github.com/mycolorway/wework/blob/suite/lib/wework/api/methods/service.rb)
 
 
 ## Contributing

data/lib/wework/api/base.rb

@@ -7,6 +7,9 @@ module Wework
       include Methods::Media
       include Methods::User
       include Methods::Department
+      include Methods::Tag
+      include Methods::Crm
+      include Methods::Batch
 
       attr_accessor :corp_id, :secret, :options
 

data/lib/wework/api/contact.rb

@@ -1,7 +1,6 @@
 module Wework
   module Api
     class Contact < Base
-      include Methods::Batch
     end
   end
 end

data/lib/wework/api/corp.rb

@@ -3,8 +3,6 @@ module Wework
     class Corp < Base
 
       include Wework::Cipher
-      include Methods::User
-      include Methods::Department
 
       attr_reader :suite, :permanent_code
 

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

@@ -18,6 +18,10 @@ module Wework
           get 'batch/getresult', params: {jobid: job_id}
         end
 
+        def batch_invite user=[], party=[], tag=[]
+          post 'batch/invite', {user: user, party: party, tag: tag}
+        end
+
         private
 
         def batch_params media_id, callback_url, token, encodingaeskey

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

@@ -0,0 +1,11 @@
+module Wework
+  module Api
+    module Methods
+      module Crm
+        def crm_get_external_contact external_userid
+          get 'crm/get_external_contact', params: {external_userid: external_userid}
+        end
+      end
+    end
+  end
+end

data/lib/wework/api/methods/{suite.rb → service.rb}

@@ -1,7 +1,7 @@
 module Wework
   module Api
     module Methods
-      module Suite
+      module Service
         def corp_authorize_url(redirect_uri, state="corp_authorize")
           "#{APP_AUTHORIZE_ENDPOINT}?suite_id=#{suite_id}&pre_auth_code=#{get_pre_auth_code}&redirect_uri=#{redirect_uri}&state=#{state}"
         end

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

@@ -0,0 +1,37 @@
+module Wework
+  module Api
+    module Methods
+      module Tag
+        def tag_create(tagname, tagid=nil)
+          data = {tagname: tagname}
+          data[:tagid] = tagid unless tagid.nil?
+          post 'tag/create', data
+        end
+
+        def tag_update(tagid, tagname)
+          post 'tag/update', {tagid: tagid, tagname: tagname}
+        end
+
+        def tag_delete tagid
+          get 'user/delete', params: {tagid: tagid}
+        end
+
+        def tag_get tagid
+          get 'user/get', params: {tagid: tagid}
+        end
+
+        def tag_addtagusers tagid, userlist=[], partylist=[]
+          post 'tag/addtagusers', {tagid: tagid, userlist: userlist, partylist: partylist}
+        end
+
+        def tag_deltagusers tagid, userlist=[], partylist=[]
+          post 'tag/deltagusers', {tagid: tagid, userlist: userlist, partylist: partylist}
+        end
+
+        def tag_list
+          get 'user/list'
+        end
+      end
+    end
+  end
+end

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

@@ -29,6 +29,18 @@ module Wework
         def user_list department_id, fetch_child=0
           get 'user/list', params: {department_id: department_id, fetch_child: fetch_child}
         end
+
+        def convert_to_openid userid
+          post 'user/convert_to_openid', {userid: userid}
+        end
+
+        def convert_to_userid openid
+          post 'user/convert_to_userid', {openid: openid}
+        end
+
+        def authsucc userid
+          get 'user/authsucc', params: {userid: userid}
+        end
       end
     end
   end

data/lib/wework/api/suite.rb

@@ -5,7 +5,7 @@ module Wework
     class Suite < Base
 
       include Wework::Cipher
-      include Methods::Suite
+      include Methods::Service
 
       attr_reader :encoding_aes_key, :suite_id, :suite_secret, :suite_token
 

data/lib/wework/version.rb

@@ -1,3 +1,3 @@
 module Wework
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.5'.freeze
 end

data/wework.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["seandong"]
   spec.email         = ["sindon@gmail.com"]
 
-  spec.summary       = spec.description = %q{Ruby API wrapper for work wechat.}
+  spec.summary       = spec.description = %q{Ruby API wrapper for wechat work「企业微信」}
   spec.homepage      = "https://github.com/mycolorway/wework"
   spec.license       = "MIT"
 
@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'http', '>= 2.2'
   spec.add_dependency 'activesupport', '~> 5.0'
   spec.add_dependency 'redis', '~>3.3'
-  spec.add_dependency 'builder', '~> 3.2.2'
-  spec.add_dependency 'sinatra', '~>2.0.0'
+  spec.add_dependency 'builder', '~> 3.2'
+  spec.add_dependency 'sinatra', '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.10"
-  spec.add_development_dependency 'webmock', '~> 3.4.1'
-  spec.add_development_dependency 'mock_redis', '~>0.18.0'
+  spec.add_development_dependency 'webmock', '~> 3.4'
+  spec.add_development_dependency 'mock_redis', '~>0.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - seandong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-21 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,29 +128,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
-description: Ruby API wrapper for work wechat.
+        version: '0.18'
+description: Ruby API wrapper for wechat work「企业微信」
 email:
 - sindon@gmail.com
 executables: []
@@ -175,12 +175,14 @@ files:
 - lib/wework/api/methods/approval.rb
 - lib/wework/api/methods/batch.rb
 - lib/wework/api/methods/checkin.rb
+- lib/wework/api/methods/crm.rb
 - lib/wework/api/methods/department.rb
 - lib/wework/api/methods/media.rb
 - lib/wework/api/methods/menu.rb
 - lib/wework/api/methods/message.rb
 - lib/wework/api/methods/provider.rb
-- lib/wework/api/methods/suite.rb
+- lib/wework/api/methods/service.rb
+- lib/wework/api/methods/tag.rb
 - lib/wework/api/methods/user.rb
 - lib/wework/api/provider.rb
 - lib/wework/api/suite.rb
@@ -250,5 +252,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Ruby API wrapper for work wechat.
+summary: Ruby API wrapper for wechat work「企业微信」
 test_files: []