mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor controller updates as the web app expects no content

This commit is contained in:
flightlevel 2018-05-05 17:10:36 +10:00
parent 5eed9d7038
commit 615794a4bf
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Jackett.Server/Controllers/IndexerApiController.cs
View File

@ -84,7 +84,7 @@ namespace Jackett.Server.Controllers
[HttpPost]
[Route("{indexerId?}/Config")]
[TypeFilter(typeof(RequiresIndexer))]
public async Task UpdateConfig([FromBody]Common.Models.DTO.ConfigItem[] config)
public async Task<IActionResult> UpdateConfig([FromBody]Common.Models.DTO.ConfigItem[] config)
{
try
{
@ -95,7 +95,11 @@ namespace Jackett.Server.Controllers
var configurationResult = await CurrentIndexer.ApplyConfiguration(json);
if (configurationResult == IndexerConfigurationStatus.RequiresTesting)
{
await IndexerService.TestIndexer(CurrentIndexer.ID);
}
return new NoContentResult();
}
catch
{

4
src/Jackett.Server/Controllers/ServerConfigurationController.cs
View File

@ -40,7 +40,7 @@ namespace Jackett.Server.Controllers
}
[HttpPost]
public void AdminPassword([FromBody]string password)
public IActionResult AdminPassword([FromBody]string password)
{
var oldPassword = serverConfig.AdminPassword;
if (string.IsNullOrEmpty(password))
@ -51,6 +51,8 @@ namespace Jackett.Server.Controllers
serverConfig.AdminPassword = securityService.HashPassword(password);
configService.SaveConfig(serverConfig);
}
return new NoContentResult();
}
[HttpPost]

20
src/Jackett.Server/Controllers/UIController.cs
View File

@ -54,20 +54,24 @@ namespace Jackett.Server.Controllers
[HttpGet]
[HttpPost]
//[AllowAnonymous]
public async Task<HttpResponseMessage> Dashboard()
public IActionResult Dashboard()
{
if (Request.Path != null && Request.Path.ToString().Contains("logout"))
{
var file = GetFile("login.html");
securityService.Logout(file);
return file;
}
var result = new PhysicalFileResult(config.GetContentFolder() + "/index.html", "text/html");
return result;
//if (Request.Path != null && Request.Path.ToString().Contains("logout"))
//{
// var file = GetFile("login.html");
// securityService.Logout(file);
// return file;
//}
//TODO
//if (securityService.CheckAuthorised(Request))
//{
return GetFile("index.html");
//return GetFile("index.html");
//}
//else