Browse Source

follows Upgrade to IdentityModel 4.0.0

pull/1788/head
İsmail ÇAGDAŞ 7 years ago
parent
commit
2119624615
  1. 1
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs
  2. 4
      framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs
  3. 10
      framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs

1
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs

@ -2,6 +2,7 @@
using System.IO;
using System.Net.Http;
using System.Text;
using IdentityModel.Client;
namespace Volo.Abp.Cli.Http
{

4
framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs

@ -1,5 +1,5 @@
using System.Net.Http;
using System.Threading.Tasks;
using System.Threading.Tasks;
using IdentityModel.Client;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Http;
using Volo.Abp.DependencyInjection;

10
framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelAuthenticationService.cs

@ -92,7 +92,7 @@ namespace Volo.Abp.IdentityModel
ClientOptions.IdentityClients.Default;
}
protected virtual async Task<DiscoveryResponse> GetDiscoveryResponse(
protected virtual async Task<DiscoveryDocumentResponse> GetDiscoveryResponse(
IdentityClientConfiguration configuration)
{
using (var httpClient = new HttpClient())
@ -109,7 +109,7 @@ namespace Volo.Abp.IdentityModel
}
protected virtual async Task<TokenResponse> GetTokenResponse(
DiscoveryResponse discoveryResponse,
DiscoveryDocumentResponse discoveryResponse,
IdentityClientConfiguration configuration)
{
using (var httpClient = new HttpClient())
@ -132,7 +132,7 @@ namespace Volo.Abp.IdentityModel
}
}
protected virtual Task<PasswordTokenRequest> CreatePasswordTokenRequestAsync(DiscoveryResponse discoveryResponse, IdentityClientConfiguration configuration)
protected virtual Task<PasswordTokenRequest> CreatePasswordTokenRequestAsync(DiscoveryDocumentResponse discoveryResponse, IdentityClientConfiguration configuration)
{
var request = new PasswordTokenRequest
{
@ -150,7 +150,7 @@ namespace Volo.Abp.IdentityModel
}
protected virtual Task<ClientCredentialsTokenRequest> CreateClientCredentialsTokenRequestAsync(
DiscoveryResponse discoveryResponse,
DiscoveryDocumentResponse discoveryResponse,
IdentityClientConfiguration configuration)
{
var request = new ClientCredentialsTokenRequest
@ -166,7 +166,7 @@ namespace Volo.Abp.IdentityModel
return Task.FromResult(request);
}
protected virtual Task AddParametersToRequestAsync(IdentityClientConfiguration configuration, Request request)
protected virtual Task AddParametersToRequestAsync(IdentityClientConfiguration configuration, ProtocolRequest request)
{
foreach (var pair in configuration.Where(p => p.Key.StartsWith("[o]", StringComparison.OrdinalIgnoreCase)))
{

Loading…
Cancel
Save