authing_ruby 1.0.9 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ca30daef35d2aa46bcc434a75810b5fd27a8760f3324f4878dbb8d81135d035
-  data.tar.gz: 67304453872e3e5d430b2d0fc8db63f771a12bb01bb4171590c233c156d15bde
+  metadata.gz: 53d6cdb77ad3c55b067f67fe25749cce6ccfec7ce806dff9cc8e645ee21d3cbf
+  data.tar.gz: f950ec08cd5ea8d36b516fac6118c5fee65bf22095baca57bee388615322df3b
 SHA512:
-  metadata.gz: 7c7fdc3e2738967b81a16e147a462e8caf995b880df92fbf6b33eec8e136624d31e07e355303f10b4bd451b52c480d7cb05bfdf66a4afe0c3b264e4a35f6d7d2
-  data.tar.gz: c4f1e42b6c5f45456f5a98084bca6c467074fe9091e19df115262c81be8d263930e672d98c2a58826e01548ff7d00ce99d81317aab144447dfe8e6248fa03aa5
+  metadata.gz: 3d4697fff2570f3e8d43129a35f0e0769404b223e17dbd6e403cb29aafe35227b3001ef703f6c486001b4e44457f41bf2e8bd566f6f0c88e423b52d8b5e22df2
+  data.tar.gz: 314074e61c1d6dfb8ff22ba441f98353aca88ad6c9d34286731569488c7a9b1a99069dc6f55563ed8847e4528a75fa9a7ebaf8e08462b573a907edb5b677bcf9

data/lib/authing_ruby/GraphQLAPI.rb

@@ -1,10 +1,15 @@
-# 类似于 JS SDK 里 src/lib/graphqlapi.ts 的用途
-# 把一些 garpqhlClient.request 封装起来，里面包含了 const query = AccessTokenDocument;
+# 类似 JS SDK 里 src/lib/graphqlapi.ts 的用途，把请求进行封装
 
 # 使用示例
 # graphqlAPI = AuthingRuby::GraphQLAPI.new
 # graphqlAPI.getAccessToken(graphqlClient, variables)
 
+# 一共有三个参数
+# (garpqhlClient, tokenProvider = nil, variables = nil)
+  # garpqhlClient 是 lib/authing_ruby/common/GraphqlClient.rb
+  # tokenProvider 是 lib/authing_ruby/authentication/AuthenticationTokenProvider.rb
+  # variables 就是参数
+
 module AuthingRuby
   class GraphQLAPI
 
@@ -112,12 +117,18 @@ module AuthingRuby
       return _graphql_mutation_request("resetPassword", garpqhlClient, tokenProvider, variables)
     end
 
+    # 更新用户手机号码
+    def updatePhone(garpqhlClient, tokenProvider = nil, variables = nil)
+      return _graphql_mutation_request("updatePhone", garpqhlClient, tokenProvider, variables)
+    end
+
     def bindPhone(garpqhlClient, tokenProvider = nil, variables = nil)
       return _graphql_mutation_request("bindPhone", garpqhlClient, tokenProvider, variables)
     end
 
     # 太多同样写法的 method 了，稍微抽象一下
     # 这个负责发 mutation 的 request
+    # 第一个参数 gql_file_name 就是文件名
     def _graphql_mutation_request(gql_file_name, garpqhlClient, tokenProvider, variables)
       file = File.open("#{@folder_mutation}/#{gql_file_name}.gql");
       return _graphql_request(file, garpqhlClient, tokenProvider, variables)

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,37 @@ 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
+
+    # 更新用户手机号
+    # 更新用户手机号。和修改邮箱一样，默认情况下，如果用户当前已经绑定了手机号，需要同时验证原有手机号（目前账号绑定的手机号）和当前邮箱（将要绑定的手机号）。
+    # 也就是说，用户 A 当前绑定的手机号为 15888888888，想修改为 15899999999，那么就需要同时验证这两个手机号。
+    # 开发者也可以选择不开启 “验证原有手机号“ ，可以在 Authing 控制台 的 设置目录下的安全信息模块进行关闭。
+    # 用户首次绑定手机号请使用 bindPhone 接口。
+    def updatePhone(phone, phoneCode, oldPhone, oldPhoneCode)
+      graphqlAPI = AuthingRuby::GraphQLAPI.new
+      variables = {
+        "phone": phone,
+        "phoneCode": phoneCode,
+      }
+      variables['oldPhone'] = oldPhone if oldPhone
+      variables['oldPhoneCode'] = oldPhoneCode if oldPhoneCode
+
+      hash = graphqlAPI.updatePhone(@graphqlClient, @tokenProvider, variables)
+      user = hash.dig("data", "updatePhone")
+      if user
+        setCurrentUser(user)
+        return user
+      else
+        return hash
       end
     end
 
@@ -720,11 +727,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/graphql/mutations/updatePhone.gql

@@ -0,0 +1,63 @@
+mutation updatePhone(
+  $phone: String!
+  $phoneCode: String!
+  $oldPhone: String
+  $oldPhoneCode: String
+) {
+  updatePhone(
+    phone: $phone
+    phoneCode: $phoneCode
+    oldPhone: $oldPhone
+    oldPhoneCode: $oldPhoneCode
+  ) {
+    id
+    arn
+    userPoolId
+    status
+    username
+    email
+    emailVerified
+    phone
+    phoneVerified
+    unionid
+    openid
+    nickname
+    registerSource
+    photo
+    password
+    oauth
+    token
+    tokenExpiredAt
+    loginsCount
+    lastLogin
+    lastIP
+    signedUp
+    blocked
+    isDeleted
+    device
+    browser
+    company
+    name
+    givenName
+    familyName
+    middleName
+    profile
+    preferredUsername
+    website
+    gender
+    birthdate
+    zoneinfo
+    locale
+    address
+    formatted
+    streetAddress
+    locality
+    region
+    postalCode
+    city
+    province
+    country
+    createdAt
+    updatedAt
+  }
+}

data/lib/authing_ruby/management/ManagementClient.rb

@@ -13,7 +13,7 @@ module AuthingRuby
       @userPoolId = options.fetch(:userPoolId, nil)
       @secret = options.fetch(:secret, nil)
       @appId = options.fetch(:appId, nil)
-      @host = options.fetch(:host, nil)
+      @host = options.fetch(:host, 'https://core.authing.cn')
       @accessToken = options.fetch(:accessToken, nil)
       
       if @userPoolId == nil && @appId == nil

data/lib/authing_ruby/management/ManagementTokenProvider.rb

@@ -69,9 +69,8 @@ module AuthingRuby
         secret: @options.fetch(:secret, nil),
       }
       api = AuthingRuby::GraphQLAPI.new
-      res = api.getAccessToken(@graphqlClient, variables)
+      hash = api.getAccessToken(@graphqlClient, variables)
       # {"data":{"accessToken":{"accessToken":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7InR5cGUiOiJ1[省略]ZWE2NjE3IiwidXNlcks2lkIjoiNjA3YjBiMTVhYWIzYTgwNWY3ZWE2NjE3IiwiX2lkIjoiNjA3YjBiMTVhYWIzYTgwNWY3ZWE2NjE3IiwicGhvbmz3Mzk5M30.K7pwyvbxypeiOlYRsTIlLXY2xyk94tTd-CATQ85jYqM","exp":1620873993,"iat":1619577993}}}
-      hash = JSON.parse(res)
       return hash.dig("data", "accessToken", "accessToken")
     end
 
@@ -81,11 +80,9 @@ module AuthingRuby
       if accessToken == nil
         raise "无法刷新 token, 因为初始化时没有传入 accessToken"
       end
-      res = api.refreshAccessToken(@graphqlClient, {
+      hash = api.refreshAccessToken(@graphqlClient, {
         accessToken: accessToken
       })
-      hash = JSON.parse(res)
-      # puts hash
       # {"errors"=>[{"message"=>{"code"=>500, "message"=>"该 token 在黑名单中"}, "locations"=>[{"line"=>2, "column"=>5}], "path"=>["refreshAccessToken"], "extensions"=>{"code"=>"INTERNAL_SERVER_ERROR", "exception"=>{"name"=>"TokenInBlackListError"}}}], "data"=>nil}
       if hash.dig("errors")
         return hash

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
@@ -116,9 +128,10 @@ module AuthingRuby
         "phone": phone,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.isUserExists(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(res)
-      return json.dig('data', "isUserExists")
+      hash = graphqlAPI.isUserExists(@graphqlClient, @tokenProvider, variables)
+      data = hash.dig("data", "isUserExists")
+      return data if data
+      return hash
     end
 
     # 查找用户
@@ -138,9 +151,10 @@ module AuthingRuby
         "externalId": externalId,
       }
       graphqlAPI = AuthingRuby::GraphQLAPI.new
-      res = graphqlAPI.findUser(@graphqlClient, @tokenProvider, variables)
-      json = JSON.parse(res)
-      return json
+      hash = graphqlAPI.findUser(@graphqlClient, @tokenProvider, variables)
+      data = hash.dig("data", "findUser")
+      return data if data
+      return hash
     end
 
     # TODO

data/lib/authing_ruby/test/helper.rb

@@ -8,8 +8,12 @@ module Test
 		end
 
 		# 随机数字字符串
-		def randomNumString(n = 6)
-			srand.to_s.chars.last(n).join
+		def randomNumString(n)
+			result = []
+			n.to_i.times do
+				result << [0,1,2,3,4,5,6,7,8,9].sample
+			end
+			result.join
 		end
 	end
 end

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

@@ -1,8 +1,8 @@
-# ruby ./lib/test/mini_test/TestApplicationsManagementClient.rb
+# ruby ./lib/authing_ruby/test/mini_test/TestApplicationsManagementClient.rb
 
 require "minitest/autorun"
 require "./lib/authing_ruby.rb"
-require "./lib/test/helper.rb"
+require "./lib/authing_ruby/test/helper.rb"
 require 'dotenv'
 Dotenv.load('.env.test') 
 

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)
 
     # 进行第一次修改
@@ -207,10 +209,6 @@ class TestAuthenticationClient < Minitest::Test
     assert(result.dig('id') != nil, result)
   end
 
-  # 测试: 更新用户手机号
-  def test_updatePhone
-  end
-
   # 绑定邮箱
   def test_bindEmail
   end
@@ -220,11 +218,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

@@ -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"
@@ -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"],
     }
@@ -18,24 +18,25 @@ class TestManagementClient < Minitest::Test
   end
 
   # 创建用户
-  # ruby ./lib/test/mini_test/TestManagementClient.rb -n test_users_create
+  # ruby ./lib/authing_ruby/test/mini_test/TestManagementClient.rb -n test_users_create
   def test_users_create
     managementClient = AuthingRuby::ManagementClient.new(@options)
+    random_phone = "135#{@helper.randomNumString(8)}"
     userInfo = {
-      username: @helper.randomString, # 随机字符串，比如 "mpflok"
+      # username: @helper.randomString, # 随机字符串，比如 "mpflok"
       # username: 'SpongeBob3', # 或者明确指定用户名
-      password: 'passw0rd',
+      phone: random_phone,
+      password: '123456789',
     }
-    res = managementClient.users.create(userInfo)
-    json = JSON.parse(res)
-    # puts res
-    # 如果成功
-    # {"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}}}
+    hash = managementClient.users.create(userInfo)
     
-    # 如果失败
+    # 成功
+    # {"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(json.dig("data", "createUser") != nil, json)
+    assert(hash.dig("id") != nil, hash)
   end
 
   # 创建用户
@@ -49,10 +50,8 @@ class TestManagementClient < Minitest::Test
       loginsCount: 2, # 原有用户系统记录的用户登录次数
       signedUp: '2020-10-15T17:55:37+08:00' # 原有用户系统记录的用户注册时间
     }
-    res = managementClient.users.create(userInfo)
-    # puts res
-    json = JSON.parse(res)
-    assert(json.dig("data", "createUser") != nil, json)
+    hash = managementClient.users.create(userInfo)
+    assert(hash.dig("id") != nil, hash)
   end
 
   # 创建一个用户, 并返回这个用户
@@ -67,14 +66,12 @@ class TestManagementClient < Minitest::Test
     end
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
-    res = managementClient.users.create(userInfo)
-    json = JSON.parse(res)
-    user = json.dig("data", "createUser")
+    user = managementClient.users.create(userInfo)
     return user
   end
 
   # 更新用户
-  # ruby ./lib/test/mini_test/TestManagementClient.rb -n test_update_user
+  # ruby ./lib/authing_ruby/test/mini_test/TestManagementClient.rb -n test_update_user
   def test_update_user
     # 第一步：创建用户
     user = create_random_user()
@@ -82,15 +79,17 @@ class TestManagementClient < Minitest::Test
 
     # 第二步：更新用户
     managementClient = AuthingRuby::ManagementClient.new(@options)
-    res2 = managementClient.users.update(user_id, {
+    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}
 
-    json2 = JSON.parse(res2)
-    assert(json2.dig("data", "updateUser") != nil, json2)
+    assert(hash.dig("id") != nil, hash)
   end
 
   # 测试通过 ID 获取用户信息
@@ -100,26 +99,20 @@ class TestManagementClient < Minitest::Test
     user_id = user.dig("id")
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
-    res = managementClient.users.detail(user_id)
-
-    json = JSON.parse(res)
-    assert(json.dig("data", "user") != nil, json)
+    hash = managementClient.users.detail(user_id)
+    assert(hash.dig("id") != nil, hash)
   end
   
   # 测试删除用户
-  # ruby ./lib/test/mini_test/TestManagementClient.rb -n test_delete
+  # ruby ./lib/authing_ruby/test/mini_test/TestManagementClient.rb -n test_delete
   def test_delete
     user = create_random_user()
     user_id = user.dig("id")
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
-    res = managementClient.users.delete(user_id)
-
-    # puts res
-    # {"data":{"deleteUser":{"message":"删除成功！","code":200}}}
-
-    json = JSON.parse(res)
-    assert(json.dig("data", "deleteUser") != nil, json)
+    hash = managementClient.users.delete(user_id)
+    # {"message":"删除成功！","code":200}
+    assert(hash.dig("code") == 200, hash)
   end
 
   # 测试删除多个用户
@@ -134,22 +127,17 @@ class TestManagementClient < Minitest::Test
     user_ids = [user1_id, user2_id]
 
     managementClient = AuthingRuby::ManagementClient.new(@options)
-    res = managementClient.users.deleteMany(user_ids)
-    # puts res
-    # {"data":{"deleteUsers":{"message":"删除成功！","code":200}}}
-
-    json = JSON.parse(res)
-    assert(json.dig("data", "deleteUsers") != nil, json)
+    hash = managementClient.users.deleteMany(user_ids)
+    # {"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)
-    res = managementClient.users.list()
-    # puts res
-    json = JSON.parse(res)
-    assert(json.dig("data", "users") != nil, json)
+    hash = managementClient.users.list()
+    assert(hash.dig("totalCount") != nil, hash)
   end
 
   # 测试 检查用户是否存在 (返回 true | false)
@@ -173,7 +161,7 @@ class TestManagementClient < Minitest::Test
   end
 
   # 测试 查找用户 (返回这个用户)
-  # ruby ./lib/test/mini_test/TestManagementClient.rb -n test_find
+  # ruby ./lib/authing_ruby/test/mini_test/TestManagementClient.rb -n test_find
   def test_find
     # 第一步：先创建用户
     userInfo = {
@@ -187,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/test/mini_test/TestSMSandEmail.rb

@@ -12,7 +12,7 @@
 
 require "minitest/autorun"
 require "./lib/authing_ruby.rb"
-require "./lib/test/helper.rb"
+require "./lib/authing_ruby/test/helper.rb"
 require 'dotenv'
 Dotenv.load('.env.test') 
 
@@ -97,5 +97,49 @@ class TestSMSandEmail < Minitest::Test
     # 清理工作：测完了删除第一步注册的用户
     user_id = user['id']
     @managementClient.users.delete(user_id)
-  end 
-end
+  end
+
+  # 测试: 更新用户手机号
+  # ruby ./lib/authing_ruby/test/mini_test/TestSMSandEmail.rb -n test_updatePhone
+  # 文档: https://docs.authing.cn/v2/reference/sdk-for-node/authentication/AuthenticationClient.html#%E6%9B%B4%E6%96%B0%E7%94%A8%E6%88%B7%E6%89%8B%E6%9C%BA%E5%8F%B7
+  def test_updatePhone
+    # 前提条件：先确保有一个现有用户，可以进 Authing 手工新建一个，新建时设定手机号和密码，手机号随便填如 13511112222 密码 123456789
+    
+    # 先登录：
+    phone = '13511112222'
+    password = '123456789'
+    user = @authenticationClient.loginByPhonePassword(phone, password)
+
+    # 填写要绑定的新手机号（可以填你自己的，这样才能收到短信）
+    phone = '13556136684'
+
+    # 给新手机号发送短信验证码 (把下面这行先取消注释, 收到短信后再注释上)
+    # puts manual_send_SMS(phone); return;
+
+    # 填写收到的短信验证码
+    code = '4874'
+
+    # 默认情况下，如果用户当前已经绑定了手机号，需要同时验证原有手机号
+    # 开发者也可以选择不开启 “验证原有手机号“ ，可以在 Authing 控制台 的 设置目录下的安全信息模块进行关闭。
+    # 单个用户池 -> 设置 -> 安全信息 -> 用户池安全设置 -> 修改手机号时是否验证旧手机号 -> 点击开关,切换为关闭 -> 右上角"保存"
+    # 由于没有2个手机号，这里是关闭后再测试
+    oldPhone = nil
+    oldPhoneCode = nil
+
+    updatePhoneResult = @authenticationClient.updatePhone(phone, code, oldPhone, oldPhoneCode)
+    puts updatePhoneResult
+    assert(updatePhoneResult.dig('id') != nil)
+
+    # 错误:
+    # {:code=>2020, :message=>"尚未登录，无访问权限", :data=>nil}
+    # {:code=>500, :message=>"该手机号已被绑定", :data=>nil}
+    # {:code=>2230, :message=>"新手机号和旧手机号一样", :data=>nil}
+    # {:code=>500, :message=>"修改手机号必须验证原来的手机号。", :data=>nil}
+    # {:code=>500, :message=>"验证码已过期", :data=>nil}
+    # {:code=>500, :message=>"验证码不正确！", :data=>nil}
+
+    # 成功会返回 User
+    # {"id"=>"60b5b17a9cf59b23b2bcbccb", "arn"=>"arn:cn:authing:60800b8ee5b66b23128b4980:user:60b5b17a9cf59b23b2bcbccb", "userPoolId"=>"60800b8ee5b66b23128b4980", "status"=>"Activated", "username"=>"测试更新手机号", "email"=>nil, "emailVerified"=>false, "phone"=>"13556136684", "phoneVerified"=>true, "unionid"=>nil, "openid"=>nil, "nickname"=>nil, "registerSource"=>["import:manual"], "photo"=>"https://files.authing.co/authing-console/default-user-avatar.png", "password"=>"871fde109c2f0f463cc35e0c3e840932", "oauth"=>nil, "token"=>"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI2MGI1YjE3YTljZjU5YjIzYjJiY2JjY2IiLCJiaXJ0aGRhdGUiOm51bGwsImZhbWlseV9uYW1lIjpudWxsLCJnZW5kZXIiOiJVIiwiZ2l2ZW5fbmFtZSI6bnVsbCwibG9jYWxlIjpudWxsLCJtaWRkbGVfbmFtZSI6bnVsbCwibmFtZSI6bnVsbCwibmlja25hbWUiOm51bGwsInBpY3R1cmUiOiJodHRwczovL2ZpbGVzLmF1dGhpbmcuY28vYXV0aGluZy1jb25zb2xlL2RlZmF1bHQtdXNlci1hdmF0YXIucG5nIiwicHJlZmVycmVkX3VzZXJuYW1lIjpudWxsLCJwcm9maWxlIjpudWxsLCJ1cGRhdGVkX2F0IjoiMjAyMS0wNi0wMVQwNDoxNjo1MS41NDBaIiwid2Vic2l0ZSI6bnVsbCwiem9uZWluZm8iOm51bGwsImFkZHJlc3MiOnsiY291bnRyeSI6bnVsbCwicG9zdGFsX2NvZGUiOm51bGwsInJlZ2lvbiI6bnVsbCwiZm9ybWF0dGVkIjpudWxsfSwicGhvbmVfbnVtYmVyIjoiMTM1MTExMTIyMjIiLCJwaG9uZV9udW1iZXJfdmVyaWZpZWQiOmZhbHNlLCJlbWFpbCI6bnVsbCwiZW1haWxfdmVyaWZpZWQiOmZhbHNlLCJleHRlcm5hbF9pZCI6bnVsbCwidW5pb25pZCI6bnVsbCwiZGF0YSI6eyJ0eXBlIjoidXNlciIsInVzZXJQb29sSWQiOiI2MDgwMGI4ZWU1YjY2YjIzMTI4YjQ5ODAiLCJhcHBJZCI6IjYwYjViMjFiZTMxMjkwNjI2ZmY2ZDgyZiIsImlkIjoiNjBiNWIxN2E5Y2Y1OWIyM2IyYmNiY2NiIiwidXNlcklkIjoiNjBiNWIxN2E5Y2Y1OWIyM2IyYmNiY2NiIiwiX2lkIjoiNjBiNWIxN2E5Y2Y1OWIyM2IyYmNiY2NiIiwicGhvbmUiOiIxMzUxMTExMjIyMiIsImVtYWlsIjpudWxsLCJ1c2VybmFtZSI6Iua1i-ivleabtOaWsOaJi-acuuWPtyIsInVuaW9uaWQiOm51bGwsIm9wZW5pZCI6bnVsbCwiY2xpZW50SWQiOiI2MDgwMGI4ZWU1YjY2YjIzMTI4YjQ5ODAifSwidXNlcnBvb2xfaWQiOiI2MDgwMGI4ZWU1YjY2YjIzMTI4YjQ5ODAiLCJhdWQiOiI2MGI1YjIxYmUzMTI5MDYyNmZmNmQ4MmYiLCJleHAiOjE2MjM3MzA2MzEsImlhdCI6MTYyMjUyMTAzMSwiaXNzIjoiaHR0cHM6Ly9tb3Jlbi5hdXRoaW5nLmNuL29pZGMifQ.VKSB6q-DBmtKLzOh_2qjBPQCSNZUAtrw_G2ZlNjOxbs", "tokenExpiredAt"=>"2021-06-15T04:17:11+00:00", "loginsCount"=>6, "lastLogin"=>"2021-06-01T04:17:11+00:00", "lastIP"=>nil, "signedUp"=>"2021-06-01T04:03:06+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-01T04:03:06+00:00", "updatedAt"=>"2021-06-01T04:17:12+00:00"}
+  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.0.9".freeze
+  VERSION = "1.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authing_ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.4
 platform: ruby
 authors:
 - 郑诚(Zheng Cheng)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -189,6 +189,7 @@ files:
 - lib/authing_ruby/graphql/mutations/resetPassword.gql
 - lib/authing_ruby/graphql/mutations/sendEmail.gql
 - lib/authing_ruby/graphql/mutations/updatePassword.gql
+- lib/authing_ruby/graphql/mutations/updatePhone.gql
 - lib/authing_ruby/graphql/mutations/updateUser.gql
 - lib/authing_ruby/graphql/queries/accessToken.gql
 - lib/authing_ruby/graphql/queries/checkLoginStatus.gql
@@ -688,7 +689,7 @@ homepage: https://github.com/1c7/authing_ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -703,8 +704,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Authing 的 Ruby SDK
 test_files: []