Bug fix - Clone and change clientId

Author: brunobritodev

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

@@ -54,7 +54,7 @@ public ViewModelToDomainMappingProfile()
             /*
              * Client commands
              */
-            CreateMap<Client, UpdateClientCommand>().ConstructUsing(c => new UpdateClientCommand(c));
+            CreateMap<ClientViewModel, UpdateClientCommand>().ConstructUsing(c => new UpdateClientCommand(c, c.OldClientId));
             CreateMap<RemoveClientSecretViewModel, RemoveClientSecretCommand>().ConstructUsing(c => new RemoveClientSecretCommand(c.Id, c.ClientId));
             CreateMap<RemovePropertyViewModel, RemovePropertyCommand>().ConstructUsing(c => new RemovePropertyCommand(c.Id, c.ClientId));
             CreateMap<SaveClientSecretViewModel, SaveClientSecretCommand>().ConstructUsing(c => new SaveClientSecretCommand(c.ClientId, c.Description, c.Value, c.Type, c.Expiration, (int)c.Hash.GetValueOrDefault(HashType.Sha256)));
@@ -64,7 +64,7 @@ public ViewModelToDomainMappingProfile()
             CreateMap<RemoveClientViewModel, RemoveClientCommand>().ConstructUsing(c => new RemoveClientCommand(c.ClientId));
             CreateMap<CopyClientViewModel, CopyClientCommand>().ConstructUsing(c => new CopyClientCommand(c.ClientId));
             CreateMap<SaveClientViewModel, SaveClientCommand>().ConstructUsing(c => new SaveClientCommand(c.ClientId, c.ClientName, c.ClientUri, c.LogoUri, c.Description, c.ClientType));
-
+            
             /*
              * Identity Resource commands
              */

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

@@ -11,7 +11,7 @@ public interface IClientAppService: IDisposable
     {
         Task<IEnumerable<ClientListViewModel>> GetClients();
         Task<Client> GetClientDetails(string clientId);
-        Task Update(Client client);
+        Task Update(ClientViewModel client);
         Task<IEnumerable<SecretViewModel>> GetSecrets(string clientId);
         Task RemoveSecret(RemoveClientSecretViewModel model);
         Task SaveSecret(SaveClientSecretViewModel model);

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

@@ -53,7 +53,7 @@ public async Task<Client> GetClientDetails(string clientId)
             return _mapper.Map<Client>(resultado);
         }
 
-        public Task Update(Client client)
+        public Task Update(ClientViewModel client)
         {
             var registerCommand = _mapper.Map<UpdateClientCommand>(client);
             return Bus.SendCommand(registerCommand);

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

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations;
+using IdentityServer4.Models;
+
+namespace Jp.Application.ViewModels.ClientsViewModels
+{
+    public class ClientViewModel : Client
+    {
+        [Required]
+        public string OldClientId { get; set; }
+    }
+}

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

@@ -78,7 +78,7 @@ public async Task Handle(UpdateClientCommand request, CancellationToken cancella
             }
 
             // Businness logic here
-            var savedClient = await _clientRepository.GetClient(request.Client.ClientId);
+            var savedClient = await _clientRepository.GetClient(request.OldClientId);
             if (savedClient == null)
             {
                 await Bus.RaiseEvent(new DomainNotification("1", "Client not found"));

src/Backend/Jp.Domain/Commands/Client/ClientCommand.cs

@@ -6,6 +6,6 @@ namespace Jp.Domain.Commands.Client
     public abstract class ClientCommand : Command
     {
         public IdentityServer4.Models.Client Client { get; set; }
-       
+        public string OldClientId { get; set; }
     }
 }

src/Backend/Jp.Domain/Commands/Client/UpdateClientCommand.cs

@@ -4,8 +4,11 @@ namespace Jp.Domain.Commands.Client
 {
     public class UpdateClientCommand : ClientCommand
     {
-        public UpdateClientCommand(IdentityServer4.Models.Client client)
+        
+
+        public UpdateClientCommand(IdentityServer4.Models.Client client, string oldClientId)
         {
+            OldClientId = oldClientId;
             this.Client = client;
         }
 

src/Backend/Jp.Domain/Validations/Client/ClientValidations.cs

@@ -16,6 +16,11 @@ protected void ValidateClientId()
             RuleFor(c => c.Client.ClientId).NotEmpty().WithMessage("ClientId must be set");
         }
 
+        protected void ValidateOldClientId()
+        {
+            RuleFor(c => c.OldClientId).NotEmpty().WithMessage("Last ClientId must be set");
+        }
+
         protected void ValidateClientName()
         {
             RuleFor(c => c.Client.ClientName).NotEmpty().WithMessage("Client Name must be set");

src/Backend/Jp.Domain/Validations/Client/UpdateClientCommandValidation.cs

@@ -7,6 +7,7 @@ public class UpdateClientCommandValidation : ClientValidation<UpdateClientComman
         public UpdateClientCommandValidation()
         {
             ValidateGrantType();
+            ValidateOldClientId();
         }
     }
 }

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

@@ -49,7 +49,7 @@ public async Task<ActionResult<DefaultResponse<bool>>> Save([FromBody] SaveClien
 
         [HttpPost, Route("update"), Authorize(Policy = "Admin")
         ]
-        public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] Client client)
+        public async Task<ActionResult<DefaultResponse<bool>>> Update([FromBody] ClientViewModel client)
         {
             if (!ModelState.IsValid)
             {