logins

Author: brunobritodev

src/Backend/Jp.Application/AutoMapper/DomainToViewModelMappingProfile.cs

@@ -2,13 +2,13 @@
 using IdentityServer4.Models;
 using Jp.Application.EventSourcedNormalizers;
 using Jp.Application.ViewModels;
+using Jp.Application.ViewModels.ApiResouceViewModels;
 using Jp.Application.ViewModels.ClientsViewModels;
 using Jp.Application.ViewModels.IdentityResourceViewModels;
+using Jp.Application.ViewModels.UserViewModels;
 using Jp.Domain.Core.Events;
 using Jp.Domain.Models;
 using System.Globalization;
-using Jp.Application.ViewModels.ApiResouceViewModels;
-using Jp.Application.ViewModels.UserViewModels;
 
 namespace Jp.Application.AutoMapper
 {
@@ -17,7 +17,9 @@ public class DomainToViewModelMappingProfile : Profile
         public DomainToViewModelMappingProfile()
         {
             CreateMap<ApiResource, ApiResourceListViewModel>();
-            CreateMap<User, UserViewModel>(MemberList.Destination);
+            CreateMap<User, UserViewModel>(MemberList.Destination);//.ForMember(x => x.LockoutEnd, opt => opt.MapFrom(src => src.LockoutEnd != null ? src.LockoutEnd.Value.DateTime.ToShortDateString() : string.Empty));
+            CreateMap<User, UserListViewModel>(MemberList.Destination);
+
             CreateMap<StoredEvent, EventHistoryData>().ConstructUsing(a => new EventHistoryData() { Action = a.MessageType, Id = a.Id.ToString(), Details = a.Data, When = a.Timestamp.ToString(CultureInfo.InvariantCulture), Who = a.User });
             CreateMap<Client, ClientListViewModel>(MemberList.Destination);
             CreateMap<IdentityServer4.EntityFramework.Entities.Secret, SecretViewModel>(MemberList.Destination);

src/Backend/Jp.Application/AutoMapper/ViewModelToDomainMappingProfile.cs

@@ -11,6 +11,7 @@
 using Jp.Domain.Commands.PersistedGrant;
 using Jp.Domain.Commands.User;
 using Jp.Domain.Commands.UserManagement;
+using System;
 
 namespace Jp.Application.AutoMapper
 {
@@ -38,6 +39,7 @@ public ViewModelToDomainMappingProfile()
              * User Management commands
              */
             CreateMap<UserViewModel, UpdateProfileCommand>().ConstructUsing(c => new UpdateProfileCommand(c.Id, c.Url, c.Bio, c.Company, c.JobTitle, c.Name, c.PhoneNumber));
+            CreateMap<UserViewModel, UpdateUserCommand>().ConstructUsing(c => new UpdateUserCommand(c.Email, c.UserName, c.Name, c.PhoneNumber, c.EmailConfirmed, c.PhoneNumberConfirmed, c.TwoFactorEnabled, c.LockoutEnd, c.LockoutEnabled, c.AccessFailedCount));
             CreateMap<ProfilePictureViewModel, UpdateProfilePictureCommand>().ConstructUsing(c => new UpdateProfilePictureCommand(c.Id));
 
             CreateMap<ChangePasswordViewModel, ChangePasswordCommand>().ConstructUsing(c => new ChangePasswordCommand(c.Id, c.OldPassword, c.NewPassword, c.ConfirmPassword));

src/Backend/Jp.Application/Interfaces/IUserAppService.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Threading.Tasks;
-using Jp.Application.ViewModels;
+using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.UserViewModels;
-using Jp.Domain.Models;
+using System;
+using System.Threading.Tasks;
 
 namespace Jp.Application.Interfaces
 {

src/Backend/Jp.Application/Interfaces/IUserManageAppService.cs

@@ -17,8 +17,10 @@ public interface IUserManageAppService : IDisposable
         Task RemoveAccount(RemoveAccountViewModel model);
         Task<bool> HasPassword(Guid userId);
         IEnumerable<EventHistoryData> GetHistoryLogs(Guid value);
-        Task<IEnumerable<UserViewModel>> GetUsers();
+        Task<IEnumerable<UserListViewModel>> GetUsers();
         Task<UserViewModel> GetUserDetails(string username);
         Task<UserViewModel> GetUserAsync(Guid value);
+        Task UpdateUser(UserViewModel model);
+
     }
 }

src/Backend/Jp.Application/Services/UserAppService.cs

@@ -98,6 +98,7 @@ public async Task<RegisterUserViewModel> FindByLoginAsync(string provider, strin
             return _mapper.Map<RegisterUserViewModel>(model);
         }
 
+     
 
         public void Dispose()
         {

src/Backend/Jp.Application/Services/UserManagerAppService.cs

@@ -6,6 +6,7 @@
 using Jp.Application.Interfaces;
 using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.UserViewModels;
+using Jp.Domain.Commands.User;
 using Jp.Domain.Commands.UserManagement;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
@@ -83,10 +84,10 @@ public IEnumerable<EventHistoryData> GetHistoryLogs(Guid id)
             return history;
         }
 
-        public async Task<IEnumerable<UserViewModel>> GetUsers()
+        public async Task<IEnumerable<UserListViewModel>> GetUsers()
         {
             var users = await _userService.GetUsers();
-            return _mapper.Map<IEnumerable<UserViewModel>>(users);
+            return _mapper.Map<IEnumerable<UserListViewModel>>(users);
         }
 
         public async Task<UserViewModel> GetUserDetails(string username)
@@ -100,6 +101,12 @@ public async Task<UserViewModel> GetUserAsync(Guid value)
             var users = await _userService.GetUserAsync(value);
             return _mapper.Map<UserViewModel>(users);
         }
+
+        public Task UpdateUser(UserViewModel model)
+        {
+            var command = _mapper.Map<UpdateUserCommand>(model);
+            return Bus.SendCommand(command);
+        }
     }
 }
 

src/Backend/Jp.Application/ViewModels/UserViewModels/UserListViewModel.cs

@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Jp.Application.ViewModels.UserViewModels
+{
+    public class UserListViewModel
+    {
+        [Required]
+        [EmailAddress]
+        [Display(Name = "Email")]
+        public string Email { get; set; }
+
+        public string Name { get; set; }
+
+        [Display(Name = "Picture")]
+        public string Picture { get; set; }
+
+        [Display(Name = "UserName")]
+        public string UserName { get; set; }
+    }
+}

src/Backend/Jp.Application/ViewModels/UserViewModels/UserViewModel.cs

@@ -10,21 +10,19 @@ public class UserViewModel
         [Display(Name = "Email")]
         public string Email { get; set; }
 
-        [Phone]
-        [Display(Name = "Telephone")]
-        public string PhoneNumber { get; set; }
+        [Phone] [Display(Name = "Telephone")] public string PhoneNumber { get; set; }
 
         [Required]
         [Display(Name = "Username")]
         public string Name { get; set; }
 
 
-        [Display(Name = "Picture")]
-        public string Picture { get; set; }
+        [Display(Name = "Picture")] public string Picture { get; set; }
 
         [Required]
         [Display(Name = "Username")]
         public string UserName { get; set; }
+
         public string Url { get; set; }
         public string Company { get; set; }
         public string Bio { get; set; }

src/Backend/Jp.Domain/CommandHandlers/UserCommandHandler.cs

@@ -137,6 +137,7 @@ public async Task Handle(ConfirmEmailCommand request, CancellationToken cancella
             if (result.HasValue)
                 await Bus.RaiseEvent(new EmailConfirmedEvent(request.Email, request.Code, result.Value));
         }
+
     }
 
 

src/Backend/Jp.Domain/CommandHandlers/UserManagementCommandHandler.cs

@@ -1,5 +1,6 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Jp.Domain.Commands.User;
 using Jp.Domain.Commands.UserManagement;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Core.Notifications;
@@ -14,7 +15,8 @@ public class UserManagementCommandHandler : CommandHandler,
         IRequestHandler<UpdateProfilePictureCommand>,
         IRequestHandler<SetPasswordCommand>,
         IRequestHandler<ChangePasswordCommand>,
-        IRequestHandler<RemoveAccountCommand>
+        IRequestHandler<RemoveAccountCommand>,
+        IRequestHandler<UpdateUserCommand>
     {
         private readonly IUserService _userService;
 
@@ -92,5 +94,32 @@ public async Task Handle(RemoveAccountCommand request, CancellationToken cancell
             if (result)
                 await Bus.RaiseEvent(new AccountRemovedEvent(request.Id.Value));
         }
+
+
+        public async Task Handle(UpdateUserCommand request, CancellationToken cancellationToken)
+        {
+            if (!request.IsValid())
+            {
+                NotifyValidationErrors(request);
+                return;
+            }
+
+            var user = await _userService.FindByNameAsync(request.Username);
+            if (user == null)
+            {
+                await Bus.RaiseEvent(new DomainNotification("1", "User not found"));
+                return;
+            }
+            user.Email = request.Email;
+            user.EmailConfirmed = request.EmailConfirmed;
+            user.AccessFailedCount = request.AccessFailedCount;
+            user.LockoutEnabled = request.LockoutEnabled;
+            user.LockoutEnd = request.LockoutEnd;
+            user.Name = request.Name;
+            user.TwoFactorEnabled = request.TwoFactorEnabled;
+            user.PhoneNumber = request.PhoneNumber;
+            user.PhoneNumberConfirmed = request.PhoneNumberConfirmed;
+            await _userService.UpdateUserAsync(user);
+        }
     }
 }