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

Tidy conversion to aspnetcore 

(cherry picked from commit 490f6e2e6aa3f220cc98f257a3ca3b2bea48fb80)
(cherry picked from commit 8f3f90d4078d9d072d8ad4ccc3be35963b7435d6)
(cherry picked from commit 2b0da546c9dae40fbc1b2654387be80a17c1848f)
This commit is contained in:
ta264 2021-10-21 21:04:26 +01:00 committed by Qstick
parent d6967a786f
commit 8cad9600cc
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Radarr.Http/Authentication/AuthenticationController.cs
View File

@ -14,12 +14,10 @@ namespace Radarr.Http.Authentication
public class AuthenticationController : Controller
{
private readonly IAuthenticationService _authService;
private readonly IConfigFileProvider _configFileProvider;
public AuthenticationController(IAuthenticationService authService, IConfigFileProvider configFileProvider)
public AuthenticationController(IAuthenticationService authService)
{
_authService = authService;
_configFileProvider = configFileProvider;
}
[HttpPost("login")]
@ -43,6 +41,7 @@ namespace Radarr.Http.Authentication
{
IsPersistent = resource.RememberMe == "on"
};
await HttpContext.SignInAsync(AuthenticationType.Forms.ToString(), new ClaimsPrincipal(new ClaimsIdentity(claims, "Cookies", "user", "identifier")), authProperties);
return Redirect("/");

6
src/Radarr.Http/Middleware/CacheableSpecification.cs
View File

@ -39,12 +39,12 @@ namespace Radarr.Http.Middleware
return false;
}
if (context.Request.Path.Equals("/index.js"))
if (context.Request.Path.Value?.EndsWith("/index.js") ?? false)
{
return false;
}
if (context.Request.Path.Equals("/initialize.js"))
if (context.Request.Path.Value?.EndsWith("/initialize.js") ?? false)
{
return false;
}
@ -55,7 +55,7 @@ namespace Radarr.Http.Middleware
}
if (context.Request.Path.StartsWithSegments("/log", StringComparison.CurrentCultureIgnoreCase) &&
context.Request.Path.ToString().EndsWith(".txt", StringComparison.CurrentCultureIgnoreCase))
(context.Request.Path.Value?.EndsWith(".txt", StringComparison.CurrentCultureIgnoreCase) ?? false))
{
return false;
}

10
src/Radarr.Http/REST/Attributes/RestGetByIdAttribute.cs
View File

@ -1,21 +1,15 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.Routing;
namespace Radarr.Http.REST.Attributes
{
[AttributeUsage(AttributeTargets.Method)]
public class RestGetByIdAttribute : ActionFilterAttribute, IActionHttpMethodProvider, IRouteTemplateProvider
public class RestGetByIdAttribute : Attribute, IActionHttpMethodProvider, IRouteTemplateProvider
{
public override void OnActionExecuting(ActionExecutingContext context)
{
Console.WriteLine($"OnExecuting {context.Controller.GetType()} {context.ActionDescriptor.DisplayName}");
}
public IEnumerable<string> HttpMethods => new[] { "GET" };
public string Template => "{id:int}";
public new int? Order => 0;
public int? Order => 0;
public string Name { get; }
}
}