aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Api/Controllers/QuickConnectController.cs
diff options
context:
space:
mode:
authorConfusedPolarBear <33811686+ConfusedPolarBear@users.noreply.github.com>2020-08-16 17:21:08 -0500
committerGitHub <noreply@github.com>2020-08-16 17:21:08 -0500
commiteaa57115347f6f70d478f2ca39601d2e70efbdaf (patch)
tree8fc9f58d850205d5562aef7fbdfb359fbb9e5a64 /Jellyfin.Api/Controllers/QuickConnectController.cs
parent035d29fb357006c29ffb40e0a53c1e999237cdd1 (diff)
Apply suggestions from code review
Co-authored-by: Cody Robibero <cody@robibe.ro>
Diffstat (limited to 'Jellyfin.Api/Controllers/QuickConnectController.cs')
-rw-r--r--Jellyfin.Api/Controllers/QuickConnectController.cs15
1 files changed, 5 insertions, 10 deletions
diff --git a/Jellyfin.Api/Controllers/QuickConnectController.cs b/Jellyfin.Api/Controllers/QuickConnectController.cs
index d45ea058d..fd5453595 100644
--- a/Jellyfin.Api/Controllers/QuickConnectController.cs
+++ b/Jellyfin.Api/Controllers/QuickConnectController.cs
@@ -46,7 +46,7 @@ namespace Jellyfin.Api.Controllers
public ActionResult<QuickConnectState> GetStatus()
{
_quickConnect.ExpireRequests();
- return Ok(_quickConnect.State);
+ return _quickConnect.State;
}
/// <summary>
@@ -60,7 +60,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
public ActionResult<QuickConnectResult> Initiate([FromQuery] string? friendlyName)
{
- return Ok(_quickConnect.TryConnect(friendlyName));
+ return _quickConnect.TryConnect(friendlyName);
}
/// <summary>
@@ -78,7 +78,7 @@ namespace Jellyfin.Api.Controllers
try
{
var result = _quickConnect.CheckRequestStatus(secret);
- return Ok(result);
+ return result;
}
catch (ResourceNotFoundException)
{
@@ -135,12 +135,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status400BadRequest)]
public ActionResult<bool> Authorize([FromQuery, Required] string? code)
{
- if (code == null)
- {
- return BadRequest("Missing code");
- }
-
- return Ok(_quickConnect.AuthorizeRequest(Request, code));
+ return _quickConnect.AuthorizeRequest(Request, code);
}
/// <summary>
@@ -153,7 +148,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
public ActionResult<int> Deauthorize()
{
- var userId = _authContext.GetAuthorizationInfo(Request).UserId;
+ var userId = ClaimHelpers.GetUserId(request.HttpContext.User);
return _quickConnect.DeleteAllDevices(userId);
}
}