persisted grant

Author: brunobritodev

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

@@ -7,6 +7,7 @@
 using Jp.Domain.Commands.ApiResource;
 using Jp.Domain.Commands.Client;
 using Jp.Domain.Commands.IdentityResource;
+using Jp.Domain.Commands.PersistedGrant;
 using Jp.Domain.Commands.User;
 using Jp.Domain.Commands.UserManagement;
 
@@ -16,6 +17,11 @@ public class ViewModelToDomainMappingProfile : Profile
     {
         public ViewModelToDomainMappingProfile()
         {
+            /*
+             * Persisted grant
+             */
+            CreateMap<RemovePersistedGrantViewModel, RemovePersistedGrantCommand>().ConstructUsing(c => new RemovePersistedGrantCommand(c.Key));
+
             /*
              * User Creation Commands
              */
@@ -70,8 +76,8 @@ public ViewModelToDomainMappingProfile()
             CreateMap<RemoveApiSecretViewModel, RemoveApiSecretCommand>().ConstructUsing(c => new RemoveApiSecretCommand(c.Id, c.ResourceName));
 
             CreateMap<RemoveApiScopeViewModel, RemoveApiScopeCommand>().ConstructUsing(c => new RemoveApiScopeCommand(c.Id, c.ResourceName));
-            CreateMap<SaveApiScopeViewModel, SaveApiScopeCommand>().ConstructUsing(c => new SaveApiScopeCommand(c.ResourceName,c.Name, c.Description, c.DisplayName, c.Emphasize, c.ShowInDiscoveryDocument, c.UserClaims));
-            
+            CreateMap<SaveApiScopeViewModel, SaveApiScopeCommand>().ConstructUsing(c => new SaveApiScopeCommand(c.ResourceName, c.Name, c.Description, c.DisplayName, c.Emphasize, c.ShowInDiscoveryDocument, c.UserClaims));
+
 
         }
     }

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

@@ -1,14 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
-using IdentityServer4.Models;
 using Jp.Application.ViewModels;
 
 namespace Jp.Application.Interfaces
 {
     public interface IPersistedGrantAppService: IDisposable
     {
-        Task<IEnumerable<PersistedGrant>> GetPersistedGrants();
+        Task<IEnumerable<PersistedGrantViewModel>> GetPersistedGrants();
+        Task Remove(RemovePersistedGrantViewModel model);
     }
 }

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

@@ -1,13 +1,13 @@
 using AutoMapper;
 using Jp.Application.Interfaces;
+using Jp.Application.ViewModels;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using IdentityServer4.EntityFramework.Mappers;
-using IdentityServer4.Models;
+using Jp.Domain.Commands.PersistedGrant;
 
 namespace Jp.Application.Services
 {
@@ -16,24 +16,36 @@ public class PersistedGrantAppService : IPersistedGrantAppService
         private IMapper _mapper;
         private IEventStoreRepository _eventStoreRepository;
         private readonly IPersistedGrantRepository _persistedGrantRepository;
+        private readonly IUserService _userService;
         public IMediatorHandler Bus { get; set; }
 
         public PersistedGrantAppService(IMapper mapper,
             IMediatorHandler bus,
             IEventStoreRepository eventStoreRepository,
-            IPersistedGrantRepository persistedGrantRepository)
+            IPersistedGrantRepository persistedGrantRepository,
+            IUserService userService)
         {
             _mapper = mapper;
             Bus = bus;
             _eventStoreRepository = eventStoreRepository;
             _persistedGrantRepository = persistedGrantRepository;
+            _userService = userService;
         }
 
-        public async Task<IEnumerable<PersistedGrant>> GetPersistedGrants()
+        public async Task<IEnumerable<PersistedGrantViewModel>> GetPersistedGrants()
         {
             var resultado = await _persistedGrantRepository.GetGrants();
-            return resultado.Select(s => s.ToModel());
+            var subjects = await _userService.GetByIdAsync(resultado.Select(s => s.SubjectId).ToArray());
+            return resultado.Select(s => new PersistedGrantViewModel(s.Key, s.Type, s.SubjectId, s.ClientId, s.CreationTime, s.Expiration, s.Data, subjects.FirstOrDefault(f => f.Id.ToString().ToLower() == s.SubjectId.ToLower())?.Email, subjects.FirstOrDefault(f => f.Id.ToString().ToLower() == s.SubjectId.ToLower())?.Picture));
         }
+
+        public Task Remove(RemovePersistedGrantViewModel model)
+        {
+            // kiss
+            var command = _mapper.Map<RemovePersistedGrantCommand>(model);
+            return Bus.SendCommand(command);
+        }
+
         public void Dispose()
         {
             GC.SuppressFinalize(this);

src/Backend/Jp.Application/ViewModels/ApiResouceViewModels/RemoveApiResourceViewModel.cs

@@ -1,11 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Jp.Application.ViewModels.IdentityResourceViewModels
+namespace Jp.Application.ViewModels.ApiResouceViewModels
 {
     public class RemoveApiResourceViewModel
     {
         [Required]
         public string Name { get; set; }
     }
-
 }

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

@@ -0,0 +1,81 @@
+using System;
+using IdentityServer4.Models;
+using Jp.Domain.Interfaces;
+
+namespace Jp.Application.ViewModels
+{
+    public class PersistedGrantViewModel
+    {
+        /// <summary>
+        /// Gets or sets the key.
+        /// </summary>
+        /// <value>
+        /// The key.
+        /// </value>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Gets the type.
+        /// </summary>
+        /// <value>
+        /// The type.
+        /// </value>
+        public string Type { get; set; }
+
+        /// <summary>
+        /// Gets the subject identifier.
+        /// </summary>
+        /// <value>
+        /// The subject identifier.
+        /// </value>
+        public string SubjectId { get; set; }
+
+        /// <summary>
+        /// Gets the client identifier.
+        /// </summary>
+        /// <value>
+        /// The client identifier.
+        /// </value>
+        public string ClientId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the creation time.
+        /// </summary>
+        /// <value>
+        /// The creation time.
+        /// </value>
+        public DateTime CreationTime { get; set; }
+
+        /// <summary>
+        /// Gets or sets the expiration.
+        /// </summary>
+        /// <value>
+        /// The expiration.
+        /// </value>
+        public DateTime? Expiration { get; set; }
+
+        public string Email { get; }
+        public string Picture { get; }
+
+        /// <summary>
+        /// Gets or sets the data.
+        /// </summary>
+        /// <value>
+        /// The data.
+        /// </value>
+        public string Data { get; set; }
+        public PersistedGrantViewModel() { }
+        public PersistedGrantViewModel(string key, string type, string subjectId, string clientId, DateTime creationTime, DateTime? expiration, string data, string email, string picture)
+        {
+            Key = key;
+            Type = type;
+            SubjectId = subjectId;
+            ClientId = clientId;
+            CreationTime = creationTime;
+            Expiration = expiration;
+            Data = data;
+            Email = email;
+            Picture = picture;
+        }
+    }
+}

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

@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Jp.Application.ViewModels
+{
+    public class RemovePersistedGrantViewModel
+    {
+        [Required]
+        public string Key { get; set; }
+    }
+}

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

@@ -12,7 +12,7 @@
 namespace Jp.Domain.CommandHandlers
 {
     public class PersistedGrantCommandHandler : CommandHandler,
-        IRequestHandler<RegisterPersistedGrantCommand>
+        IRequestHandler<RemovePersistedGrantCommand>
     {
         private readonly IPersistedGrantRepository _persistedGrantRepository;
 
@@ -26,7 +26,7 @@ public PersistedGrantCommandHandler(
         }
 
 
-        public async Task Handle(RegisterPersistedGrantCommand request, CancellationToken cancellationToken)
+        public async Task Handle(RemovePersistedGrantCommand request, CancellationToken cancellationToken)
         {
             if (!request.IsValid())
             {
@@ -35,13 +35,12 @@ public async Task Handle(RegisterPersistedGrantCommand request, CancellationToke
             }
 
 			// Businness logic here
-			
-            //if (Commit())
-            //{
-            //   await Bus.RaiseEvent(new PersistedGrantRegisteredEvent(PersistedGrant.Id));
-            //}
+			_persistedGrantRepository.Remove(request.Key);
 
-            return;
+            if (Commit())
+            {
+               await Bus.RaiseEvent(new PersistedGrantRemovedEvent(request.Key));
+            }
         }
 
     }

src/Backend/Jp.Domain/Commands/PersistedGrant/PersistedGrantCommand.cs

@@ -1,12 +1,12 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.Text;
 using Jp.Domain.Core.Commands;
 
 namespace Jp.Domain.Commands.PersistedGrant
 {
     public abstract class PersistedGrantCommand : Command
     {
-
-        
-
+        public string Key { get; set; }
     }
-}
+}

src/Backend/Jp.Domain/Commands/PersistedGrant/RemovePersistedGrantCommand.cs

@@ -4,9 +4,10 @@ namespace Jp.Domain.Commands.PersistedGrant
 {
     public class RemovePersistedGrantCommand : PersistedGrantCommand
     {
-        public RemovePersistedGrantCommand()
+
+        public RemovePersistedGrantCommand(string key)
         {
-           
+            Key = key;
         }
 
         public override bool IsValid()

src/Backend/Jp.Domain/EventHandlers/PersistedGrantEventHandler.cs

@@ -7,9 +7,9 @@ namespace Jp.Domain.EventHandlers
 {
 
     public class PersistedGrantEventHandler :
-        INotificationHandler<PersistedGrantRegisteredEvent>
+        INotificationHandler<PersistedGrantRemovedEvent>
     {
-        public Task Handle(PersistedGrantRegisteredEvent notification, CancellationToken cancellationToken)
+        public Task Handle(PersistedGrantRemovedEvent notification, CancellationToken cancellationToken)
         {
             return Task.CompletedTask;
         }