yol_sso 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 598864578d8e9723f9c0e1ec90166d902354daa4c1170dd0765352e93d56a980
-  data.tar.gz: 62395714806da64948fc6ca03c44df5b3d720bffc9cca2fdfbd598d4bf222a20
+  metadata.gz: 6c00ab5470c95cea4324c2192ce597d64d7cb9fca9c5f0079c1f2af4c7343cff
+  data.tar.gz: 06f6cab80b32b46708aadc39fe36be196cfb76983890b0935fa470dd46367f3a
 SHA512:
-  metadata.gz: c509d8f4b312375bc9e33a80d3b3c1e09d5a40582dea081ed01637d9cdc1cd3dcbfe8d3f26f8871e442356690bb51dece50bf5e5430a916c157c550348ecdf58
-  data.tar.gz: 68ad61782b91acceb2caf1eb2fa0e8adbfc5c1d66880433d1824b1d2c2f76b4f8f9892ee890f2b63a396bdfb96927a361ce656a8b6c7350e43ded4ce172c361e
+  metadata.gz: 6c8a267e43b8777af1ecd405c55c6d109a080b505f97d109ebf276c28eea4c12aa2894f02aca7cebfbf2378f09d2a5f14d04dc7e553ff37cb99973efb8f8eb0e
+  data.tar.gz: 44eb1da4613ae4d808e10420ad0a97d48a1c70554b42134fd873b06dd75d9022b237aadccbd08ed55929cd72518569a1a60daf2af324b45d0da7c0b8807ed2ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yol_sso (0.0.6)
+    yol_sso (0.0.7)
       multi_xml
       nokogiri
       roxml

data/lib/yol_sso/client.rb

@@ -8,12 +8,13 @@ module YolSso
     include Connection::Message
     include Connection::User
     
-    attr_accessor :host, :agentid, :redis
+    attr_accessor :host, :agentid, :redis, :corpsecret
 
     def initialize(options = {})
       @host = options[:host] || YolSso.configuration.host
       @agentid = options[:agentid] || YolSso.configuration.agentid
       @redis  = options[:redis]  || YolSso.configuration.redis
+      @corpsecret  = options[:corpsecret]  || YolSso.configuration.corpsecret
     end
   end
 end

data/lib/yol_sso/connections/base.rb

@@ -18,20 +18,28 @@ module YolSso
         handle_res(res)
       end
 
+      def http_get(path, params)
+        uri = URI.join(host, path)
+        req = Net::HTTP.new(uri.host, uri.port)
+        header = {'token': get_access_token}
+        req.use_ssl = true if uri.scheme == 'https'
+        uri.query = URI.encode_www_form(params)
+        res = req.get("#{uri.path}?#{uri.query}", header)
+        handle_res(res)
+      end
+
       def get_access_token
         if redis.nil?
-          access_token_res = get_token(corpid, secret)
-          access_token = access_token_res["access_token"] rescue nil
+          access_token = get_token(corpsecret)
         else
-          access_token = redis.get("qywx_access_token")
+          access_token = redis.get("sso_access_token")
           if access_token.nil?
-            access_token_res = get_token(corpid, secret)
-            access_token = access_token_res["access_token"] rescue nil
+            access_token = get_token(corpsecret)
             if access_token.nil?
-              raise Exception.new("QyWeixin access token authorize false, corpid: #{corpid}")
+              raise Exception.new("Sso access token authorize false, corpsecret: #{corpsecret}")
             else
-              redis.set("qywx_access_token", access_token)
-              redis.expire("qywx_access_token", 7200)
+              redis.set("sso_access_token", access_token)
+              redis.expire("sso_access_token", 7200)
             end
           end
         end
@@ -40,12 +48,8 @@ module YolSso
 
       private
 
-      def get_token(app_id, app_secret)
-        http_get(token_url(app_id, app_secret))
-      end
-
-      def token_url(corpid, secret)
-        "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=#{corpid}&corpsecret=#{secret}"
+      def get_token(corpsecret)
+        JWT.encode({exp: (Time.now+7200).to_i}, corpsecret, 'HS256') rescue nil
       end
 
       def handle_res(res)

data/lib/yol_sso/connections/user.rb

@@ -5,6 +5,10 @@ module YolSso
         JSON.parse(redis.get("userinfo_#{userid}")) rescue nil
       end
 
+      def get_users(params)
+        http_get(users_path, params)
+      end
+
       def get_menus(userid)
         JSON.parse(redis.get("menus_#{agentid}_#{userid}")) rescue nil
       end
@@ -15,8 +19,8 @@ module YolSso
 
       private
 
-      def send_url
-        "#{host}messages"
+      def users_path
+        "open_api/users"
       end
     end
   end

data/lib/yol_sso/models/configuration.rb

@@ -1,7 +1,7 @@
 module YolSso
   class Configuration
 
-    OPTIONS = [:host, :agentid, :redis].freeze
+    OPTIONS = [:host, :agentid, :redis, :corpsecret].freeze
 
     attr_accessor :host
 
@@ -9,5 +9,7 @@ module YolSso
 
     attr_accessor :redis
 
+    attr_accessor :corpsecret
+
   end
 end

data/lib/yol_sso/version.rb

@@ -1,3 +1,3 @@
 module YolSso
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yol_sso
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - luojie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler