authing_ruby 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ca30daef35d2aa46bcc434a75810b5fd27a8760f3324f4878dbb8d81135d035
-  data.tar.gz: 67304453872e3e5d430b2d0fc8db63f771a12bb01bb4171590c233c156d15bde
+  metadata.gz: aa6593330f870f1b2559fe53cbeb0ed09a06cff11a5c79ea728d328a57136f58
+  data.tar.gz: a037af3385879a07abb47ab49b23712944b0999ace92d9d291bc4a701d090eff
 SHA512:
-  metadata.gz: 7c7fdc3e2738967b81a16e147a462e8caf995b880df92fbf6b33eec8e136624d31e07e355303f10b4bd451b52c480d7cb05bfdf66a4afe0c3b264e4a35f6d7d2
-  data.tar.gz: c4f1e42b6c5f45456f5a98084bca6c467074fe9091e19df115262c81be8d263930e672d98c2a58826e01548ff7d00ce99d81317aab144447dfe8e6248fa03aa5
+  metadata.gz: fd1b2564b11854460730bafe77947659f0ef22b97ee5be871549882837eee2cea373f9fc7303843e044a22d37d93829a95c347c4a4e4216a484470337857dc51
+  data.tar.gz: cbb759903d06dbb5be96d472f32c713983efb56ad736460a4c880f898343fe99d4aaa63cbceefe073ef69cc2e7309c1c0667734f9af588cbcddf78cc295aa324

data/lib/authing_ruby/authentication/AuthenticationClient.rb

@@ -68,11 +68,10 @@ module AuthingRuby
         }
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.registerByEmail(@graphqlClient, variables)
-      json = JSON.parse(res)
-      user = json.dig('data', 'registerByEmail')
+      hash = graphqlAPI.registerByEmail(@graphqlClient, variables)
+      user = hash.dig('data', 'registerByEmail')
       return user if user
-      return json
+      return hash
     end
 
     # 使用用户名注册
@@ -96,11 +95,10 @@ module AuthingRuby
         }
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.registerByUsername(@graphqlClient, variables)
-      json = JSON.parse(res)
-      user = json.dig('data', 'registerByUsername')
+      hash = graphqlAPI.registerByUsername(@graphqlClient, variables)
+      user = hash.dig('data', 'registerByUsername')
       return user if user
-      return json
+      return hash
     end
 
     # 发送短信验证码
@@ -138,14 +136,10 @@ module AuthingRuby
         }
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.registerByPhoneCode(@graphqlClient, variables)
-      if res.class.name == "String"
-        json = JSON.parse(res)
-        user = json.dig('data', 'registerByPhoneCode')
-        return user if user
-        return json
-      end
-      return res
+      hash = graphqlAPI.registerByPhoneCode(@graphqlClient, variables)
+      user = hash.dig('data', 'registerByPhoneCode')
+      return user if user
+      return hash
     end
 
     # 使用邮箱登录
@@ -166,14 +160,13 @@ module AuthingRuby
         }
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.loginByEmail(@graphqlClient, variables)
-      json = JSON.parse(res)
-      user = json.dig('data', 'loginByEmail')
+      hash = graphqlAPI.loginByEmail(@graphqlClient, variables)
+      user = hash.dig('data', 'loginByEmail')
       if user
         setCurrentUser(user);
         return user 
       end
-      return json
+      return hash
     end
 
     # 使用用户名登录
@@ -194,14 +187,13 @@ module AuthingRuby
         }
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.loginByUsername(@graphqlClient, variables)
-      json = JSON.parse(res)
-      user = json.dig('data', 'loginByUsername')
+      hash = graphqlAPI.loginByUsername(@graphqlClient, variables)
+      user = hash.dig('data', 'loginByUsername')
       if user
         setCurrentUser(user);
         return user 
       end
-      return json
+      return hash
     end
 
     # 使用手机号验证码登录
@@ -218,14 +210,13 @@ module AuthingRuby
         }
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.loginByPhoneCode(@graphqlClient, variables)
-      json = JSON.parse(res)
-      user = json.dig('data', 'loginByPhoneCode')
+      hash = graphqlAPI.loginByPhoneCode(@graphqlClient, variables)
+      user = hash.dig('data', 'loginByPhoneCode')
       if user
         setCurrentUser(user);
         return user 
       end
-      return json
+      return hash
     end
 
     # 使用手机号密码登录
@@ -245,14 +236,13 @@ module AuthingRuby
         }
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.loginByPhonePassword(@graphqlClient, variables)
-      json = JSON.parse(res)
-      user = json.dig('data', 'loginByPhonePassword')
+      hash = graphqlAPI.loginByPhonePassword(@graphqlClient, variables)
+      user = hash.dig('data', 'loginByPhonePassword')
       if user
         setCurrentUser(user);
         return user 
       end
-      return json
+      return hash
     end
 
     # 发送邮件
@@ -265,11 +255,10 @@ module AuthingRuby
         "scene": scene,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.sendEmail(@graphqlClient, variables)
-      json = JSON.parse(res)
-      data = json.dig('data')
+      hash = graphqlAPI.sendEmail(@graphqlClient, variables)
+      data = hash.dig('data')
       return data if data
-      return json
+      return hash
       # {"sendEmail":{"message":"","code":200}}
     end
 
@@ -277,14 +266,13 @@ module AuthingRuby
     # 返回：用户信息
     def getCurrentUser()
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.getCurrentUser(@graphqlClient, @tokenProvider, {})
-      json = JSON.parse(res)
-      user = json.dig("data", "user")
+      hash = graphqlAPI.getCurrentUser(@graphqlClient, @tokenProvider, {})
+      user = hash.dig("data", "user")
       if user
         setCurrentUser(user)
         return user
       else
-        return json
+        return hash
       end
     end
 
@@ -609,9 +597,8 @@ module AuthingRuby
         "id": userId,
         "input": updates
       }
-      res = graphqlAPI.updateUser(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(res)
-      updated_user = json.dig('data', 'updateUser')
+      hash = graphqlAPI.updateUser(@graphqlClient, @tokenProvider, variables)
+      updated_user = hash.dig('data', 'updateUser')
       if updated_user
         # 如果更新成功，返回更新后的用户
         setCurrentUser(updated_user)
@@ -619,7 +606,7 @@ module AuthingRuby
       else
         # 如果更新失败，返回原结果
         # {"errors"=>[{"message"=>{"code"=>2020, "message"=>"尚未登录，无访问权限"}, "locations"=>[{"line"=>2, "column"=>3}], "path"=>["updateUser"], "extensions"=>{"code"=>"INTERNAL_SERVER_ERROR"}}], "data"=>nil}
-        return json
+        return hash
       end
     end
 
@@ -661,18 +648,16 @@ module AuthingRuby
     def checkPasswordStrength(password)
       graphqlAPI = AuthingRuby::GraphQLAPI.new
       variables = { "password": password }
-      res = graphqlAPI.checkPasswordStrength(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(res)
-      return json.dig("data", "checkPasswordStrength")
+      hash = graphqlAPI.checkPasswordStrength(@graphqlClient, @tokenProvider, variables)
+      return hash.dig("data", "checkPasswordStrength")
     end
 
     # 检测 Token 登录状态
     def checkLoginStatus(token)
       graphqlAPI = AuthingRuby::GraphQLAPI.new
       variables = { "token": token }
-      res = graphqlAPI.checkLoginStatus(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(res)
-      return json.dig("data", "checkLoginStatus")
+      hash = graphqlAPI.checkLoginStatus(@graphqlClient, @tokenProvider, variables)
+      return hash.dig("data", "checkLoginStatus")
     end
 
     # 更新用户密码
@@ -685,9 +670,8 @@ module AuthingRuby
         "oldPassword": oldPasswordEncrypted,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.updatePassword(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(res)
-      return json.dig("data", "updatePassword")
+      hash = graphqlAPI.updatePassword(@graphqlClient, @tokenProvider, variables)
+      return hash.dig("data", "updatePassword")
     end
 
     # 绑定手机号
@@ -698,14 +682,13 @@ module AuthingRuby
         "phone": phone,
         "phoneCode": phoneCode,
       }
-      res = graphqlAPI.bindPhone(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(res)
-      user = json.dig("data", "bindPhone")
+      hash = graphqlAPI.bindPhone(@graphqlClient, @tokenProvider, variables)
+      user = hash.dig("data", "bindPhone")
       if user
         setCurrentUser(user);
         return user;
       else
-        return json
+        return hash
       end
     end
 
@@ -720,11 +703,10 @@ module AuthingRuby
         "newPassword": newPasswordEncrypted,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      resp = graphqlAPI.resetPassword(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(resp)
-      result = json.dig("data", "resetPassword") # {"message":"重置密码成功！","code":200}
+      hash = graphqlAPI.resetPassword(@graphqlClient, @tokenProvider, variables)
+      result = hash.dig("data", "resetPassword") # {"message":"重置密码成功！","code":200}
       return result if result
-      return json
+      return hash
     end
 
     def generateCodeChallenge()

data/lib/authing_ruby/common/GraphqlClient.rb

@@ -14,9 +14,8 @@ module AuthingRuby
         @options = options
       end
 
-      # 发个请求
-      # 如果成功，返回 String
-      # 如果失败，返回 Hash
+      # 发请求
+      # 成功或失败都返回 Hash
       def request(options)
         headers = {
           'content-type': 'application/json',
@@ -42,20 +41,19 @@ module AuthingRuby
         # puts response.body.to_s
         # puts response.body.to_s.class.name # String
 
-        json = JSON.parse(response.body.to_s)
+        hash = JSON.parse(response.body.to_s)
 
         # 这里的错误处理代码参照的 JS SDK （src/lib/common/GraphqlClient.ts）
-        if json['errors'] == nil
-          # 如果没错误，直接返回 body
-          body_as_string = response.body.to_s
-          return body_as_string
+        if hash['errors'] == nil
+          # 如果没错误
+          return hash
         else
           # 如果有错误, 最后返回这3个字段就行
           code = nil
           message = nil
           data = nil
 
-          json['errors'].each do |e|
+          hash['errors'].each do |e|
             if e['message']
               message = e['message'] 
               code = message['code']

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

@@ -1,5 +1,5 @@
 # 测试内容: 用户认证模块-认证核心模块
-# 如何运行: ruby /lib/authing_ruby/test/mini_test/TestAuthenticationClient.rb
+# 如何运行: ruby ./lib/authing_ruby/test/mini_test/TestAuthenticationClient.rb
 
 require "minitest/autorun" # Minitest
 require "./lib/authing_ruby.rb" # 模块主文件
@@ -21,20 +21,20 @@ class TestAuthenticationClient < Minitest::Test
   end
 
   # 测试: 手机号+验证码+密码 注册
+  # 需要手动测试（填验证码）
   # ruby ./lib/authing_ruby/test/mini_test/TestAuthenticationClient.rb -n test_registerByPhoneCode
   def test_registerByPhoneCode
     phone = '13556136684'
     code = '8086' 
     password = '1234567890'
     res = @authenticationClient.registerByPhoneCode(phone, code, password)
-    puts '拿到的结果是:-----'
-    puts res
+    # puts '拿到的结果是:-----'
+    # puts res
     # {:code=>2026, :message=>"用户已存在，请直接登录！", :data=>nil}
     # {:code=>2001, :message=>"验证码不正确！", :data=>nil}
 
     # 如果成功
     # {"id"=>"60ad0c49d6e166f9fe23ba4d", "arn"=>"arn:cn:authing:60ab26fe478f98290befefaa:user:60ad0c49d6e166f9fe23ba4d", "userPoolId"=>"60ab26fe478f98290befefaa", "status"=>"Activated", "username"=>nil, "email"=>nil, "emailVerified"=>false, "phone"=>"13556136684", "phoneVerified"=>true, "unionid"=>nil, "openid"=>nil, "nickname"=>nil, "registerSource"=>["basic:phone-code"], "photo"=>"default-user-avatar.png", "password"=>"0361a6088087f31edd172c4f6076c0e6", "oauth"=>nil, "token"=>nil, "tokenExpiredAt"=>nil, "loginsCount"=>0, "lastLogin"=>nil, "lastIP"=>nil, "signedUp"=>nil, "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-05-25T14:40:09+00:00", "updatedAt"=>"2021-05-25T14:40:09+00:00", "externalId"=>nil}
-    assert(res.dig('id'), res)
   end
 
   # 测试邮箱+密码注册
@@ -138,11 +138,13 @@ class TestAuthenticationClient < Minitest::Test
   end
 
   # 测试: 修改用户资料
-  # ruby /lib/authing_ruby/test/mini_test/TestAuthenticationClient.rb -n test_updateProfile
+  # 需要手动测试（确保用户名+密码账号的确存在）
+  # ruby ./lib/authing_ruby/test/mini_test/TestAuthenticationClient.rb -n test_updateProfile
   def test_updateProfile
     # 先登录
     username = 'zhengcheng123'
     password = "123456789"
+    @authenticationClient.registerByUsername(username, password)
     @authenticationClient.loginByUsername(username, password)
 
     # 进行第一次修改
@@ -220,11 +222,12 @@ class TestAuthenticationClient < Minitest::Test
   end
 
   # 测试: 检测 Token 登录状态
-  # ruby /lib/authing_ruby/test/mini_test/TestAuthenticationClient.rb -n test_checkLoginStatus
+  # ruby ./lib/authing_ruby/test/mini_test/TestAuthenticationClient.rb -n test_checkLoginStatus
   def test_checkLoginStatus
     # 第一步：先登录然后获取 token
     username = 'zhengcheng123'
     password = "123456789"
+    @authenticationClient.registerByUsername(username, password)
     user = @authenticationClient.loginByUsername(username, password)
     token = user.dig("token")
 

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

@@ -9,8 +9,8 @@ Dotenv.load('.env.test')
 class TestManagementClient < Minitest::Test
   def setup
     @options = {
-      # host: 'https://core.authing.cn',
-      host: 'https://core.authing.co', # 2021-5-13 他们临时使用 .co，过几天等他们恢复了 .cn 这里就改回 .cn
+      host: 'https://core.authing.cn',
+      # host: 'https://core.authing.co', # 2021-5-13 他们临时使用 .co，过几天等他们恢复了 .cn 这里就改回 .cn
       userPoolId: ENV["userPoolId"],
       secret: ENV["secret"],
     }

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.0.9".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

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