Migration to using System.Net.Http.Json; part one - functional migration

This commit is contained in:
Pavel Vesely
2020-04-15 23:03:37 +02:00
parent fe2ad29b3b
commit 95e9bee4e2
29 changed files with 293 additions and 215 deletions

View File

@ -10,13 +10,13 @@ namespace Oqtane.Services
{
public class SettingService : ServiceBase, ISettingService
{
private readonly HttpClient _http;
private readonly SiteState _siteState;
private readonly NavigationManager _navigationManager;
public SettingService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
public SettingService(HttpClient http, SiteState siteState, NavigationManager navigationManager) : base(http)
{
_http = http;
_siteState = siteState;
_navigationManager = navigationManager;
}
@ -99,7 +99,7 @@ namespace Oqtane.Services
public async Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int entityId)
{
var dictionary = new Dictionary<string, string>();
var settings = await _http.GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId.ToString()}");
var settings = await GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId.ToString()}");
foreach(Setting setting in settings.OrderBy(item => item.SettingName).ToList())
{
@ -110,7 +110,7 @@ namespace Oqtane.Services
public async Task UpdateSettingsAsync(Dictionary<string, string> settings, string entityName, int entityId)
{
var settingsList = await _http.GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId.ToString()}");
var settingsList = await GetJsonAsync<List<Setting>>($"{Apiurl}?entityname={entityName}&entityid={entityId.ToString()}");
foreach (KeyValuePair<string, string> kvp in settings)
{
@ -138,22 +138,22 @@ namespace Oqtane.Services
public async Task<Setting> GetSettingAsync(int settingId)
{
return await _http.GetJsonAsync<Setting>($"{Apiurl}/{settingId.ToString()}");
return await GetJsonAsync<Setting>($"{Apiurl}/{settingId.ToString()}");
}
public async Task<Setting> AddSettingAsync(Setting setting)
{
return await _http.PostJsonAsync<Setting>(Apiurl, setting);
return await PostJsonAsync<Setting>(Apiurl, setting);
}
public async Task<Setting> UpdateSettingAsync(Setting setting)
{
return await _http.PutJsonAsync<Setting>($"{Apiurl}/{setting.SettingId.ToString()}", setting);
return await PutJsonAsync<Setting>($"{Apiurl}/{setting.SettingId.ToString()}", setting);
}
public async Task DeleteSettingAsync(int settingId)
{
await _http.DeleteAsync($"{Apiurl}/{settingId.ToString()}");
await DeleteAsync($"{Apiurl}/{settingId.ToString()}");
}