From eaa57115347f6f70d478f2ca39601d2e70efbdaf Mon Sep 17 00:00:00 2001
From: ConfusedPolarBear <33811686+ConfusedPolarBear@users.noreply.github.com>
Date: Sun, 16 Aug 2020 17:21:08 -0500
Subject: Apply suggestions from code review

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Jellyfin.Api/Controllers/QuickConnectController.cs | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Jellyfin.Api/Controllers/QuickConnectController.cs')

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);
         }
     }
-- 
cgit v1.2.3