api resource

Author: brunobritodev

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

@@ -7,6 +7,7 @@
 using Jp.Domain.Core.Events;
 using Jp.Domain.Models;
 using System.Globalization;
+using Jp.Application.ViewModels.ApiResouceViewModels;
 
 namespace Jp.Application.AutoMapper
 {
@@ -22,6 +23,7 @@ public DomainToViewModelMappingProfile()
             CreateMap<IdentityServer4.EntityFramework.Entities.ClientProperty, ClientPropertyViewModel>();
             CreateMap<IdentityServer4.EntityFramework.Entities.ClientClaim, ClientClaimViewModel>();
             CreateMap<IdentityServer4.EntityFramework.Entities.IdentityResource, IdentityResourceListView>(MemberList.Destination);
+            CreateMap<IdentityServer4.EntityFramework.Entities.ApiScope, ScopeViewModel>(MemberList.Destination);
         }
     }
 }

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

@@ -69,6 +69,9 @@ public ViewModelToDomainMappingProfile()
             CreateMap<SaveApiSecretViewModel, SaveApiSecretCommand>().ConstructUsing(c => new SaveApiSecretCommand(c.ResourceName, c.Description, c.Value, c.Type, c.Expiration, (int)c.Hash.GetValueOrDefault(HashType.Sha256)));
             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));
+            
 
         }
     }

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

@@ -1,16 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
 using IdentityServer4.Models;
 using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.ApiResouceViewModels;
-using Jp.Application.ViewModels.ClientsViewModels;
 using Jp.Application.ViewModels.IdentityResourceViewModels;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Jp.Application.Interfaces
 {
-    public interface IApiResourceAppService: IDisposable
+    public interface IApiResourceAppService : IDisposable
     {
         Task<IEnumerable<ApiResourceListViewModel>> GetApiResources();
         Task<ApiResource> GetDetails(string name);
@@ -20,5 +18,8 @@ public interface IApiResourceAppService: IDisposable
         Task<IEnumerable<SecretViewModel>> GetSecrets(string name);
         Task RemoveSecret(RemoveApiSecretViewModel model);
         Task SaveSecret(SaveApiSecretViewModel model);
+        Task<IEnumerable<ScopeViewModel>> GetScopes(string name);
+        Task RemoveScope(RemoveApiScopeViewModel model);
+        Task SaveScope(SaveApiScopeViewModel model);
     }
 }

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

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using IdentityServer4.EntityFramework.Mappers;
 using IdentityServer4.Models;
@@ -12,6 +8,10 @@
 using Jp.Domain.Commands.ApiResource;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Jp.Application.Services
 {
@@ -21,25 +21,28 @@ public class ApiResourceAppService : IApiResourceAppService
         private IEventStoreRepository _eventStoreRepository;
         private readonly IApiResourceRepository _apiResourceRepository;
         private readonly IApiSecretRepository _secretRepository;
+        private readonly IApiScopeRepository _apiScopeRepository;
         public IMediatorHandler Bus { get; set; }
 
         public ApiResourceAppService(IMapper mapper,
             IMediatorHandler bus,
             IEventStoreRepository eventStoreRepository,
             IApiResourceRepository apiResourceRepository,
-            IApiSecretRepository secretRepository)
+            IApiSecretRepository secretRepository,
+            IApiScopeRepository apiScopeRepository)
         {
             _mapper = mapper;
             Bus = bus;
             _eventStoreRepository = eventStoreRepository;
             _apiResourceRepository = apiResourceRepository;
             _secretRepository = secretRepository;
+            _apiScopeRepository = apiScopeRepository;
         }
 
-        public Task<IEnumerable<ApiResourceListViewModel>> GetApiResources()
+        public async Task<IEnumerable<ApiResourceListViewModel>> GetApiResources()
         {
-            var resultado = _apiResourceRepository.GetAll().Select(s => _mapper.Map<ApiResourceListViewModel>(s)).ToList();
-            return Task.FromResult<IEnumerable<ApiResourceListViewModel>>(resultado);
+            var resultado = await _apiResourceRepository.GetResources();
+            return resultado.Select(s => _mapper.Map<ApiResourceListViewModel>(s)).ToList();
         }
 
         public async Task<ApiResource> GetDetails(string name)
@@ -84,6 +87,23 @@ public Task SaveSecret(SaveApiSecretViewModel model)
             return Bus.SendCommand(registerCommand);
         }
 
+        public async Task<IEnumerable<ScopeViewModel>> GetScopes(string name)
+        {
+            return _mapper.Map<IEnumerable<ScopeViewModel>>(await _apiScopeRepository.GetScopesByResource(name));
+        }
+
+        public Task RemoveScope(RemoveApiScopeViewModel model)
+        {
+            var registerCommand = _mapper.Map<RemoveApiScopeCommand>(model);
+            return Bus.SendCommand(registerCommand);
+        }
+
+
+        public Task SaveScope(SaveApiScopeViewModel model)
+        {
+            var registerCommand = _mapper.Map<SaveApiScopeCommand>(model);
+            return Bus.SendCommand(registerCommand);
+        }
 
         public void Dispose()
         {

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

@@ -14,14 +14,14 @@ public class ScopesAppService : IScopesAppService
         private IMapper _mapper;
         private IEventStoreRepository _eventStoreRepository;
         private readonly IIdentityResourceRepository _identityResourcesRepository;
-        private readonly IApiResourceRepository _apiResourceRepository;
+        private readonly IApiScopeRepository _apiResourceRepository;
         public IMediatorHandler Bus { get; set; }
 
         public ScopesAppService(IMapper mapper,
             IMediatorHandler bus,
             IEventStoreRepository eventStoreRepository,
             IIdentityResourceRepository identityResourcesRepository,
-            IApiResourceRepository apiResourceRepository)
+            IApiScopeRepository apiResourceRepository)
         {
             _mapper = mapper;
             Bus = bus;
@@ -38,9 +38,9 @@ public void Dispose()
 
         public async Task<IEnumerable<string>> GetScopes(string search)
         {
-            var identityScopes = await _identityResourcesRepository.GetScopes(search);
-            var apiScopes = await _apiResourceRepository.GetScopes(search);
-            identityScopes.AddRange(apiScopes);
+            var identityScopes = await _identityResourcesRepository.SearchScopes(search);
+            var apiScopes = await _apiResourceRepository.SearchScopes(search);
+            identityScopes.AddRange(apiScopes.Select(x => x.Name));
             return identityScopes.OrderBy(a => a);
         }
     }

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

@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-
-namespace Jp.Application.ViewModels
+namespace Jp.Application.ViewModels.ApiResouceViewModels
 {
     public class ApiResourceListViewModel
     {

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

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Jp.Application.ViewModels.ApiResouceViewModels
+{
+    public class RemoveApiScopeViewModel
+    {
+        [Required]
+        public int Id { get; set; }
+        [Required]
+        public string ResourceName { get; set; }
+    }
+}

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

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Jp.Application.ViewModels.ApiResouceViewModels
+{
+    public class SaveApiScopeViewModel
+    {
+        [Required]
+        public string ResourceName { get; set; }
+        /// <summary>
+        /// Name of the scope. This is the value a client will use to request the scope.
+        /// </summary>
+        [Required]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Display name. This value will be used e.g. on the consent screen.
+        /// </summary>
+        public string DisplayName { get; set; }
+
+        /// <summary>
+        /// Description. This value will be used e.g. on the consent screen.
+        /// </summary>
+        public string Description { get; set; }
+
+        /// <summary>
+        /// Specifies whether the user can de-select the scope on the consent screen. Defaults to false.
+        /// </summary>
+        public bool Required { get; set; } = false;
+
+        /// <summary>
+        /// Specifies whether the consent screen will emphasize this scope. Use this setting for sensitive or important scopes. Defaults to false.
+        /// </summary>
+        public bool Emphasize { get; set; } = false;
+
+        /// <summary>
+        /// Specifies whether this scope is shown in the discovery document. Defaults to true.
+        /// </summary>
+        public bool ShowInDiscoveryDocument { get; set; } = true;
+
+        public IEnumerable<string> UserClaims { get; set; } = new HashSet<string>();
+    }
+}

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

@@ -0,0 +1,9 @@
+namespace Jp.Application.ViewModels
+{
+    public class ScopeViewModel
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+    }
+}

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

@@ -1,14 +1,14 @@
-using System.Linq;
+using IdentityServer4.EntityFramework.Entities;
 using IdentityServer4.EntityFramework.Mappers;
 using Jp.Domain.Commands.ApiResource;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Core.Notifications;
 using Jp.Domain.Events.ApiResource;
 using Jp.Domain.Interfaces;
 using MediatR;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using IdentityServer4.EntityFramework.Entities;
 
 namespace Jp.Domain.CommandHandlers
 {
@@ -17,20 +17,25 @@ public class ApiResourceCommandHandler : CommandHandler,
         IRequestHandler<UpdateApiResourceCommand>,
         IRequestHandler<RemoveApiResourceCommand>,
         IRequestHandler<RemoveApiSecretCommand>,
-        IRequestHandler<SaveApiSecretCommand>
+        IRequestHandler<SaveApiSecretCommand>,
+        IRequestHandler<RemoveApiScopeCommand>,
+        IRequestHandler<SaveApiScopeCommand>
     {
         private readonly IApiResourceRepository _apiResourceRepository;
         private readonly IApiSecretRepository _apiSecretRepository;
+        private readonly IApiScopeRepository _apiScopeRepository;
 
         public ApiResourceCommandHandler(
             IUnitOfWork uow,
             IMediatorHandler bus,
             INotificationHandler<DomainNotification> notifications,
             IApiResourceRepository apiResourceService,
-            IApiSecretRepository apiSecretRepository) : base(uow, bus, notifications)
+            IApiSecretRepository apiSecretRepository,
+            IApiScopeRepository apiScopeRepository) : base(uow, bus, notifications)
         {
             _apiResourceRepository = apiResourceService;
             _apiSecretRepository = apiSecretRepository;
+            _apiScopeRepository = apiScopeRepository;
         }
 
 
@@ -168,5 +173,70 @@ public async Task Handle(SaveApiSecretCommand request, CancellationToken cancell
                 await Bus.RaiseEvent(new ApiSecretSavedEvent(request.Id, request.ResourceName));
             }
         }
+
+        public async Task Handle(RemoveApiScopeCommand request, CancellationToken cancellationToken)
+        {
+            if (!request.IsValid())
+            {
+                NotifyValidationErrors(request);
+                return;
+            }
+
+            var savedClient = await _apiResourceRepository.GetResource(request.ResourceName);
+            if (savedClient == null)
+            {
+                await Bus.RaiseEvent(new DomainNotification("1", "Client not found"));
+                return;
+            }
+
+            if (savedClient.Scopes.All(f => f.Id != request.Id))
+            {
+                await Bus.RaiseEvent(new DomainNotification("3", "Invalid scope"));
+                return;
+            }
+
+            var scopeToremove = savedClient.Scopes.First(f => f.Id == request.Id);
+            _apiScopeRepository.Remove(scopeToremove.Id);
+
+            if (Commit())
+            {
+                await Bus.RaiseEvent(new ApiScopeRemovedEvent(request.Id, request.ResourceName, scopeToremove.Name));
+            }
+        }
+
+        public async Task Handle(SaveApiScopeCommand request, CancellationToken cancellationToken)
+        {
+            if (!request.IsValid())
+            {
+                NotifyValidationErrors(request);
+                return;
+            }
+
+            var savedClient = await _apiResourceRepository.GetByName(request.ResourceName);
+            if (savedClient == null)
+            {
+                await Bus.RaiseEvent(new DomainNotification("1", "Client not found"));
+                return;
+            }
+
+            var secret = new ApiScope()
+            {
+                ApiResource = savedClient,
+                Description = request.Description,
+                Required = request.Required,
+                DisplayName = request.DisplayName,
+                Emphasize = request.Emphasize,
+                Name = request.Name,
+                ShowInDiscoveryDocument = request.ShowInDiscoveryDocument,
+                UserClaims =  request.UserClaims.Select(s => new ApiScopeClaim(){ Type = s}).ToList(),
+            };
+
+            _apiScopeRepository.Add(secret);
+
+            if (Commit())
+            {
+                await Bus.RaiseEvent(new ApiSecretSavedEvent(request.Id, request.ResourceName));
+            }
+        }
     }
 }