refactor(backend): use single shared HTTP client with backoff

This commit is contained in:
sam 2025-03-11 16:10:55 +01:00
parent bba322bd22
commit 5d452824cd
Signed by: sam
GPG key ID: B4EF20DDE721CAA1
9 changed files with 232 additions and 75 deletions

View file

@ -34,6 +34,7 @@ public partial class FediverseAuthService
ILogger logger,
Config config,
DatabaseContext db,
HttpClient client,
KeyCacheService keyCacheService,
ISnowflakeGenerator snowflakeGenerator
)
@ -43,12 +44,7 @@ public partial class FediverseAuthService
_db = db;
_keyCacheService = keyCacheService;
_snowflakeGenerator = snowflakeGenerator;
_client = new HttpClient();
_client.DefaultRequestHeaders.Remove("User-Agent");
_client.DefaultRequestHeaders.Remove("Accept");
_client.DefaultRequestHeaders.Add("User-Agent", $"pronouns.cc/{BuildInfo.Version}");
_client.DefaultRequestHeaders.Add("Accept", "application/json");
_client = client;
}
public async Task<string> GenerateAuthUrlAsync(

View file

@ -27,7 +27,7 @@ public partial class RemoteAuthService
)
{
var redirectUri = $"{config.BaseUrl}/auth/callback/discord";
HttpResponseMessage resp = await _httpClient.PostAsync(
HttpResponseMessage resp = await client.PostAsync(
_discordTokenUri,
new FormUrlEncodedContent(
new Dictionary<string, string>
@ -59,7 +59,7 @@ public partial class RemoteAuthService
var req = new HttpRequestMessage(HttpMethod.Get, _discordUserUri);
req.Headers.Add("Authorization", $"{token.TokenType} {token.AccessToken}");
HttpResponseMessage resp2 = await _httpClient.SendAsync(req, ct);
HttpResponseMessage resp2 = await client.SendAsync(req, ct);
resp2.EnsureSuccessStatusCode();
DiscordUserResponse? user = await resp2.Content.ReadFromJsonAsync<DiscordUserResponse>(ct);
if (user == null)

View file

@ -28,7 +28,7 @@ public partial class RemoteAuthService
)
{
var redirectUri = $"{config.BaseUrl}/auth/callback/google";
HttpResponseMessage resp = await _httpClient.PostAsync(
HttpResponseMessage resp = await client.PostAsync(
_googleTokenUri,
new FormUrlEncodedContent(
new Dictionary<string, string>

View file

@ -29,7 +29,7 @@ public partial class RemoteAuthService
)
{
var redirectUri = $"{config.BaseUrl}/auth/callback/tumblr";
HttpResponseMessage resp = await _httpClient.PostAsync(
HttpResponseMessage resp = await client.PostAsync(
_tumblrTokenUri,
new FormUrlEncodedContent(
new Dictionary<string, string>
@ -62,7 +62,7 @@ public partial class RemoteAuthService
var req = new HttpRequestMessage(HttpMethod.Get, _tumblrUserUri);
req.Headers.Add("Authorization", $"Bearer {token.AccessToken}");
HttpResponseMessage resp2 = await _httpClient.SendAsync(req, ct);
HttpResponseMessage resp2 = await client.SendAsync(req, ct);
if (!resp2.IsSuccessStatusCode)
{
string respBody = await resp2.Content.ReadAsStringAsync(ct);

View file

@ -25,6 +25,7 @@ using Microsoft.EntityFrameworkCore;
namespace Foxnouns.Backend.Services.Auth;
public partial class RemoteAuthService(
HttpClient client,
Config config,
ILogger logger,
DatabaseContext db,
@ -32,7 +33,6 @@ public partial class RemoteAuthService(
)
{
private readonly ILogger _logger = logger.ForContext<RemoteAuthService>();
private readonly HttpClient _httpClient = new();
public record RemoteUser(string Id, string Username);