aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Barron <barronpm@gmail.com>2021-04-10 17:11:59 -0400
committerPatrick Barron <barronpm@gmail.com>2021-04-10 17:11:59 -0400
commited0b5ff0171e340544702d99a07c149e01c5bf8a (patch)
tree47fd042c5694218a254a5f71b130fa95c05fad02
parent3ebc0474343eb07defb6dd6f0e8bed707471e0a0 (diff)
Fix builds
-rw-r--r--Jellyfin.Data/Entities/Security/Device.cs5
-rw-r--r--Jellyfin.Server.Implementations/Devices/DeviceManager.cs9
-rw-r--r--Jellyfin.Server.Implementations/Security/AuthenticationManager.cs7
-rw-r--r--Jellyfin.Server.Implementations/Users/UserManager.cs2
-rw-r--r--MediaBrowser.Controller/Devices/IDeviceManager.cs8
5 files changed, 20 insertions, 11 deletions
diff --git a/Jellyfin.Data/Entities/Security/Device.cs b/Jellyfin.Data/Entities/Security/Device.cs
index 17d17f594..bb192e772 100644
--- a/Jellyfin.Data/Entities/Security/Device.cs
+++ b/Jellyfin.Data/Entities/Security/Device.cs
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
namespace Jellyfin.Data.Entities.Security
{
@@ -31,6 +32,10 @@ namespace Jellyfin.Data.Entities.Security
User = null!;
}
+ /// <summary>
+ /// Gets the id.
+ /// </summary>
+ [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; private set; }
/// <summary>
diff --git a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
index 0d93ee2bf..4758f24f3 100644
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -15,6 +15,9 @@ using Microsoft.EntityFrameworkCore;
namespace Jellyfin.Server.Implementations.Devices
{
+ /// <summary>
+ /// Manages the creation, updating, and retrieval of devices.
+ /// </summary>
public class DeviceManager : IDeviceManager
{
private readonly JellyfinDbProvider _dbProvider;
@@ -63,9 +66,9 @@ namespace Jellyfin.Server.Implementations.Devices
}
/// <inheritdoc />
- public ClientCapabilities GetCapabilities(string id)
+ public ClientCapabilities GetCapabilities(string deviceId)
{
- return _capabilitiesMap.TryGetValue(id, out ClientCapabilities? result)
+ return _capabilitiesMap.TryGetValue(deviceId, out ClientCapabilities? result)
? result
: new ClientCapabilities();
}
@@ -112,7 +115,7 @@ namespace Jellyfin.Server.Implementations.Devices
sessions = sessions.Where(i => CanAccessDevice(user, i.DeviceId));
}
- var array = await sessions.Select(ToDeviceInfo).ToArrayAsync();
+ var array = await sessions.Select(ToDeviceInfo).ToArrayAsync().ConfigureAwait(false);
return new QueryResult<DeviceInfo>(array);
}
diff --git a/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs b/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs
index 37b8ee6e0..ab76e2302 100644
--- a/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs
+++ b/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs
@@ -52,14 +52,15 @@ namespace Jellyfin.Server.Implementations.Security
}
/// <inheritdoc />
- public async Task DeleteApiKey(Guid id)
+ public async Task DeleteApiKey(Guid accessToken)
{
await using var dbContext = _dbProvider.CreateContext();
var key = await dbContext.ApiKeys
.AsQueryable()
- .Where(apiKey => apiKey.AccessToken == id)
- .FirstOrDefaultAsync();
+ .Where(apiKey => apiKey.AccessToken == accessToken)
+ .FirstOrDefaultAsync()
+ .ConfigureAwait(false);
if (key == null)
{
diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 4d847ec95..87d33330f 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -295,7 +295,7 @@ namespace Jellyfin.Server.Implementations.Users
}
user.EasyPassword = newPasswordSha1;
- await UpdateUserAsync(user);
+ await UpdateUserAsync(user).ConfigureAwait(false);
_eventManager.Publish(new UserPasswordChangedEventArgs(user));
}
diff --git a/MediaBrowser.Controller/Devices/IDeviceManager.cs b/MediaBrowser.Controller/Devices/IDeviceManager.cs
index 0df040794..4cdd8575e 100644
--- a/MediaBrowser.Controller/Devices/IDeviceManager.cs
+++ b/MediaBrowser.Controller/Devices/IDeviceManager.cs
@@ -18,16 +18,16 @@ namespace MediaBrowser.Controller.Devices
/// <summary>
/// Saves the capabilities.
/// </summary>
- /// <param name="reportedId">The reported identifier.</param>
+ /// <param name="deviceId">The device id.</param>
/// <param name="capabilities">The capabilities.</param>
- void SaveCapabilities(string reportedId, ClientCapabilities capabilities);
+ void SaveCapabilities(string deviceId, ClientCapabilities capabilities);
/// <summary>
/// Gets the capabilities.
/// </summary>
- /// <param name="reportedId">The reported identifier.</param>
+ /// <param name="deviceId">The device id.</param>
/// <returns>ClientCapabilities.</returns>
- ClientCapabilities GetCapabilities(string reportedId);
+ ClientCapabilities GetCapabilities(string deviceId);
/// <summary>
/// Gets the device information.