claim to remove

# Conflicts:
#	src/Backend/Jp.Infra.CrossCutting.Identity/Services/UserService.cs

Author: brunobritodev

.gitignore

@@ -193,7 +193,6 @@ ClientBin/
 *.publishsettings
 node_modules/
 orleans.codegen.cs
-package-lock.json
 
 # RIA/Silverlight projects
 Generated_Code/

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

@@ -46,7 +46,7 @@ public ViewModelToDomainMappingProfile()
             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));
+            CreateMap<RemoveUserClaimViewModel, RemoveUserClaimCommand>().ConstructUsing(c => new RemoveUserClaimCommand(c.Username, c.Type, c.Value));
             CreateMap<RemoveUserRoleViewModel, RemoveUserRoleCommand>().ConstructUsing(c => new RemoveUserRoleCommand(c.Username, c.Role));
             CreateMap<SaveUserRoleViewModel, SaveUserRoleCommand>().ConstructUsing(c => new SaveUserRoleCommand(c.Username, c.Role));
             CreateMap<RemoveUserLoginViewModel, RemoveUserLoginCommand>().ConstructUsing(c => new RemoveUserLoginCommand(c.Username, c.LoginProvider, c.ProviderKey));

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

@@ -8,5 +8,7 @@ public class RemoveUserClaimViewModel
         public string Type { get; set; }
         [Required]
         public string Username { get; set; }
+
+        public string Value { get; set; }
     }
 }

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

@@ -301,7 +301,6 @@ public async Task<bool> Handle(SaveClientCommand request, CancellationToken canc
         }
 
 
-
         public async Task<bool> Handle(CopyClientCommand request, CancellationToken cancellationToken)
         {
             if (!request.IsValid())
@@ -310,7 +309,7 @@ public async Task<bool> Handle(CopyClientCommand request, CancellationToken canc
                 return false;
             }
 
-            var savedClient = await _clientRepository.GetByClientId(request.Client.ClientId);
+            var savedClient = await _clientRepository.GetClient(request.Client.ClientId);
             if (savedClient == null)
             {
                 await Bus.RaiseEvent(new DomainNotification("Client", "Client not found"));

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

@@ -188,7 +188,7 @@ public async Task<bool> Handle(RemoveUserClaimCommand request, CancellationToken
                 return false;
             }
 
-            var success = await _userService.RemoveClaim(userDb.Id, request.Type);
+            var success = await _userService.RemoveClaim(userDb.Id, request.Type, request.Value);
 
             if (success)
             {

src/Backend/Jp.Domain/Commands/User/RemoveUserClaimCommand.cs

@@ -1,12 +1,13 @@
-using System;
 using Jp.Domain.Validations.User;
 
 namespace Jp.Domain.Commands.User
 {
     public class RemoveUserClaimCommand : UserClaimCommand
     {
-        public RemoveUserClaimCommand(string username, string type)
+
+        public RemoveUserClaimCommand(string username, string type, string value)
         {
+            Value = value;
             Type = type;
             Username = username;
         }

src/Backend/Jp.Domain/Interfaces/IUserService.cs

@@ -35,7 +35,7 @@ public interface IUserService
         Task UpdateUserAsync(User user);
         Task<IEnumerable<Claim>> GetClaimByName(string userName);
         Task<bool> SaveClaim(Guid userId, Claim claim);
-        Task<bool> RemoveClaim(Guid userId, string claimType);
+        Task<bool> RemoveClaim(Guid userId, string claimType, string value);
         Task<IEnumerable<string>> GetRoles(string userName);
         Task<bool> RemoveRole(Guid userDbId, string requestRole);
         Task<bool> SaveRole(Guid userId, string role);

src/Backend/Jp.Infra.CrossCutting.Identity/Services/UserService.cs

@@ -464,11 +464,15 @@ public async Task<bool> SaveClaim(Guid userDbId, Claim claim)
             return result.Succeeded;
         }
 
-        public async Task<bool> RemoveClaim(Guid userId, string type)
+        public async Task<bool> RemoveClaim(Guid userId, string claimType, string value)
         {
             var user = await _userManager.FindByIdAsync(userId.ToString());
             var claims = await _userManager.GetClaimsAsync(user);
-            var claimToRemove = claims.First(c => c.Type == type);
+
+            var claimToRemove = string.IsNullOrEmpty(value) ?
+                                    claims.First(c => c.Type.Equals(claimType)) :
+                                    claims.First(c => c.Type.Equals(claimType) && c.Value.Equals(value));
+
             var result = await _userManager.RemoveClaimAsync(user, claimToRemove);
 
             foreach (var error in result.Errors)

src/Backend/Jp.UserManagement/Controllers/UserAdminController.cs

@@ -58,7 +58,6 @@ public async Task<ActionResult<DefaultResponse<UserViewModel>>> Details(string u
             return Response(irs);
         }
 
-
         [HttpPut, Route("{username}/update"), Authorize(Policy = "Admin")]
         public async Task<ActionResult<DefaultResponse<bool>>> Update(string username, [FromBody] UserViewModel model)
         {

src/Backend/Jp.UserManagement/Controllers/UserController.cs

@@ -1,12 +1,12 @@
-using System.Threading.Tasks;
-using Jp.Application.Interfaces;
+using Jp.Application.Interfaces;
 using Jp.Application.ViewModels.UserViewModels;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Core.Notifications;
 using Jp.Infra.CrossCutting.Tools.Model;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
 
 namespace Jp.Management.Controllers
 {
@@ -37,6 +37,20 @@ public async Task<ActionResult<DefaultResponse<bool>>> Register([FromBody] Regis
             return Response(true);
         }
 
+        [HttpPost, Route("add-user")]
+        public async Task<ActionResult<DefaultResponse<bool>>> AddUser([FromBody] RegisterUserViewModel model)
+        {
+            if (!ModelState.IsValid)
+            {
+                NotifyModelStateErrors();
+                return Response(false);
+            }
+
+            await _userAppService.Register(model);
+
+            return Response(true);
+        }
+
         [HttpPost, Route("register-provider")]
         public async Task<ActionResult<DefaultResponse<bool>>> RegisterWithProvider([FromBody] RegisterUserViewModel model)
         {
@@ -109,6 +123,6 @@ public async Task<ActionResult<DefaultResponse<bool>>> ConfirmEmail([FromBody] C
             return Response(true);
         }
 
-        
+
     }
 }