Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix HttpClient registration for WebhookSender #1758

Merged
merged 1 commit into from
Dec 19, 2024
+7 −8
Merged

Fix HttpClient registration for WebhookSender #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ordSystem/src/TeachingRecordSystem.Core/Services/Webhooks/ApplicationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public static IHostApplicationBuilder AddWebhookDeliveryService(this IHostApplic
{
AddWebhookOptions(builder);

builder.Services.AddSingleton<IWebhookSender, WebhookSender>();
WebhookSender.AddHttpClient(builder.Services);
WebhookSender.Register(builder.Services);

builder.Services.AddSingleton<IHostedService, WebhookDeliveryService>();

Expand Down
6 changes: 4 additions & 2 deletions TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/Webhooks/WebhookSender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public async Task SendMessageAsync(WebhookMessage message, CancellationToken can
response.EnsureSuccessStatusCode();
}

public static void AddHttpClient(IServiceCollection services, Func<HttpMessageHandler>? getPrimaryHandler = null)
public static void Register(IServiceCollection services, Func<HttpMessageHandler>? getPrimaryHandler = null)
{
// We configure the options here manually rather than using the library-provided extension methods so that they don't 'bleed out' globally;
// it's feasible we could want a different configuration of, say, AddContentDigestOptions for use elsewhere.
Expand Down Expand Up @@ -108,8 +108,10 @@ IOptions<MessageSigningOptions> GetMessageSigningOptions(IServiceProvider servic
return new ECDsaP382Sha384SignatureProvider(cert, signingKeyId);
});

services.AddSingleton<IWebhookSender, WebhookSender>();

var httpClientBuilder = services
.AddHttpClient<WebhookSender>(client =>
.AddHttpClient<IWebhookSender, WebhookSender>(client =>
{
client.Timeout = TimeSpan.FromSeconds(TimeoutSeconds);
client.DefaultRequestHeaders.ExpectContinue = false;
Expand Down
6 changes: 2 additions & 4 deletions ...ecordSystem/tests/TeachingRecordSystem.Core.Tests/Services/Webhooks/WebhookSenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,8 @@ public WebhookReceiver()
];
});

builder.Services.AddSingleton<WebhookSender>();

builder.Services.AddSingleton<WebhookMessageRecorder>();
WebhookSender.AddHttpClient(builder.Services, () => _server!.CreateHandler());
WebhookSender.Register(builder.Services, () => _server!.CreateHandler());

builder.Services.Configure<RequestSignatureVerificationOptions>(options =>
{
Expand Down Expand Up @@ -206,7 +204,7 @@ public WebhookReceiver()

public WebhookMessageRecorder WebhookMessageRecorder => Services.GetRequiredService<WebhookMessageRecorder>();

public WebhookSender GetWebhookSender() => Services.GetRequiredService<WebhookSender>();
public IWebhookSender GetWebhookSender() => Services.GetRequiredService<IWebhookSender>();

public WebhookOptions GetWebhookOptions() => Services.GetRequiredService<IOptions<WebhookOptions>>().Value;

Expand Down
Loading