From 1fa4ebf81085d23811d3d7279707dcf96b4e621b Mon Sep 17 00:00:00 2001 From: "L. Ellenbeck" <ellenbeck@itc.rwth-aachen.de> Date: Thu, 30 Jun 2022 16:14:37 +0200 Subject: [PATCH 1/2] Fix: added HttpClientFactory (coscine/issues#2141) --- src/Blob/Blob.csproj | 2 +- src/Blob/Startup.cs | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/Blob/Blob.csproj b/src/Blob/Blob.csproj index 57c7187..f729b65 100644 --- a/src/Blob/Blob.csproj +++ b/src/Blob/Blob.csproj @@ -21,6 +21,6 @@ <PackageReference Include="Coscine.Metadata" Version="2.*-*" /> <PackageReference Include="Coscine.Database" Version="2.*-*" /> <PackageReference Include="Coscine.Logging" Version="2.*-*" /> - <PackageReference Include="Coscine.ResourceTypes" Version="*-*" /> + <PackageReference Include="Coscine.ResourceTypes" Version="1.1.4-beta0009" /> </ItemGroup> </Project> diff --git a/src/Blob/Startup.cs b/src/Blob/Startup.cs index dcebfbf..998cdc8 100644 --- a/src/Blob/Startup.cs +++ b/src/Blob/Startup.cs @@ -1,6 +1,9 @@ using Coscine.ApiCommons; +using Coscine.ResourceTypes; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using System; +using System.Net.Http; namespace Coscine.Api.Blob { @@ -23,6 +26,21 @@ namespace Coscine.Api.Blob public override void ConfigureServicesExtension(IServiceCollection services) { base.ConfigureServicesExtension(services); + + services.AddHttpClient(); + } + + /// <summary> + /// Add HttpClinetFactory to resource types + /// </summary> + /// <param name="app"></param> + /// <param name="env"></param> + public override void ConfigureExtensionLate(IApplicationBuilder app, IWebHostEnvironment env) + { + base.ConfigureExtensionLate(app, env); + + using var scope = app.ApplicationServices.CreateScope(); + ResourceTypeFactory.HttpClientFactory = scope.ServiceProvider.GetRequiredService<IHttpClientFactory>(); } } } \ No newline at end of file -- GitLab From 5abe5f3c7be3a6b71de34a4e1ec2616725443d34 Mon Sep 17 00:00:00 2001 From: Petar Hristov <hristov@itc.rwth-aachen.de> Date: Thu, 7 Jul 2022 08:31:08 +0200 Subject: [PATCH 2/2] Update Blob.csproj --- src/Blob/Blob.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Blob/Blob.csproj b/src/Blob/Blob.csproj index f729b65..48b701a 100644 --- a/src/Blob/Blob.csproj +++ b/src/Blob/Blob.csproj @@ -21,6 +21,6 @@ <PackageReference Include="Coscine.Metadata" Version="2.*-*" /> <PackageReference Include="Coscine.Database" Version="2.*-*" /> <PackageReference Include="Coscine.Logging" Version="2.*-*" /> - <PackageReference Include="Coscine.ResourceTypes" Version="1.1.4-beta0009" /> + <PackageReference Include="Coscine.ResourceTypes" Version="1.*-*" /> </ItemGroup> </Project> -- GitLab