diff --git a/src/Bifrost.Web/Features/Heimdall/HeimdallTokenVerifier.cs b/src/Bifrost.Web/Features/Heimdall/HeimdallTokenVerifier.cs
index dab753b..e79a813 100644
--- a/src/Bifrost.Web/Features/Heimdall/HeimdallTokenVerifier.cs
+++ b/src/Bifrost.Web/Features/Heimdall/HeimdallTokenVerifier.cs
@@ -14,14 +14,15 @@ public sealed record HeimdallVerifiedIdentity(string AccountId, string? DisplayN
///
/// Verifies Heimdall's access tokens (EdDSA) against Heimdall's published JWKS. Heimdall is the issuer
/// at ; the audience is this app's slug. Failures name a rule and
-/// never echo the token or any of its contents.
+/// never echo the token or any of its contents. One instance serves the process: it owns the key cache.
///
public sealed class HeimdallTokenVerifier(
- HttpClient httpClient,
+ IHttpClientFactory httpClientFactory,
IOptions heimdallOptions,
TimeProvider timeProvider)
{
public const string TokenType = "heimdall_access";
+ public const string ClientName = "heimdall-jwks";
internal static readonly TimeSpan ClockSkew = TimeSpan.FromSeconds(60);
internal static readonly TimeSpan KeyRefreshInterval = TimeSpan.FromSeconds(30);
@@ -193,6 +194,7 @@ public sealed class HeimdallTokenVerifier(
{
try
{
+ var httpClient = httpClientFactory.CreateClient(ClientName);
using var response = await httpClient.GetAsync("/.well-known/jwks.json", cancellationToken);
response.EnsureSuccessStatusCode();
await using var body = await response.Content.ReadAsStreamAsync(cancellationToken);
diff --git a/src/Bifrost.Web/Program.cs b/src/Bifrost.Web/Program.cs
index 3eb149d..49e70b6 100644
--- a/src/Bifrost.Web/Program.cs
+++ b/src/Bifrost.Web/Program.cs
@@ -130,7 +130,8 @@ builder.Services.AddHttpClient((serviceProvider, client) =>
var options = serviceProvider.GetRequiredService>().Value;
client.BaseAddress = new Uri(options.BaseUrl.TrimEnd('/'));
});
-builder.Services.AddHttpClient((serviceProvider, client) =>
+builder.Services.AddSingleton();
+builder.Services.AddHttpClient(HeimdallTokenVerifier.ClientName, (serviceProvider, client) =>
{
var options = serviceProvider.GetRequiredService>().Value;
client.BaseAddress = new Uri(options.BaseUrl.TrimEnd('/'));
diff --git a/tests/Bifrost.Web.Tests/Support/HeimdallTestKit.cs b/tests/Bifrost.Web.Tests/Support/HeimdallTestKit.cs
index 6744e1c..477a4ad 100644
--- a/tests/Bifrost.Web.Tests/Support/HeimdallTestKit.cs
+++ b/tests/Bifrost.Web.Tests/Support/HeimdallTestKit.cs
@@ -280,7 +280,7 @@ public sealed class HeimdallHost : TestWebApplicationFactory
{
services.RemoveAll();
services.AddSingleton(Clock);
- services.AddHttpClient().ConfigurePrimaryHttpMessageHandler(() => Heimdall);
+ services.AddHttpClient(HeimdallTokenVerifier.ClientName).ConfigurePrimaryHttpMessageHandler(() => Heimdall);
services.AddHttpClient().ConfigurePrimaryHttpMessageHandler(() => Heimdall);
});
}
diff --git a/tests/Bifrost.Web.Tests/Support/TestWebApplicationFactory.cs b/tests/Bifrost.Web.Tests/Support/TestWebApplicationFactory.cs
index ed3c4ed..b6e356d 100644
--- a/tests/Bifrost.Web.Tests/Support/TestWebApplicationFactory.cs
+++ b/tests/Bifrost.Web.Tests/Support/TestWebApplicationFactory.cs
@@ -16,7 +16,8 @@ namespace Bifrost.Web.Tests.Support;
public class TestWebApplicationFactory : WebApplicationFactory
{
- private readonly InMemoryDatabaseRoot _databaseRoot = new();
+ // One root for every factory: EF caches a service provider per root, and warns past twenty.
+ private static readonly InMemoryDatabaseRoot _databaseRoot = new();
private readonly string _databaseName = $"bifrost-tests-{Guid.NewGuid():N}";
protected override void ConfigureWebHost(IWebHostBuilder builder)