Update user events

Core/Services/UserService.cs

@@ -36,9 +36,9 @@ public async Task<User> GetUserByEmail(string email)
         return user;
     }
 
-    public async Task<GetUserDto?> UpdateUser(UpdateUserDto updateUserDto)
+    public async Task<GetUserDto?> UpdateUser(UpdateUserDto updateUserDto, string email)
     {
-        var userToUpdate = await userRepository.GetUserByEmail(updateUserDto.UserEmail);
+        var userToUpdate = await userRepository.GetUserByEmail(email);
         if (userToUpdate == null) return null;
 
         if (updateUserDto.Username != null && !updateUserDto.Username.Equals(string.Empty))
@@ -49,7 +49,7 @@ public async Task<User> GetUserByEmail(string email)
         var currentBlobUrl = userToUpdate.BlobUrl;
         if (updateUserDto.Base64Image != null)
         {
-            updateUserDto.BlobUrl = await blobStorageService.SaveImageToBlobStorage(updateUserDto.Base64Image, updateUserDto.UserEmail, currentBlobUrl);
+            updateUserDto.BlobUrl = await blobStorageService.SaveImageToBlobStorage(updateUserDto.Base64Image, email, currentBlobUrl);
         }
 
         return await userRepository.UpdateUser(userToUpdate, updateUserDto.Password);

Shared/Dtos/FromClient/UpdateUserDto.cs

@@ -4,8 +4,7 @@ namespace Shared.Dtos.FromClient;
 
 public class UpdateUserDto
 {
-    [EmailAddress] public string UserEmail { get; set; } = null!;
-    [MaxLength(50)] public string? Username { get; set; }
+    [MinLength(1)] [MaxLength(50)] public string? Username { get; set; }
     [MinLength(8)] [MaxLength(256)] public string? Password { get; set; }
     public string? Base64Image { get; set; }
     public string? BlobUrl { get; set; }

api/Events/User/ClientWantsToUpdateProfile.cs

@@ -16,23 +16,47 @@ public class ClientWantsToUpdateUserDto : BaseDtoWithJwt
 }
 
 [ValidateDataAnnotations]
-public class ClientWantsToUpdateProfile (UserService userService) : BaseEventHandler<ClientWantsToUpdateUserDto>
+public class ClientWantsToUpdateProfile (UserService userService, JwtService jwtService) : BaseEventHandler<ClientWantsToUpdateUserDto>
 {
     public override async Task Handle(ClientWantsToUpdateUserDto dto, IWebSocketConnection socket)
     {
-        var getUserDto = await userService.UpdateUser(dto.UpdateUserDto);
-        if (getUserDto == null)
+        var email = jwtService.GetEmailFromJwt(dto.Jwt);
+        var getUserDto = await userService.UpdateUser(dto.UpdateUserDto, email);
+
+        if (getUserDto != null)
         {
-            throw new AppException("Failed to update user.");
+            socket.SendDto(new ServerConfirmsUpdate
+            {
+                GetUserDto = getUserDto
+            });
         }
-        socket.SendDto(new ServerConfirmsUpdate
+        else
         {
-            GetUserDto = getUserDto
-        });
+            var user = await userService.GetUserByEmail(email);
+
+            if (user == null) throw new NotFoundException("User not found");
+
+            socket.SendDto(new ServerRejectsUpdate
+            {
+                ErrorMessage = "Update failed",
+                GetUserDto =new GetUserDto
+                {
+                    UserEmail = email,
+                    Username = user.UserName,
+                    BlobUrl = user.BlobUrl
+                }
+            });
+        }
     }
 }
 
 public class ServerConfirmsUpdate : BaseDto
 {
-    public GetUserDto? GetUserDto { get; set; } = null!;
+    public GetUserDto GetUserDto { get; set; } = null!;
+}
+
+public class ServerRejectsUpdate : BaseDto
+{
+    public string ErrorMessage { get; set; } = null!;
+    public GetUserDto? GetUserDto { get; set; }
 }