Merge pull request #52 from AnonymousDotNet/lida_Dev

Lida dev

Author: Oceania2018

src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs

@@ -525,7 +525,7 @@ public async Task<bool> VerifyUserNameExisting(string userName)
 
     public async Task<bool> VerifyEmailExisting(string email)
     {
-        if (string.IsNullOrEmpty(email))
+        if (string.IsNullOrWhiteSpace(email))
         {
             return true;
         }
@@ -542,7 +542,7 @@ public async Task<bool> VerifyEmailExisting(string email)
 
     public async Task<bool> VerifyPhoneExisting(string phone, string regionCode)
     {
-        if (string.IsNullOrEmpty(phone))
+        if (string.IsNullOrWhiteSpace(phone))
         {
             return true;
         }

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserViewModel.cs

@@ -1,5 +1,4 @@
 using BotSharp.Abstraction.Users.Enums;
-using BotSharp.Core.Infrastructures;
 using System.Text.Json.Serialization;
 
 namespace BotSharp.OpenAPI.ViewModels.Users;
@@ -58,8 +57,10 @@ public static UserViewModel FromUser(User user)
             UserName = user.UserName,
             FirstName = user.FirstName,
             LastName = user.LastName,
-            Email = Utilities.HideMiddleDigits(user.Email, true),
-            Phone = Utilities.HideMiddleDigits((!string.IsNullOrWhiteSpace(user.Phone) ? user.Phone.Replace("+86", String.Empty) : user.Phone)),
+            //Email = Utilities.HideMiddleDigits(user.Email, true),
+            //Phone = Utilities.HideMiddleDigits((!string.IsNullOrWhiteSpace(user.Phone) ? user.Phone.Replace("+86", String.Empty) : user.Phone)),
+            Email = user.Email,
+            Phone = !string.IsNullOrWhiteSpace(user.Phone) ? user.Phone.Replace("+86", String.Empty) : user.Phone,
             Type = user.Type,
             Role = user.Role,
             Source = user.Source,