users claims

Author: brunobritodev

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

@@ -9,6 +9,7 @@
 using Jp.Domain.Core.Events;
 using Jp.Domain.Models;
 using System.Globalization;
+using System.Security.Claims;
 
 namespace Jp.Application.AutoMapper
 {
@@ -24,9 +25,10 @@ public DomainToViewModelMappingProfile()
             CreateMap<Client, ClientListViewModel>(MemberList.Destination);
             CreateMap<IdentityServer4.EntityFramework.Entities.Secret, SecretViewModel>(MemberList.Destination);
             CreateMap<IdentityServer4.EntityFramework.Entities.ClientProperty, ClientPropertyViewModel>();
-            CreateMap<IdentityServer4.EntityFramework.Entities.ClientClaim, ClientClaimViewModel>();
+            CreateMap<IdentityServer4.EntityFramework.Entities.ClientClaim, ClaimViewModel>();
             CreateMap<IdentityServer4.EntityFramework.Entities.IdentityResource, IdentityResourceListView>(MemberList.Destination);
             CreateMap<IdentityServer4.EntityFramework.Entities.ApiScope, ScopeViewModel>(MemberList.Destination);
+            CreateMap<Claim, ClaimViewModel>(MemberList.Destination);
         }
     }
 }

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

@@ -11,7 +11,6 @@
 using Jp.Domain.Commands.PersistedGrant;
 using Jp.Domain.Commands.User;
 using Jp.Domain.Commands.UserManagement;
-using System;
 
 namespace Jp.Application.AutoMapper
 {
@@ -34,17 +33,17 @@ public ViewModelToDomainMappingProfile()
             CreateMap<ResetPasswordViewModel, ResetPasswordCommand>().ConstructUsing(c => new ResetPasswordCommand(c.Password, c.ConfirmPassword, c.Code, c.Email));
             CreateMap<ConfirmEmailViewModel, ConfirmEmailCommand>().ConstructUsing(c => new ConfirmEmailCommand(c.Code, c.Email));
 
-
             /*
              * 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));
             CreateMap<SetPasswordViewModel, SetPasswordCommand>().ConstructUsing(c => new SetPasswordCommand(c.Id, c.NewPassword, c.ConfirmPassword));
             CreateMap<RemoveAccountViewModel, RemoveAccountCommand>().ConstructUsing(c => new RemoveAccountCommand(c.Id));
+            CreateMap<SaveUserClaimViewModel, SaveUserClaimCommand>().ConstructUsing(c => new SaveUserClaimCommand(c.Username, c.Type, c.Value));
+            CreateMap<RemoveUserClaimViewModel, RemoveUserClaimCommand>().ConstructUsing(c => new RemoveUserClaimCommand(c.Username, c.Type));
 
             /*
              * Client commands

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

@@ -18,7 +18,7 @@ public interface IClientAppService: IDisposable
         Task<IEnumerable<ClientPropertyViewModel>> GetProperties(string clientId);
         Task RemoveProperty(RemovePropertyViewModel model);
         Task SaveProperty(SaveClientPropertyViewModel model);
-        Task<IEnumerable<ClientClaimViewModel>> GetClaims(string clientId);
+        Task<IEnumerable<ClaimViewModel>> GetClaims(string clientId);
         Task RemoveClaim(RemoveClientClaimViewModel model);
         Task SaveClaim(SaveClientClaimViewModel model);
         //Task Save(SaveClientViewModel client);

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

@@ -22,5 +22,8 @@ public interface IUserManageAppService : IDisposable
         Task<UserViewModel> GetUserAsync(Guid value);
         Task UpdateUser(UserViewModel model);
 
+        Task<IEnumerable<ClaimViewModel>> GetClaims(string userName);
+        Task SaveClaim(SaveUserClaimViewModel model);
+        Task RemoveClaim(RemoveUserClaimViewModel model);
     }
 }

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

@@ -92,9 +92,9 @@ public Task SaveProperty(SaveClientPropertyViewModel model)
             return Bus.SendCommand(registerCommand);
         }
 
-        public async Task<IEnumerable<ClientClaimViewModel>> GetClaims(string clientId)
+        public async Task<IEnumerable<ClaimViewModel>> GetClaims(string clientId)
         {
-            return _mapper.Map<IEnumerable<ClientClaimViewModel>>(await _clientClaimRepository.GetByClientId(clientId));
+            return _mapper.Map<IEnumerable<ClaimViewModel>>(await _clientClaimRepository.GetByClientId(clientId));
         }
 
         public Task RemoveClaim(RemoveClientClaimViewModel model)

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

@@ -10,7 +10,6 @@
 using Jp.Domain.Commands.UserManagement;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
-using Jp.Domain.Models;
 
 namespace Jp.Application.Services
 {
@@ -107,6 +106,23 @@ public Task UpdateUser(UserViewModel model)
             var command = _mapper.Map<UpdateUserCommand>(model);
             return Bus.SendCommand(command);
         }
+
+        public async Task<IEnumerable<ClaimViewModel>> GetClaims(string userName)
+        {
+            return _mapper.Map<IEnumerable<ClaimViewModel>>(await _userService.GetClaimByName(userName));
+        }
+
+        public Task SaveClaim(SaveUserClaimViewModel model)
+        {
+            var registerCommand = _mapper.Map<SaveUserClaimCommand>(model);
+            return Bus.SendCommand(registerCommand);
+        }
+
+        public Task RemoveClaim(RemoveUserClaimViewModel model)
+        {
+            var registerCommand = _mapper.Map<RemoveUserClaimCommand>(model);
+            return Bus.SendCommand(registerCommand);
+        }
     }
 }
 

src/Backend/Jp.Application/ViewModels/ClaimViewModel.cs

@@ -0,0 +1,9 @@
+namespace Jp.Application.ViewModels
+{
+    public class ClaimViewModel
+    {
+        public int Id { get; set; }
+        public string Type { get; set; }
+        public string Value { get; set; }
+    }
+}

src/Backend/Jp.Application/ViewModels/ClientsViewModels/ClientClaimViewModel.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Jp.Application.ViewModels.UserViewModels
+{
+    public class RemoveAccountViewModel
+    {
+        public Guid? Id { get; set; }
+    }
+}

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

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Jp.Application.ViewModels.UserViewModels
+{
+    public class RemoveUserClaimViewModel
+    {
+        [Required]
+        public string Type { get; set; }
+        [Required]
+        public string Username { get; set; }
+    }
+}