feat(user): add updateUseremailModel (#220)

* feat(user): add updateUseremailModel

* refactor:refactor code

* feat(user):upsertUserModel add roleNames

* refactor:refactor code

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/SendMsgCodeTypes.cs

@@ -0,0 +1,10 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.StackSdks.Auth.Contracts.Enum;
+
+public enum SendMsgCodeTypes
+{
+    VerifiyPhoneNumber = 1,
+    UpdatePhoneNumber
+}

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/SendMsgCodeModel.cs

@@ -0,0 +1,24 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
+
+public class SendMsgCodeModel
+{
+    public Guid UserId { get; set; }
+
+    public string PhoneNumber { get; set; } = "";
+
+    public SendMsgCodeTypes SendMsgCodeType { get; set; } = SendMsgCodeTypes.VerifiyPhoneNumber;
+
+    public SendMsgCodeModel()
+    {
+    }
+
+    public SendMsgCodeModel(Guid userId, string phoneNumber, SendMsgCodeTypes sendMsgCodeType)
+    {
+        UserId = userId;
+        PhoneNumber = phoneNumber;
+        SendMsgCodeType = sendMsgCodeType;
+    }
+}

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/UpdateStaffAvatarModel.cs

@@ -7,7 +7,11 @@ public class UpdateStaffAvatarModel
 {
     public Guid UserId { get; set; }
 
-    public string Avatar { get; set; }
+    public string Avatar { get; set; } = "";
+
+    public UpdateStaffAvatarModel()
+    {
+    }
 
     public UpdateStaffAvatarModel(Guid userId, string avatar)
     {

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/UpdateUserAvatarModel.cs

@@ -7,7 +7,11 @@ public class UpdateUserAvatarModel
 {
     public Guid Id { get; set; }
 
-    public string Avatar { get; set; }
+    public string Avatar { get; set; } = "";
+
+    public UpdateUserAvatarModel()
+    {
+    }
 
     public UpdateUserAvatarModel(Guid id, string avatar)
     {

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/UpdateUserEmailModel.cs

@@ -0,0 +1,22 @@
+// Copyright (c) MASA Stack All rights reserved.
+// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
+
+namespace Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
+
+public class UpdateUserEmailModel
+{
+    public Guid Id { get; set; }
+
+    public string Email { get; set; } = "";
+
+    public UpdateUserEmailModel()
+    {
+
+    }
+
+    public UpdateUserEmailModel(Guid id, string email)
+    {
+        Id = id;
+        Email = email;
+    }
+}

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/UpdateUserPhoneNumberModel.cs

@@ -7,9 +7,13 @@ public class UpdateUserPhoneNumberModel
 {
     public Guid Id { get; set; }
 
-    public string PhoneNumber { get; set; }
+    public string PhoneNumber { get; set; } = "";
 
-    public string VerificationCode { get; set; }
+    public string VerificationCode { get; set; } = "";
+
+    public UpdateUserPhoneNumberModel()
+    {
+    }
 
     public UpdateUserPhoneNumberModel(Guid id, string phoneNumber, string verificationCode)
     {

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/UpsertUserModel.cs

@@ -6,5 +6,7 @@ namespace Masa.BuildingBlocks.StackSdks.Auth.Contracts.Model;
 public class UpsertUserModel : AddUserModel
 {
     public Guid Id { get; set; }
+
+    public List<string> RoleNames { get; set; } = new();
 }
 

src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs

@@ -45,13 +45,11 @@ public interface IUserService
 
     Task UpdateStaffAvatarAsync(UpdateStaffAvatarModel staff);
 
-    Task SendMsgCodeForVerificationAsync(SendMsgCodeForVerificationModel model);
+    Task SendMsgCodeAsync(SendMsgCodeModel model);
 
     Task<bool> VerifyMsgCodeAsync(VerifyMsgCodeModel model);
 
-    Task SendMsgCodeForUpdatePhoneNumberAsync(SendMsgCodeForUpdatePhoneNumberModel model);
-
-    Task UpdatePhoneNumberAsync(UpdateUserPhoneNumberModel user);
+    Task<bool> UpdatePhoneNumberAsync(UpdateUserPhoneNumberModel user);
 
     Task UpdateBasicInfoAsync(UpdateUserBasicInfoModel user);
 

src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs

@@ -205,13 +205,13 @@ public async Task<List<UserSimpleModel>> GetListByAccountAsync(IEnumerable<strin
         return await _caller.GetAsync<object, List<UserSimpleModel>>(requestUri, new { accounts = string.Join(',', accounts) }) ?? new();
     }
 
-    public async Task SendMsgCodeForVerificationAsync(SendMsgCodeForVerificationModel model)
+    public async Task SendMsgCodeAsync(SendMsgCodeModel model)
     {
         if (model.UserId == Guid.Empty)
         {
             model.UserId = _userContext.GetUserId<Guid>();
         }
-        var requestUri = $"api/user/sendMsgCodeForVerification";
+        var requestUri = $"api/user/sendMsgCode";
         await _caller.PostAsync(requestUri, model);
     }
 
@@ -225,24 +225,14 @@ public async Task<bool> VerifyMsgCodeAsync(VerifyMsgCodeModel model)
         return await _caller.PostAsync<bool>(requestUri, model);
     }
 
-    public async Task SendMsgCodeForUpdatePhoneNumberAsync(SendMsgCodeForUpdatePhoneNumberModel model)
-    {
-        if (model.UserId == Guid.Empty)
-        {
-            model.UserId = _userContext.GetUserId<Guid>();
-        }
-        var requestUri = $"api/user/sendMsgCodeForUpdatePhoneNumber";
-        await _caller.PostAsync(requestUri, model);
-    }
-
-    public async Task UpdatePhoneNumberAsync(UpdateUserPhoneNumberModel user)
+    public async Task<bool> UpdatePhoneNumberAsync(UpdateUserPhoneNumberModel user)
     {
         if (user.Id == Guid.Empty)
         {
             user.Id = _userContext.GetUserId<Guid>();
         }
-        var requestUri = $"api/user/updateUserPhoneNumber";
-        await _caller.PutAsync(requestUri, user);
+        var requestUri = $"api/user/updatePhoneNumber";
+        return await _caller.PutAsync<bool>(requestUri, user);
     }
 }
 

src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs

@@ -329,15 +329,15 @@ public async Task TestUpdateStaffAvatarAsync()
     }
 
     [TestMethod]
-    public async Task TestSendMsgCodeForVerificationAsync()
+    public async Task SendMsgCodeAsync()
     {
-        var code = new SendMsgCodeForVerificationModel(default);
-        var requestUri = $"api/user/sendMsgCodeForVerification";
+        var code = new SendMsgCodeModel();
+        var requestUri = $"api/user/sendMsgCode";
         var caller = new Mock<ICaller>();
         caller.Setup(provider => provider.PostAsync(requestUri, code, true, default)).Verifiable();
         var userContext = new Mock<IUserContext>();
         var userService = new UserService(caller.Object, userContext.Object);
-        await userService.SendMsgCodeForVerificationAsync(code);
+        await userService.SendMsgCodeAsync(code);
         caller.Verify(provider => provider.PostAsync(requestUri, code, true, default), Times.Once);
     }
 
@@ -354,30 +354,17 @@ public async Task TestVerifyMsgCodeAsync()
         caller.Verify(provider => provider.PostAsync<bool>(requestUri, code, default), Times.Once);
     }
 
-    [TestMethod]
-    public async Task TestSendMsgCodeForUpdatePhoneNumberAsync()
-    {
-        var code = new SendMsgCodeForUpdatePhoneNumberModel(default, "283417");
-        var requestUri = $"api/user/sendMsgCodeForUpdatePhoneNumber";
-        var caller = new Mock<ICaller>();
-        caller.Setup(provider => provider.PostAsync(requestUri, code, true, default)).Verifiable();
-        var userContext = new Mock<IUserContext>();
-        var userService = new UserService(caller.Object, userContext.Object);
-        await userService.SendMsgCodeForUpdatePhoneNumberAsync(code);
-        caller.Verify(provider => provider.PostAsync(requestUri, code, true, default), Times.Once);
-    }
-
     [TestMethod]
     public async Task TestUpdateUserPhoneNumberAsync()
     {
         var user = new UpdateUserPhoneNumberModel(Guid.NewGuid(), "15168440403", "123453");
-        var requestUri = $"api/user/updateUserPhoneNumber";
+        var requestUri = $"api/user/updatePhoneNumber";
         var caller = new Mock<ICaller>();
-        caller.Setup(provider => provider.PutAsync(requestUri, user, true, default)).Verifiable();
+        caller.Setup(provider => provider.PutAsync<bool>(requestUri, user, default)).Verifiable();
         var userContext = new Mock<IUserContext>();
         var userService = new UserService(caller.Object, userContext.Object);
         await userService.UpdatePhoneNumberAsync(user);
-        caller.Verify(provider => provider.PutAsync(requestUri, user, true, default), Times.Once);
+        caller.Verify(provider => provider.PutAsync<bool>(requestUri, user, default), Times.Once);
     }