wework 1.2.5 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adce838cfedd4fc0628785f3dd0fde51dc36fb69a4300548781ecbd2430d7138
-  data.tar.gz: 6324188d880595fd28d72b89ee8475226d92ab749959f36bb37648922d89c0cd
+  metadata.gz: 2370a71d7a4ebb3f04257eee4d1573748cfcc5e15ade5931a973d8abcfbe790b
+  data.tar.gz: 9340553291b76e20b4f8db91caeadd7455cd11489a78e45f210d2e5a60e02e02
 SHA512:
-  metadata.gz: dda7d4b6c87833bc5b23d5be3376e2c24dec32515fe848bfc8e8d7e429fe0c9f87197c748dfd54bad073f3d027f07be6c2db09e011209db84bc8f874e319ea0d
-  data.tar.gz: d4eafae82010a37c403a282091ad684d503b3550151484530842ea60a68c9839358ffc66a5da7faa8a5395b2bab678e8e2b722fe6ee85747c3c099ddfba0c201
+  metadata.gz: 2100dbeb253d7fd17723c440d016f24510ef8215145099bbbf9c80b46411f52089b2cdbf8bf36c458dc21e1266d753945def2c83bbc052773f5dbee78048ee15
+  data.tar.gz: 4f7ce15118f59d0843e97e9fbd2adfec40b638fe02dc6e46ea2e00b36d9c97179f78f8b2681e30dc67e400b3e0cf03d5f0179e22d4cc9d02f7373c689134091c

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

@@ -8,6 +8,7 @@ module Wework
       include Methods::Menu
       include Methods::Checkin
       include Methods::Approval
+      include Wework::Cipher
 
       attr_reader :agent_id
 

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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wework
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.8
 platform: ruby
 authors:
 - seandong
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby API wrapper for wechat work「企业微信」