Browse Source

Set Id of new PersistentGrant entities.

pull/206/head
Halil İbrahim Kalkan 8 years ago
parent
commit
a13a90e14c
  1. 1
      src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs
  2. 6
      src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs
  3. 2
      src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Jwt/JwtTokenMiddleware.cs

1
src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientAutoMapperProfile.cs

@ -23,6 +23,7 @@ namespace Volo.Abp.IdentityServer.Clients
CreateMap<ApiResource, IdentityServer4.Models.ApiResource>() CreateMap<ApiResource, IdentityServer4.Models.ApiResource>()
.ForMember(dest => dest.ApiSecrets, opt => opt.MapFrom(src => src.Secrets)); .ForMember(dest => dest.ApiSecrets, opt => opt.MapFrom(src => src.Secrets));
//TODO: Why PersistedGrant mapping is in this profile?
CreateMap<PersistedGrant, IdentityServer4.Models.PersistedGrant>().ReverseMap(); CreateMap<PersistedGrant, IdentityServer4.Models.PersistedGrant>().ReverseMap();
CreateMap<IdentityResource, IdentityServer4.Models.IdentityResource>(); CreateMap<IdentityResource, IdentityServer4.Models.IdentityResource>();

6
src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs

@ -3,6 +3,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using IdentityServer4.Stores; using IdentityServer4.Stores;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids;
using Volo.Abp.ObjectMapping; using Volo.Abp.ObjectMapping;
namespace Volo.Abp.IdentityServer.Grants namespace Volo.Abp.IdentityServer.Grants
@ -11,11 +12,13 @@ namespace Volo.Abp.IdentityServer.Grants
{ {
private readonly IPersistentGrantRepository _persistentGrantRepository; private readonly IPersistentGrantRepository _persistentGrantRepository;
private readonly IObjectMapper _objectMapper; private readonly IObjectMapper _objectMapper;
private readonly IGuidGenerator _guidGenerator;
public PersistedGrantStore(IPersistentGrantRepository persistentGrantRepository, IObjectMapper objectMapper) public PersistedGrantStore(IPersistentGrantRepository persistentGrantRepository, IObjectMapper objectMapper, IGuidGenerator guidGenerator)
{ {
_persistentGrantRepository = persistentGrantRepository; _persistentGrantRepository = persistentGrantRepository;
_objectMapper = objectMapper; _objectMapper = objectMapper;
_guidGenerator = guidGenerator;
} }
public virtual async Task StoreAsync(IdentityServer4.Models.PersistedGrant grant) public virtual async Task StoreAsync(IdentityServer4.Models.PersistedGrant grant)
@ -24,6 +27,7 @@ namespace Volo.Abp.IdentityServer.Grants
var existing = await _persistentGrantRepository.FindByKeyAsync(grant.Key); var existing = await _persistentGrantRepository.FindByKeyAsync(grant.Key);
if (existing == null) if (existing == null)
{ {
entity.Id = _guidGenerator.Create();
await _persistentGrantRepository.InsertAsync(entity); await _persistentGrantRepository.InsertAsync(entity);
} }
else else

2
src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Jwt/JwtTokenMiddleware.cs

@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Builder;
namespace Volo.Abp.IdentityServer.Jwt namespace Volo.Abp.IdentityServer.Jwt
{ {
//TODO: Can we move this to another package..? //TODO: Should we move this to another package..?
public static class JwtTokenMiddleware public static class JwtTokenMiddleware
{ {

Loading…
Cancel
Save