wework 1.2.0 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da9ef45528f36cf4ae7d00f2f1003cd28434521f92746649041d6e405b40a5d
-  data.tar.gz: a792e4129d778a66d232da0439d937f4128a4fa9e0d194815af9fe330818990e
+  metadata.gz: 2370a71d7a4ebb3f04257eee4d1573748cfcc5e15ade5931a973d8abcfbe790b
+  data.tar.gz: 9340553291b76e20b4f8db91caeadd7455cd11489a78e45f210d2e5a60e02e02
 SHA512:
-  metadata.gz: 2b50dd7799cafca89d649d96402964cdbd79e86e116d89acb62dbba74dc196e050a206713c13eecd8820e6addd630a3b3acace6661041758f464e3617cd2d9b4
-  data.tar.gz: 3124fa217b49d14b1bf3846ed105b96d019496f162996a1d3e29a6a7bdcdc3ec39117af0f707adf115e37925f47cb8d5c1ebb249cf846cba92dca0d5b3dfe8d0
+  metadata.gz: 2100dbeb253d7fd17723c440d016f24510ef8215145099bbbf9c80b46411f52089b2cdbf8bf36c458dc21e1266d753945def2c83bbc052773f5dbee78048ee15
+  data.tar.gz: 4f7ce15118f59d0843e97e9fbd2adfec40b638fe02dc6e46ea2e00b36d9c97179f78f8b2681e30dc67e400b3e0cf03d5f0179e22d4cc9d02f7373c689134091c

data/README.md

@@ -152,6 +152,8 @@ values = JSON.parse data
 
 [Wework::Api::Methods::Message](https://github.com/mycolorway/wework/blob/master/lib/wework/api/methods/message.rb)
 
+[Wework::Api::Methods::Appchat](https://github.com/mycolorway/wework/blob/master/lib/wework/api/methods/appchat.rb)
+
 [Wework::Api::Methods::Media](https://github.com/mycolorway/wework/blob/master/lib/wework/api/methods/media.rb)
 
 [Wework::Api::Methods::Menu](https://github.com/mycolorway/wework/blob/master/lib/wework/api/methods/menu.rb)

data/lib/wework.rb

@@ -2,8 +2,8 @@ require 'redis'
 require 'active_support/all'
 #require 'active_support/core_ext/object/blank'
 
-LIB_PATH = "#{File.dirname(__FILE__)}/wework"
-Dir["#{LIB_PATH}/api/methods/*.rb",  "#{LIB_PATH}/token/*.rb"].each { |path| require path }
+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'
@@ -20,6 +20,7 @@ module Wework
   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
+  AGENT_SSO_AUTHORIZE_ENDPOINT = 'https://open.work.weixin.qq.com/wwopen/sso/qrConnect'.freeze
   APP_AUTHORIZE_ENDPOINT  = 'https://open.work.weixin.qq.com/3rdapp/install'.freeze
   REGISTER_ENDPOINT       = 'https://open.work.weixin.qq.com/3rdservice/wework/register'.freeze
   HTTP_OK_STATUS          = [200, 201].freeze

data/lib/wework/api/agent.rb

@@ -4,9 +4,11 @@ module Wework
 
       include Methods::Agent
       include Methods::Message
+      include Methods::Appchat
       include Methods::Menu
       include Methods::Checkin
       include Methods::Approval
+      include Wework::Cipher
 
       attr_reader :agent_id
 
@@ -27,4 +29,4 @@ module Wework
       end
     end
   end
-end
+end

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

@@ -4,6 +4,11 @@ module Wework
   module Api
     module Methods
       module Agent
+        def sso_authorize_url(redirect_uri, state='qrconnect')
+          uri = ERB::Util.url_encode(redirect_uri)
+          "#{AGENT_SSO_AUTHORIZE_ENDPOINT}?appid=#{corp_id}&agentid=#{agent_id}&redirect_uri=#{uri}&state=#{state}"
+        end
+
         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)

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

@@ -0,0 +1,62 @@
+require "erb"
+
+module Wework
+  module Api
+    module Methods
+      module Appchat
+
+        def appchat_create group_name, owner_id, group_user_ids, chat_id
+          post 'appchat/create',
+            name: group_name,
+            owner: owner_id,
+            userlist: group_user_ids,
+            chatid: chat_id
+        end
+
+        def appchat_update chat_id, payload={}
+          payload.merge! chatid: chat_id
+          post 'appchat/update', payload
+        end
+
+        def appchat_get chat_id
+          get 'appchat/get', { params: { chatid: chat_id } }
+        end
+
+        def text_appchat_send chat_id, content
+          appchat_send chat_id, {text: {content: content}, msgtype: 'text'}
+        end
+
+        def image_appchat_send chat_id, media_id
+          appchat_send chat_id, {image: {media_id: media_id}, msgtype: 'image'}
+        end
+
+        def voice_appchat_send chat_id, media_id
+          appchat_send chat_id, {voice: {media_id: media_id}, msgtype: 'voice'}
+        end
+
+        def file_appchat_send chat_id, media_id
+          appchat_send chat_id, {file: {media_id: media_id}, msgtype: 'file'}
+        end
+
+        def video_appchat_send chat_id, video={}
+          appchat_send chat_id, {video: video, msgtype: 'video'}
+        end
+
+        def textcard_appchat_send chat_id, textcard={}
+          appchat_send chat_id, {textcard: textcard, msgtype: 'textcard'}
+        end
+
+        def news_appchat_send chat_id, news=[]
+          appchat_send chat_id, {news: {articles: news}, msgtype: 'news'}
+        end
+
+        private
+
+        def appchat_send chat_id, payload={}
+          payload.merge!(chatid: chat_id)
+          post 'appchat/send', payload
+        end
+      end
+    end
+  end
+end

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

@@ -5,8 +5,7 @@ module Wework
     module Methods
       module Message
         def miniprogram_message_send user_id, miniprogram_notice={}
-          notice = miniprogram_notice.merge(appid: agent_id)
-          post 'message/send', { touser: user_id, msgtype: 'miniprogram_notice', miniprogram_notice: notice }
+          post 'message/send', { touser: user_id, msgtype: 'miniprogram_notice', miniprogram_notice: miniprogram_notice }
         end
 
         def text_message_send user_ids, department_ids, content

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

@@ -10,6 +10,10 @@ module Wework
           get 'user/get', params: {userid: userid}
         end
 
+        def user_getuserid mobile
+          post 'user/getuserid', {mobile: mobile}
+        end
+
         def user_update userid, data={}
           post 'user/update', data.merge(userid: userid)
         end

data/lib/wework/api/provider.rb

@@ -4,14 +4,6 @@ module Wework
       include Methods::Provider
       include Wework::Cipher
 
-      attr_reader :encoding_aes_key, :token
-
-      def initialize(options={})
-        @token = options.delete(:token)
-        @encoding_aes_key = options.delete(:encoding_aes_key)
-        super(options)
-      end
-
       private
 
       def token_store

data/lib/wework/api/suite.rb

@@ -7,13 +7,12 @@ module Wework
       include Wework::Cipher
       include Methods::Service
 
-      attr_reader :encoding_aes_key, :suite_id, :suite_secret, :suite_token, :token
+      attr_reader :suite_id, :suite_secret, :suite_token
 
       def initialize(options={})
         @suite_id = options.delete(:suite_id)
         @suite_secret = options.delete(:suite_secret)
         @token = @suite_token = options.delete(:suite_token)
-        @encoding_aes_key = options.delete(:encoding_aes_key)
         super(options)
       end
 

data/lib/wework/cipher.rb

@@ -11,6 +11,14 @@ module Wework
     BLOCK_SIZE = 32
     CIPHER = 'AES-256-CBC'.freeze
 
+    def token
+      @token ||= options[:token]
+    end
+
+    def encoding_aes_key
+      @encoding_aes_key ||= options[:encoding_aes_key]
+    end
+
     def encrypt(plain, encoding_aes_key)
       cipher = OpenSSL::Cipher.new(CIPHER)
       cipher.encrypt

data/lib/wework/request.rb

@@ -76,7 +76,7 @@ module Wework
         data = file
 
       when :json
-        data = JSON.parse response.body.to_s.gsub(/[\u0000-\u001f]+/, '')
+        data = JSON.parse response.body.to_s
       else
         data = response.body
       end

data/lib/wework/version.rb

@@ -1,3 +1,3 @@
 module Wework
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.8'.freeze
 end

data/wework.gemspec

@@ -22,9 +22,9 @@ 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'
-  spec.add_dependency 'sinatra', '~> 2.0'
+  spec.add_dependency 'redis'
+  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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.8
 platform: ruby
 authors:
 - seandong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -42,42 +42,42 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -172,6 +172,7 @@ files:
 - lib/wework/api/contact.rb
 - lib/wework/api/corp.rb
 - lib/wework/api/methods/agent.rb
+- lib/wework/api/methods/appchat.rb
 - lib/wework/api/methods/approval.rb
 - lib/wework/api/methods/batch.rb
 - lib/wework/api/methods/checkin.rb
@@ -248,8 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby API wrapper for wechat work「企业微信」