1 files changed, 110 insertions, 119 deletions
diff --git a/Jellyfin.Api/Controllers/DevicesController.cs b/Jellyfin.Api/Controllers/DevicesController.cs
index b3e3490c2..aa0dff212 100644
--- a/Jellyfin.Api/Controllers/DevicesController.cs
+++ b/Jellyfin.Api/Controllers/DevicesController.cs
@@ -1,8 +1,12 @@
 using System;
 using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
+using Jellyfin.Api.Helpers;
+using Jellyfin.Data.Dtos;
+using Jellyfin.Data.Entities.Security;
+using Jellyfin.Data.Queries;
 using MediaBrowser.Controller.Devices;
-using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Devices;
 using MediaBrowser.Model.Querying;
@@ -10,142 +14,129 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Jellyfin.Api.Controllers
+namespace Jellyfin.Api.Controllers;
+
+/// <summary>
+/// Devices Controller.
+/// </summary>
+[Authorize(Policy = Policies.RequiresElevation)]
+public class DevicesController : BaseJellyfinApiController
 {
+    private readonly IDeviceManager _deviceManager;
+    private readonly ISessionManager _sessionManager;
+
     /// <summary>
-    /// Devices Controller.
+    /// Initializes a new instance of the <see cref="DevicesController"/> class.
     /// </summary>
-    [Authorize(Policy = Policies.RequiresElevation)]
-    public class DevicesController : BaseJellyfinApiController
+    /// <param name="deviceManager">Instance of <see cref="IDeviceManager"/> interface.</param>
+    /// <param name="sessionManager">Instance of <see cref="ISessionManager"/> interface.</param>
+    public DevicesController(
+        IDeviceManager deviceManager,
+        ISessionManager sessionManager)
     {
-        private readonly IDeviceManager _deviceManager;
-        private readonly IAuthenticationRepository _authenticationRepository;
-        private readonly ISessionManager _sessionManager;
+        _deviceManager = deviceManager;
+        _sessionManager = sessionManager;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DevicesController"/> class.
-        /// </summary>
-        /// <param name="deviceManager">Instance of <see cref="IDeviceManager"/> interface.</param>
-        /// <param name="authenticationRepository">Instance of <see cref="IAuthenticationRepository"/> interface.</param>
-        /// <param name="sessionManager">Instance of <see cref="ISessionManager"/> interface.</param>
-        public DevicesController(
-            IDeviceManager deviceManager,
-            IAuthenticationRepository authenticationRepository,
-            ISessionManager sessionManager)
-        {
-            _deviceManager = deviceManager;
-            _authenticationRepository = authenticationRepository;
-            _sessionManager = sessionManager;
-        }
+    /// <summary>
+    /// Get Devices.
+    /// </summary>
+    /// <param name="supportsSync">Gets or sets a value indicating whether [supports synchronize].</param>
+    /// <param name="userId">Gets or sets the user identifier.</param>
+    /// <response code="200">Devices retrieved.</response>
+    /// <returns>An <see cref="OkResult"/> containing the list of devices.</returns>
+    [HttpGet]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<QueryResult<DeviceInfo>>> GetDevices([FromQuery] bool? supportsSync, [FromQuery] Guid? userId)
+    {
+        userId = RequestHelpers.GetUserId(User, userId);
+        return await _deviceManager.GetDevicesForUser(userId, supportsSync).ConfigureAwait(false);
+    }
 
-        /// <summary>
-        /// Get Devices.
-        /// </summary>
-        /// <param name="supportsSync">Gets or sets a value indicating whether [supports synchronize].</param>
-        /// <param name="userId">Gets or sets the user identifier.</param>
-        /// <response code="200">Devices retrieved.</response>
-        /// <returns>An <see cref="OkResult"/> containing the list of devices.</returns>
-        [HttpGet]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        public ActionResult<QueryResult<DeviceInfo>> GetDevices([FromQuery] bool? supportsSync, [FromQuery] Guid? userId)
+    /// <summary>
+    /// Get info for a device.
+    /// </summary>
+    /// <param name="id">Device Id.</param>
+    /// <response code="200">Device info retrieved.</response>
+    /// <response code="404">Device not found.</response>
+    /// <returns>An <see cref="OkResult"/> containing the device info on success, or a <see cref="NotFoundResult"/> if the device could not be found.</returns>
+    [HttpGet("Info")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<DeviceInfo>> GetDeviceInfo([FromQuery, Required] string id)
+    {
+        var deviceInfo = await _deviceManager.GetDevice(id).ConfigureAwait(false);
+        if (deviceInfo is null)
         {
-            var deviceQuery = new DeviceQuery { SupportsSync = supportsSync, UserId = userId ?? Guid.Empty };
-            return _deviceManager.GetDevices(deviceQuery);
+            return NotFound();
         }
 
-        /// <summary>
-        /// Get info for a device.
-        /// </summary>
-        /// <param name="id">Device Id.</param>
-        /// <response code="200">Device info retrieved.</response>
-        /// <response code="404">Device not found.</response>
-        /// <returns>An <see cref="OkResult"/> containing the device info on success, or a <see cref="NotFoundResult"/> if the device could not be found.</returns>
-        [HttpGet("Info")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public ActionResult<DeviceInfo> GetDeviceInfo([FromQuery, Required] string id)
-        {
-            var deviceInfo = _deviceManager.GetDevice(id);
-            if (deviceInfo == null)
-            {
-                return NotFound();
-            }
-
-            return deviceInfo;
-        }
+        return deviceInfo;
+    }
 
-        /// <summary>
-        /// Get options for a device.
-        /// </summary>
-        /// <param name="id">Device Id.</param>
-        /// <response code="200">Device options retrieved.</response>
-        /// <response code="404">Device not found.</response>
-        /// <returns>An <see cref="OkResult"/> containing the device info on success, or a <see cref="NotFoundResult"/> if the device could not be found.</returns>
-        [HttpGet("Options")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public ActionResult<DeviceOptions> GetDeviceOptions([FromQuery, Required] string id)
+    /// <summary>
+    /// Get options for a device.
+    /// </summary>
+    /// <param name="id">Device Id.</param>
+    /// <response code="200">Device options retrieved.</response>
+    /// <response code="404">Device not found.</response>
+    /// <returns>An <see cref="OkResult"/> containing the device info on success, or a <see cref="NotFoundResult"/> if the device could not be found.</returns>
+    [HttpGet("Options")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult<DeviceOptions>> GetDeviceOptions([FromQuery, Required] string id)
+    {
+        var deviceInfo = await _deviceManager.GetDeviceOptions(id).ConfigureAwait(false);
+        if (deviceInfo is null)
         {
-            var deviceInfo = _deviceManager.GetDeviceOptions(id);
-            if (deviceInfo == null)
-            {
-                return NotFound();
-            }
-
-            return deviceInfo;
+            return NotFound();
         }
 
-        /// <summary>
-        /// Update device options.
-        /// </summary>
-        /// <param name="id">Device Id.</param>
-        /// <param name="deviceOptions">Device Options.</param>
-        /// <response code="204">Device options updated.</response>
-        /// <response code="404">Device not found.</response>
-        /// <returns>A <see cref="NoContentResult"/> on success, or a <see cref="NotFoundResult"/> if the device could not be found.</returns>
-        [HttpPost("Options")]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public ActionResult UpdateDeviceOptions(
-            [FromQuery, Required] string id,
-            [FromBody, Required] DeviceOptions deviceOptions)
-        {
-            var existingDeviceOptions = _deviceManager.GetDeviceOptions(id);
-            if (existingDeviceOptions == null)
-            {
-                return NotFound();
-            }
+        return deviceInfo;
+    }
 
-            _deviceManager.UpdateDeviceOptions(id, deviceOptions);
-            return NoContent();
-        }
+    /// <summary>
+    /// Update device options.
+    /// </summary>
+    /// <param name="id">Device Id.</param>
+    /// <param name="deviceOptions">Device Options.</param>
+    /// <response code="204">Device options updated.</response>
+    /// <returns>A <see cref="NoContentResult"/>.</returns>
+    [HttpPost("Options")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    public async Task<ActionResult> UpdateDeviceOptions(
+        [FromQuery, Required] string id,
+        [FromBody, Required] DeviceOptionsDto deviceOptions)
+    {
+        await _deviceManager.UpdateDeviceOptions(id, deviceOptions.CustomName).ConfigureAwait(false);
+        return NoContent();
+    }
 
-        /// <summary>
-        /// Deletes a device.
-        /// </summary>
-        /// <param name="id">Device Id.</param>
-        /// <response code="204">Device deleted.</response>
-        /// <response code="404">Device not found.</response>
-        /// <returns>A <see cref="NoContentResult"/> on success, or a <see cref="NotFoundResult"/> if the device could not be found.</returns>
-        [HttpDelete]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public ActionResult DeleteDevice([FromQuery, Required] string id)
+    /// <summary>
+    /// Deletes a device.
+    /// </summary>
+    /// <param name="id">Device Id.</param>
+    /// <response code="204">Device deleted.</response>
+    /// <response code="404">Device not found.</response>
+    /// <returns>A <see cref="NoContentResult"/> on success, or a <see cref="NotFoundResult"/> if the device could not be found.</returns>
+    [HttpDelete]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    [ProducesResponseType(StatusCodes.Status404NotFound)]
+    public async Task<ActionResult> DeleteDevice([FromQuery, Required] string id)
+    {
+        var existingDevice = await _deviceManager.GetDevice(id).ConfigureAwait(false);
+        if (existingDevice is null)
         {
-            var existingDevice = _deviceManager.GetDevice(id);
-            if (existingDevice == null)
-            {
-                return NotFound();
-            }
-
-            var sessions = _authenticationRepository.Get(new AuthenticationInfoQuery { DeviceId = id }).Items;
+            return NotFound();
+        }
 
-            foreach (var session in sessions)
-            {
-                _sessionManager.Logout(session);
-            }
+        var sessions = await _deviceManager.GetDevices(new DeviceQuery { DeviceId = id }).ConfigureAwait(false);
 
-            return NoContent();
+        foreach (var session in sessions.Items)
+        {
+            await _sessionManager.Logout(session).ConfigureAwait(false);
         }
+
+        return NoContent();
     }
 }