wework 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5374370b839d61bc5d60a159fe4b72d11dec40fea3a605f35894ab66e9515f5c
-  data.tar.gz: 05624fed768fefe0fa1e858769b4f8e94d16d2524603b7041b28b01a565bcb2e
+  metadata.gz: 57af16b2481bed88541d3f155b87adf4dd26a8b28999bce6c5b20a3c2d2fcc23
+  data.tar.gz: 39176c04e1e0daf24538dd046d81b0b66e7b9da8d09c374cda4023122dbcb465
 SHA512:
-  metadata.gz: 998c2d6ce9420260dfa0afcb1331dc75092471b82aad189cbc5e509d4ca68e0d383fb9a82634ba8130591d3a7814d15517b837b26a1cd28c7da7013aa5f6c49b
-  data.tar.gz: 6c4058794c2c8026e1f6edd547cf44ddd2c29a2adef201589aeaf603b2200f371945bea5ba1d0e71aec6e8f3a5351057c0afda71a87292e9fb1dbf850e5047fa
+  metadata.gz: e2d714537b289270b8195517e14de67ba332f501c2082764de8f5e59f9663bbd26b87d737199116f827632d93b7bcd2f6c2cbd2b9bf77ce44d1b55bc1013acb1
+  data.tar.gz: 5d2ad8d2925e1b679b07823c90e056f43ef3c191b8417970af1b15880281ec58ad5973befc8d30d0ecaa4eddc0ee0a4db106feeeeef0a407109d25fe126c24a3

data/README.md

@@ -108,17 +108,22 @@ $contact_api = Wework::Api::Contact.new(
 )
 ```
 
-### 应用服务商接口 (单点登录)
+### 应用服务商接口
 
 初始化
 
 ``` ruby
 $provider_api = Wework::Api::Provider.new(
-  corp_id: ENV['WEWORK_PROVIDER_CORPID'],                   # 应用服务商 CorpID
-  secret: ENV['WEWORK_PROVIDER_SECRET']                     # Secret
+  corp_id: ENV['WEWORK_PROVIDER_CORPID'],                     # 应用服务商 CorpID
+  secret: ENV['WEWORK_PROVIDER_SECRET'],                      # Secret
+  token: ENV['WEWORK_PROVIDER_TOKEN'],
+  encoding_aes_key: ENV['WEWORK_PROVIDER_ENCODING_AES_KEY']
 )
 ```
 
+回调接口消息加解密参考「第三方应用回调协议」
+
+
 ### 小程序 encryptedData 解密
 
 ```ruby

data/lib/wework/api/provider.rb

@@ -2,6 +2,15 @@ module Wework
   module Api
     class Provider < Base
       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
 

data/lib/wework/api/suite.rb

@@ -7,40 +7,16 @@ module Wework
       include Wework::Cipher
       include Methods::Service
 
-      attr_reader :encoding_aes_key, :suite_id, :suite_secret, :suite_token
+      attr_reader :encoding_aes_key, :suite_id, :suite_secret, :suite_token, :token
 
       def initialize(options={})
         @suite_id = options.delete(:suite_id)
         @suite_secret = options.delete(:suite_secret)
-        @suite_token = options.delete(:suite_token)
+        @token = @suite_token = options.delete(:suite_token)
         @encoding_aes_key = options.delete(:encoding_aes_key)
         super(options)
       end
 
-      def msg_decrypt message
-        unpack(decrypt(Base64.decode64(message), encoding_aes_key))[0]
-      end
-
-      def msg_encrypt message
-        Base64.strict_encode64(encrypt(pack(message, corp_id), encoding_aes_key))
-      end
-
-      def signature(timestamp, nonce, encrypt)
-        array = [suite_token, timestamp, nonce]
-        array << encrypt unless encrypt.nil?
-        Digest::SHA1.hexdigest array.compact.collect(&:to_s).sort.join
-      end
-
-      def generate_xml(msg, timestamp, nonce)
-        encrypt = msg_encrypt(msg)
-        {
-          Encrypt: encrypt,
-          MsgSignature: signature(timestamp, nonce, encrypt),
-          TimeStamp: timestamp,
-          Nonce: nonce
-        }.to_xml(root: 'xml', children: 'item', skip_instruct: true, skip_types: true)
-      end
-
       def suite_ticket= ticket
         Wework.redis.set ticket_key, ticket
       end

data/lib/wework/cipher.rb

@@ -54,6 +54,30 @@ module Wework
       [content, app_id]
     end
 
+    def msg_decrypt message
+      unpack(decrypt(Base64.decode64(message), encoding_aes_key))[0]
+    end
+
+    def msg_encrypt message
+      Base64.strict_encode64(encrypt(pack(message, corp_id), encoding_aes_key))
+    end
+
+    def signature(timestamp, nonce, encrypt)
+      array = [token, timestamp, nonce]
+      array << encrypt unless encrypt.nil?
+      Digest::SHA1.hexdigest array.compact.collect(&:to_s).sort.join
+    end
+
+    def generate_xml(msg, timestamp, nonce)
+      encrypt = msg_encrypt(msg)
+      {
+        Encrypt: encrypt,
+        MsgSignature: signature(timestamp, nonce, encrypt),
+        TimeStamp: timestamp,
+        Nonce: nonce
+      }.to_xml(root: 'xml', children: 'item', skip_instruct: true, skip_types: true)
+    end
+
     private
 
     def encode_padding(data)

data/lib/wework/version.rb

@@ -1,3 +1,3 @@
 module Wework
-  VERSION = '1.1.7'.freeze
+  VERSION = '1.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - seandong