Skip to content

Commit

Permalink
Refactor DI
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobjmarks committed May 8, 2024
1 parent 90ec3ba commit 4756e06
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Client/Pages/Home.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public sealed partial class Home : IDisposable
{
[Inject] private NavigationManager NavigationManager { get; set; } = null!;
[Inject] private ISnackbar Snackbar { get; set; } = null!;
[Inject] private AppConfig AppConfig { get; set; } = null!;
[Inject] private HttpClient HttpClient { get; set; } = null!;
[Inject] private ClipboardService ClipboardService { get; set; } = null!;
[Inject] private LocalStorageService LocalStorageService { get; set; } = null!;

Expand Down Expand Up @@ -192,8 +192,8 @@ private async Task GetBindingResultsAsync(string inputValue)
{
_isFetchingResults = true;

var qs = QueryString.Create("qs", "?" + inputValue);
using var response = await _httpClient.GetAsync(AppConfig.AzureFunctionUrl + qs);
var qs = QueryString.Create("qs", "?" + inputValue).ToString();
using var response = await HttpClient.GetAsync(qs);
response.EnsureSuccessStatusCode();
var results = await response.Content.ReadFromJsonAsync<IEnumerable<BindingResults>>() ?? [];
_bindingResults = results.OrderBy(r => r.AllErroneous);
Expand Down
7 changes: 5 additions & 2 deletions Client/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
});

builder.Services.Configure<AppConfig>(builder.Configuration.Bind);
builder.Services.AddScoped<AppConfig>(services => services.GetRequiredService<IOptions<AppConfig>>().Value);

builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
builder.Services.AddSingleton<HttpClient>(sp =>
{
var appConfig = sp.GetRequiredService<IOptions<AppConfig>>().Value;
return new() { BaseAddress = new(appConfig.AzureFunctionUrl) };
});

builder.Services.AddSingleton<ClipboardService>();
builder.Services.AddSingleton<LocalStorageService>();
Expand Down

0 comments on commit 4756e06

Please sign in to comment.