Revert "Use `IHttpClientFactory` instead of manually creating a `HttpClient`"

pull/2953/head
maliming 5 years ago committed by GitHub
parent 2e395f7166
commit 38e2c72121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -16,7 +16,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityModel" Version="4.1.1" /> <PackageReference Include="IdentityModel" Version="4.1.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
<ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" /> <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />
</ItemGroup> </ItemGroup>

@ -21,15 +21,12 @@ namespace Volo.Abp.IdentityModel
public ILogger<IdentityModelAuthenticationService> Logger { get; set; } public ILogger<IdentityModelAuthenticationService> Logger { get; set; }
protected AbpIdentityClientOptions ClientOptions { get; } protected AbpIdentityClientOptions ClientOptions { get; }
protected ICancellationTokenProvider CancellationTokenProvider { get; } protected ICancellationTokenProvider CancellationTokenProvider { get; }
protected IHttpClientFactory HttpClientFactory { get; }
public IdentityModelAuthenticationService( public IdentityModelAuthenticationService(
IOptions<AbpIdentityClientOptions> options, IOptions<AbpIdentityClientOptions> options,
ICancellationTokenProvider cancellationTokenProvider, ICancellationTokenProvider cancellationTokenProvider)
IHttpClientFactory httpClientFactory)
{ {
CancellationTokenProvider = cancellationTokenProvider; CancellationTokenProvider = cancellationTokenProvider;
HttpClientFactory = httpClientFactory;
ClientOptions = options.Value; ClientOptions = options.Value;
Logger = NullLogger<IdentityModelAuthenticationService>.Instance; Logger = NullLogger<IdentityModelAuthenticationService>.Instance;
} }
@ -98,7 +95,7 @@ namespace Volo.Abp.IdentityModel
protected virtual async Task<DiscoveryDocumentResponse> GetDiscoveryResponse( protected virtual async Task<DiscoveryDocumentResponse> GetDiscoveryResponse(
IdentityClientConfiguration configuration) IdentityClientConfiguration configuration)
{ {
using (var httpClient = HttpClientFactory.CreateClient()) using (var httpClient = new HttpClient())
{ {
return await httpClient.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest return await httpClient.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
{ {
@ -112,10 +109,10 @@ namespace Volo.Abp.IdentityModel
} }
protected virtual async Task<TokenResponse> GetTokenResponse( protected virtual async Task<TokenResponse> GetTokenResponse(
DiscoveryDocumentResponse discoveryResponse, DiscoveryDocumentResponse discoveryResponse,
IdentityClientConfiguration configuration) IdentityClientConfiguration configuration)
{ {
using (var httpClient = HttpClientFactory.CreateClient()) using (var httpClient = new HttpClient())
{ {
switch (configuration.GrantType) switch (configuration.GrantType)
{ {
@ -137,7 +134,7 @@ namespace Volo.Abp.IdentityModel
protected virtual Task<PasswordTokenRequest> CreatePasswordTokenRequestAsync(DiscoveryDocumentResponse discoveryResponse, IdentityClientConfiguration configuration) protected virtual Task<PasswordTokenRequest> CreatePasswordTokenRequestAsync(DiscoveryDocumentResponse discoveryResponse, IdentityClientConfiguration configuration)
{ {
var request = new PasswordTokenRequest var request = new PasswordTokenRequest
{ {
Address = discoveryResponse.TokenEndpoint, Address = discoveryResponse.TokenEndpoint,
Scope = configuration.Scope, Scope = configuration.Scope,
@ -152,11 +149,11 @@ namespace Volo.Abp.IdentityModel
return Task.FromResult(request); return Task.FromResult(request);
} }
protected virtual Task<ClientCredentialsTokenRequest> CreateClientCredentialsTokenRequestAsync( protected virtual Task<ClientCredentialsTokenRequest> CreateClientCredentialsTokenRequestAsync(
DiscoveryDocumentResponse discoveryResponse, DiscoveryDocumentResponse discoveryResponse,
IdentityClientConfiguration configuration) IdentityClientConfiguration configuration)
{ {
var request = new ClientCredentialsTokenRequest var request = new ClientCredentialsTokenRequest
{ {
Address = discoveryResponse.TokenEndpoint, Address = discoveryResponse.TokenEndpoint,
Scope = configuration.Scope, Scope = configuration.Scope,

Loading…
Cancel
Save