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 ModuleService : ServiceBase, IModuleService
{
private readonly HttpClient _http;
private readonly SiteState _siteState;
private readonly NavigationManager _navigationManager;
public ModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager)
public ModuleService(HttpClient http, SiteState siteState, NavigationManager navigationManager) : base(http)
{
_http = http;
_siteState = siteState;
_navigationManager = navigationManager;
}
@ -28,7 +28,7 @@ namespace Oqtane.Services
public async Task<List<Module>> GetModulesAsync(int siteId)
{
List<Module> modules = await _http.GetJsonAsync<List<Module>>($"{Apiurl}?siteid={siteId.ToString()}");
List<Module> modules = await GetJsonAsync<List<Module>>($"{Apiurl}?siteid={siteId.ToString()}");
modules = modules
.OrderBy(item => item.Order)
.ToList();
@ -37,32 +37,32 @@ namespace Oqtane.Services
public async Task<Module> GetModuleAsync(int moduleId)
{
return await _http.GetJsonAsync<Module>($"{Apiurl}/{moduleId.ToString()}");
return await GetJsonAsync<Module>($"{Apiurl}/{moduleId.ToString()}");
}
public async Task<Module> AddModuleAsync(Module module)
{
return await _http.PostJsonAsync<Module>(Apiurl, module);
return await PostJsonAsync<Module>(Apiurl, module);
}
public async Task<Module> UpdateModuleAsync(Module module)
{
return await _http.PutJsonAsync<Module>($"{Apiurl}/{module.ModuleId.ToString()}", module);
return await PutJsonAsync<Module>($"{Apiurl}/{module.ModuleId.ToString()}", module);
}
public async Task DeleteModuleAsync(int moduleId)
{
await _http.DeleteAsync($"{Apiurl}/{moduleId.ToString()}");
await DeleteAsync($"{Apiurl}/{moduleId.ToString()}");
}
public async Task<bool> ImportModuleAsync(int moduleId, string content)
{
return await _http.PostJsonAsync<bool>($"{Apiurl}/import?moduleid={moduleId}", content);
return await PostJsonAsync<string,bool>($"{Apiurl}/import?moduleid={moduleId}", content);
}
public async Task<string> ExportModuleAsync(int moduleId)
{
return await _http.GetStringAsync($"{Apiurl}/export?moduleid={moduleId.ToString()}");
return await GetStringAsync($"{Apiurl}/export?moduleid={moduleId.ToString()}");
}
}
}