dc_tunnel 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73c6efee8fa1e3825471d39b0a0f24c29055ae7f2605a98e6eb63921e94ca8bd
-  data.tar.gz: 27b329ac15d2f7f1b2800f67e699e6a8b99774d0a591e528751c4da0575fb739
+  metadata.gz: befe1055816644ed0dafc39a71fafc444e4bd1bc364f131cd3931e26ec111060
+  data.tar.gz: 3e205a66126584c486e7fe84b968178e0725394768a46452c2d3617187b8e177
 SHA512:
-  metadata.gz: 42fa2f5c3197c38800aa1b97e3d17e0eade4ba3cbd104dd0a78a61f3f32be23136586190fd7c6e4f831ce7585b2e0c7c364866142a3916cc35c6b4d8900bb70f
-  data.tar.gz: 089aa1c928184eca34759faf1512130fc92dc6bdf2cdc6d6003d62ec5ce93323e8dda901f3f1f6569c1cf857c5be33540404fcfabc2b0bb9ed5ee63b19bfe7ce
+  metadata.gz: f2c2953eb4da4e04bba6bc298e1cfcce34586cf73fe37f69ba39048652cff1a007dfb92582345fd5da9fbb11d3911a706d1e24009e9a99f33b9115e9ed29dfc4
+  data.tar.gz: d248e54c3fe8eeedf2fc224cdda17336cdc028f6e9d2ac2c1384c56935e708b9b5ab7d0684d2d6e9c464f93cb564a464ee2255f5322237d810d7e2098b4b3293

data/lib/dc_tunnel.rb

@@ -1,5 +1,6 @@
 class DcTunnel
   require 'net/http'
+  require 'advanced_hash_keys'
 
   def initialize(settings)
     @settings = settings
@@ -10,30 +11,32 @@ class DcTunnel
   end
 
   def http_get(url)
-    puts "Tunnel : start get #{url} "
+    puts '0.6'
+    puts "--- Tunnel : start get #{url} "
     res = Net::HTTP.get(URI(url))
-    puts "Tunnel : got  response #{res} "
-    res = JSON.parse(res).symbolize_keys!
-    puts "Tunnel : got symbolize_keys! response #{res} "
+    res = JSON.parse(res)
+    puts "--- Tunnel : got parsed response #{res} "
+    res = res.symbolize_keys(true)
+    puts "--- Tunnel : got symbolize_keys! response #{res} "
     res
   end
 
   def http_post(url, postdata)
-    puts "Tunnel : start get #{url} "
+    puts "--- Tunnel : start get #{url} "
     res = Net::HTTP.post_form(URI(url), postdata).body
-    res = JSON.parse(res).symbolize_keys!
-    puts "Tunnel : got response #{res} "
+    res = JSON.parse(res).symbolize_keys(true)
+    puts "--- Tunnel : got response #{res} "
     res
   end
 
   def sso_path(path, params = {})
     settings = self.get_settings
-    puts "Tunnel : sso_path set to #{settings[:sso_host]} "
+    puts "--- Tunnel : sso_path set to #{settings[:sso_host]} "
     auth = {
         system_id: settings[:system_id],
         system_token: settings[:system_token]
     }
-    puts "Auth : #{auth}"
+    puts "--- Auth : #{auth}"
     "#{settings[:sso_host]}#{path}.json?#{params.to_param}&#{auth.to_param}"
   end
 
@@ -55,15 +58,19 @@ class DcTunnel
     self.http_get self.sso_path("/users", params)
   end
 
-  def synchronize
+  def synchronize_users
     res = self.http_get self.sso_path('/users', {:system_ids => [self.get_settings[:system_id]]})
+    allowed_ids = []
     res[:users].each do |sso_user|
       puts "sso_user is #{sso_user}"
       puts "sso_user_id is #{sso_user[:id]}"
       user = User.find_by_sso_id sso_user[:id]
       puts "user is #{user}"
+      allowed_ids.push sso_user[:id]
       if user.nil?
-        create_attributes = {}
+        create_attributes = {
+            sso_id: sso_user[:id]
+        }
         get_settings[:default_user_props].each do |item|
           name = item[0]
           value = item[1]
@@ -74,11 +81,16 @@ class DcTunnel
       else
         update_attributes = {
             name: sso_user[:name],
-            phone: sso_user[:phone]
+            phone: sso_user[:phone],
+            sso_id: sso_user[:id]
         }
         puts "update_attributes is #{update_attributes}"
         user.update(update_attributes)
       end
     end
+    # 子系统内同步删除
+    puts "allowed sso ids is #{allowed_ids}"
+    User.where.not(:sso_id => allowed_ids).destroy_all
+    User.where(:sso_id => nil).destroy_all
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dc_tunnel
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Qxchen
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2019-07-07 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: advanced_hash_keys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 信诺系统通信工具
 email: 370306609@qq.com
 executables: []