authing_ruby 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96f70bbb6209a350729fc7acb3c8f8aa44c65065059dc1d9314e4c1889cf9fe
-  data.tar.gz: ab3be4af6af5885d93978830d633bdcc8cce304405d2faa625a8deed9e9bfdf5
+  metadata.gz: 53d6cdb77ad3c55b067f67fe25749cce6ccfec7ce806dff9cc8e645ee21d3cbf
+  data.tar.gz: f950ec08cd5ea8d36b516fac6118c5fee65bf22095baca57bee388615322df3b
 SHA512:
-  metadata.gz: edce71334d03757b966483dd0789fe18c4b1b7d0718c3459cec99247a4b99394a6c559eda07850b43f0134666640a737e1e32564878960168c53fc9ddd488df8
-  data.tar.gz: ad7033895474b78be0c9e79bea67f547173d90f9b05417fecacf8272cf85d36d5ff6c0cc10171593b7e784fcff4344a0096ecbca3be00cae992ea2b6734c2fc2
+  metadata.gz: 3d4697fff2570f3e8d43129a35f0e0769404b223e17dbd6e403cb29aafe35227b3001ef703f6c486001b4e44457f41bf2e8bd566f6f0c88e423b52d8b5e22df2
+  data.tar.gz: 314074e61c1d6dfb8ff22ba441f98353aca88ad6c9d34286731569488c7a9b1a99069dc6f55563ed8847e4528a75fa9a7ebaf8e08462b573a907edb5b677bcf9

data/lib/authing_ruby/management/UsersManagementClient.rb

@@ -29,8 +29,10 @@ module AuthingRuby
         "userInfo": userInfo,
         "keepPassword": keepPassword,
       }
-      res = graphqlAPI.createUser(@graphqlClient, @tokenProvider, variables)
-      return res
+      hash = graphqlAPI.createUser(@graphqlClient, @tokenProvider, variables)
+      user = hash.dig("data", "createUser")
+      return user if user
+      return hash
     end
 
     # 修改用户资料
@@ -49,8 +51,10 @@ module AuthingRuby
         "id": id,
         "input": updates
       }
-      res = graphqlAPI.updateUser(@graphqlClient, @tokenProvider, variables)
-      return res
+      hash = graphqlAPI.updateUser(@graphqlClient, @tokenProvider, variables)
+      user = hash.dig("data", "updateUser")
+      return user if user
+      return hash
     end
 
     # 通过 ID 获取用户信息
@@ -59,8 +63,10 @@ module AuthingRuby
       variables = {
         "id": user_id,
       }
-      res = graphqlAPI.user(@graphqlClient, @tokenProvider, variables)
-      return res
+      hash = graphqlAPI.user(@graphqlClient, @tokenProvider, variables)
+      user = hash.dig("data", "user")
+      return user if user
+      return hash
     end
 
     # 删除用户
@@ -69,9 +75,11 @@ module AuthingRuby
         "id": user_id,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.deleteUser(@graphqlClient, @tokenProvider, variables)
-      return res
+      hash = graphqlAPI.deleteUser(@graphqlClient, @tokenProvider, variables)
       # {"data":{"deleteUser":{"message":"删除成功！","code":200}}}
+      data = hash.dig("data", "deleteUser")
+      return data if data
+      return hash
     end
 
     # 批量删除用户
@@ -80,9 +88,11 @@ module AuthingRuby
         "ids": user_ids,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.deleteUsers(@graphqlClient, @tokenProvider, variables)
-      return res
+      hash = graphqlAPI.deleteUsers(@graphqlClient, @tokenProvider, variables)
       # {"data":{"deleteUsers":{"message":"删除成功！","code":200}}}
+      data = hash.dig("data", "deleteUsers")
+      return data if data
+      return hash
     end
 
     # 获取用户列表
@@ -92,8 +102,10 @@ module AuthingRuby
         "limit": limit,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.users(@graphqlClient, @tokenProvider, variables)
-      return res
+      hash = graphqlAPI.users(@graphqlClient, @tokenProvider, variables)
+      data = hash.dig("data", "users")
+      return data if data
+      return hash
     end
 
     # TODO
@@ -117,7 +129,9 @@ module AuthingRuby
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
       hash = graphqlAPI.isUserExists(@graphqlClient, @tokenProvider, variables)
-      return hash.dig('data', "isUserExists")
+      data = hash.dig("data", "isUserExists")
+      return data if data
+      return hash
     end
 
     # 查找用户
@@ -138,6 +152,8 @@ module AuthingRuby
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
       hash = graphqlAPI.findUser(@graphqlClient, @tokenProvider, variables)
+      data = hash.dig("data", "findUser")
+      return data if data
       return hash
     end
 

data/lib/authing_ruby/test/mini_test/TestManagementClient.rb

@@ -1,4 +1,4 @@
-# ruby ./lib/test/mini_test/TestManagementClient.rb
+# ruby ./lib/authing_ruby/test/mini_test/TestManagementClient.rb
 
 require "minitest/autorun"
 require "./lib/authing_ruby.rb"
@@ -28,16 +28,15 @@ class TestManagementClient < Minitest::Test
       phone: random_phone,
       password: '123456789',
     }
-    puts userInfo
     hash = managementClient.users.create(userInfo)
     
     # 成功
-    # {"data":{"createUser":{"id":"608ab9828eab7e35e81bd732","arn":"arn:cn:authing:60800b8ee5b66b23128b4980:user:608ab9828eab7e35e81bd732","userPoolId":"60800b8ee5b66b23128b4980","status":"Activated","username":"SpongeBob2","email":null,"emailVerified":false,"phone":null,"phoneVerified":false,"unionid":null,"openid":null,"nickname":null,"registerSource":["import:manual"],"photo":"default-user-avatar.png","password":"91b133c2e13e40852505946b7e0c2f04","oauth":null,"token":null,"tokenExpiredAt":null,"loginsCount":0,"lastLogin":null,"lastIP":null,"signedUp":null,"blocked":false,"isDeleted":false,"device":null,"browser":null,"company":null,"name":null,"givenName":null,"familyName":null,"middleName":null,"profile":null,"preferredUsername":null,"website":null,"gender":"U","birthdate":null,"zoneinfo":null,"locale":null,"address":null,"formatted":null,"streetAddress":null,"locality":null,"region":null,"postalCode":null,"city":null,"province":null,"country":null,"createdAt":"2021-04-29T13:49:54+00:00","updatedAt":"2021-04-29T13:49:54+00:00","externalId":null}}}
+    # {"id":"608ab9828eab7e35e81bd732","arn":"arn:cn:authing:60800b8ee5b66b23128b4980:user:608ab9828eab7e35e81bd732","userPoolId":"60800b8ee5b66b23128b4980","status":"Activated","username":"SpongeBob2","email":null,"emailVerified":false,"phone":null,"phoneVerified":false,"unionid":null,"openid":null,"nickname":null,"registerSource":["import:manual"],"photo":"default-user-avatar.png","password":"91b133c2e13e40852505946b7e0c2f04","oauth":null,"token":null,"tokenExpiredAt":null,"loginsCount":0,"lastLogin":null,"lastIP":null,"signedUp":null,"blocked":false,"isDeleted":false,"device":null,"browser":null,"company":null,"name":null,"givenName":null,"familyName":null,"middleName":null,"profile":null,"preferredUsername":null,"website":null,"gender":"U","birthdate":null,"zoneinfo":null,"locale":null,"address":null,"formatted":null,"streetAddress":null,"locality":null,"region":null,"postalCode":null,"city":null,"province":null,"country":null,"createdAt":"2021-04-29T13:49:54+00:00","updatedAt":"2021-04-29T13:49:54+00:00","externalId":null}
     
     # 失败
     # {"errors":[{"message":{"code":2026,"message":"用户已存在，请勿重复创建！"},"locations":[{"line":2,"column":3}],"path":["createUser"],"extensions":{"code":"INTERNAL_SERVER_ERROR"}}],"data":null}
 
-    assert(hash.dig("data", "createUser") != nil, hash)
+    assert(hash.dig("id") != nil, hash)
   end
 
   # 创建用户
@@ -52,7 +51,7 @@ class TestManagementClient < Minitest::Test
       signedUp: '2020-10-15T17:55:37+08:00' # 原有用户系统记录的用户注册时间
     }
     hash = managementClient.users.create(userInfo)
-    assert(hash.dig("data", "createUser") != nil, hash)
+    assert(hash.dig("id") != nil, hash)
   end
 
   # 创建一个用户, 并返回这个用户
@@ -67,8 +66,7 @@ class TestManagementClient < Minitest::Test
     end
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
-    hash = managementClient.users.create(userInfo)
-    user = hash.dig("data", "createUser")
+    user = managementClient.users.create(userInfo)
     return user
   end
 
@@ -84,11 +82,14 @@ class TestManagementClient < Minitest::Test
     hash = managementClient.users.update(user_id, {
       nickname: 'Nick',
     })
-    # puts res2
+    # puts hash
+    # 成功
+    # {"id"=>"60b902e844428416be3a25b8", "arn"=>"arn:cn:authing:60800b8ee5b66b23128b4980:user:60b902e844428416be3a25b8", "userPoolId"=>"60800b8ee5b66b23128b4980", "status"=>"Activated", "username"=>nil, "email"=>nil, "emailVerified"=>false, "phone"=>"17600009338", "phoneVerified"=>false, "unionid"=>nil, "openid"=>nil, "nickname"=>"Nick", "registerSource"=>["import:manual"], "photo"=>"https://files.authing.co/authing-console/default-user-avatar.png", "password"=>nil, "oauth"=>nil, "token"=>nil, "tokenExpiredAt"=>nil, "loginsCount"=>0, "lastLogin"=>nil, "lastIP"=>nil, "signedUp"=>"2021-06-03T16:27:20+00:00", "blocked"=>false, "isDeleted"=>false, "device"=>nil, "browser"=>nil, "company"=>nil, "name"=>nil, "givenName"=>nil, "familyName"=>nil, "middleName"=>nil, "profile"=>nil, "preferredUsername"=>nil, "website"=>nil, "gender"=>"U", "birthdate"=>nil, "zoneinfo"=>nil, "locale"=>nil, "address"=>nil, "formatted"=>nil, "streetAddress"=>nil, "locality"=>nil, "region"=>nil, "postalCode"=>nil, "city"=>nil, "province"=>nil, "country"=>nil, "createdAt"=>"2021-06-03T16:27:20+00:00", "updatedAt"=>"2021-06-03T16:27:22+00:00", "externalId"=>nil}
+
     # 如果失败
     # {"errors":[{"message":{"code":2004,"message":"用户不存在"},"locations":[{"line":2,"column":3}],"path":["updateUser"],"extensions":{"code":"INTERNAL_SERVER_ERROR"}}],"data":null}
 
-    assert(hash.dig("data", "updateUser") != nil, hash)
+    assert(hash.dig("id") != nil, hash)
   end
 
   # 测试通过 ID 获取用户信息
@@ -99,7 +100,7 @@ class TestManagementClient < Minitest::Test
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
     hash = managementClient.users.detail(user_id)
-    assert(hash.dig("data", "user") != nil, hash)
+    assert(hash.dig("id") != nil, hash)
   end
   
   # 测试删除用户
@@ -110,8 +111,8 @@ class TestManagementClient < Minitest::Test
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
     hash = managementClient.users.delete(user_id)
-    # {"data":{"deleteUser":{"message":"删除成功！","code":200}}}
-    assert(hash.dig("data", "deleteUser") != nil, hash)
+    # {"message":"删除成功！","code":200}
+    assert(hash.dig("code") == 200, hash)
   end
 
   # 测试删除多个用户
@@ -127,16 +128,16 @@ class TestManagementClient < Minitest::Test
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
     hash = managementClient.users.deleteMany(user_ids)
-    # {"data":{"deleteUsers":{"message":"删除成功！","code":200}}}
-    assert(hash.dig("data", "deleteUsers") != nil, hash)
+    # {"message":"删除成功！","code":200}
+    assert(hash.dig("code") == 200, hash)
   end
 
   # 测试获取用户列表
-  # ruby ./lib/test/mini_test/TestManagementClient.rb -n test_list
+  # ruby ./lib/authing_ruby/test/mini_test/TestManagementClient.rb -n test_list
   def test_list
     managementClient = AuthingRuby::ManagementClient.new(@options)
     hash = managementClient.users.list()
-    assert(hash.dig("data", "users") != nil, hash)
+    assert(hash.dig("totalCount") != nil, hash)
   end
 
   # 测试 检查用户是否存在 (返回 true | false)
@@ -174,8 +175,8 @@ class TestManagementClient < Minitest::Test
       # "email": "haha2@qq.com",
       # "phone": "13700001111",
     }
-    result = managementClient.users.find(options)
-    assert(result.dig("data", "findUser"), result)
+    hash = managementClient.users.find(options)
+    assert(hash.dig("id"), hash)
   end
 
 end

data/lib/authing_ruby/version.rb

@@ -2,5 +2,5 @@
 # https://github.com/Authing/authing.js/blob/cf4757d09de3b44c3c3f4509ae8c8715c9f302a2/src/lib/version.ts
 
 module AuthingRuby
-  VERSION = "1.1.3".freeze
+  VERSION = "1.1.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authing_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - 郑诚(Zheng Cheng)