mirror of https://github.com/jellyfin/jellyfin.git
Use IHostedService for device access management
This commit is contained in:
parent
99ea6059c7
commit
d986a824cd
|
@ -1,64 +0,0 @@
|
||||||
#pragma warning disable CS1591
|
|
||||||
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Jellyfin.Data.Entities;
|
|
||||||
using Jellyfin.Data.Enums;
|
|
||||||
using Jellyfin.Data.Events;
|
|
||||||
using Jellyfin.Data.Queries;
|
|
||||||
using MediaBrowser.Controller.Devices;
|
|
||||||
using MediaBrowser.Controller.Library;
|
|
||||||
using MediaBrowser.Controller.Plugins;
|
|
||||||
using MediaBrowser.Controller.Session;
|
|
||||||
|
|
||||||
namespace Jellyfin.Server.Implementations.Users
|
|
||||||
{
|
|
||||||
public sealed class DeviceAccessEntryPoint : IServerEntryPoint
|
|
||||||
{
|
|
||||||
private readonly IUserManager _userManager;
|
|
||||||
private readonly IDeviceManager _deviceManager;
|
|
||||||
private readonly ISessionManager _sessionManager;
|
|
||||||
|
|
||||||
public DeviceAccessEntryPoint(IUserManager userManager, IDeviceManager deviceManager, ISessionManager sessionManager)
|
|
||||||
{
|
|
||||||
_userManager = userManager;
|
|
||||||
_deviceManager = deviceManager;
|
|
||||||
_sessionManager = sessionManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task RunAsync()
|
|
||||||
{
|
|
||||||
_userManager.OnUserUpdated += OnUserUpdated;
|
|
||||||
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void OnUserUpdated(object? sender, GenericEventArgs<User> e)
|
|
||||||
{
|
|
||||||
var user = e.Argument;
|
|
||||||
if (!user.HasPermission(PermissionKind.EnableAllDevices))
|
|
||||||
{
|
|
||||||
await UpdateDeviceAccess(user).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task UpdateDeviceAccess(User user)
|
|
||||||
{
|
|
||||||
var existing = (await _deviceManager.GetDevices(new DeviceQuery
|
|
||||||
{
|
|
||||||
UserId = user.Id
|
|
||||||
}).ConfigureAwait(false)).Items;
|
|
||||||
|
|
||||||
foreach (var device in existing)
|
|
||||||
{
|
|
||||||
if (!string.IsNullOrEmpty(device.DeviceId) && !_deviceManager.CanAccessDevice(user, device.DeviceId))
|
|
||||||
{
|
|
||||||
await _sessionManager.Logout(device).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,76 @@
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Jellyfin.Data.Entities;
|
||||||
|
using Jellyfin.Data.Enums;
|
||||||
|
using Jellyfin.Data.Events;
|
||||||
|
using Jellyfin.Data.Queries;
|
||||||
|
using MediaBrowser.Controller.Devices;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
using MediaBrowser.Controller.Session;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
|
||||||
|
namespace Jellyfin.Server.Implementations.Users;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// <see cref="IHostedService"/> responsible for managing user device permissions.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class DeviceAccessHost : IHostedService
|
||||||
|
{
|
||||||
|
private readonly IUserManager _userManager;
|
||||||
|
private readonly IDeviceManager _deviceManager;
|
||||||
|
private readonly ISessionManager _sessionManager;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="DeviceAccessHost"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="userManager">The <see cref="IUserManager"/>.</param>
|
||||||
|
/// <param name="deviceManager">The <see cref="IDeviceManager"/>.</param>
|
||||||
|
/// <param name="sessionManager">The <see cref="ISessionManager"/>.</param>
|
||||||
|
public DeviceAccessHost(IUserManager userManager, IDeviceManager deviceManager, ISessionManager sessionManager)
|
||||||
|
{
|
||||||
|
_userManager = userManager;
|
||||||
|
_deviceManager = deviceManager;
|
||||||
|
_sessionManager = sessionManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
_userManager.OnUserUpdated += OnUserUpdated;
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
_userManager.OnUserUpdated -= OnUserUpdated;
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void OnUserUpdated(object? sender, GenericEventArgs<User> e)
|
||||||
|
{
|
||||||
|
var user = e.Argument;
|
||||||
|
if (!user.HasPermission(PermissionKind.EnableAllDevices))
|
||||||
|
{
|
||||||
|
await UpdateDeviceAccess(user).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task UpdateDeviceAccess(User user)
|
||||||
|
{
|
||||||
|
var existing = (await _deviceManager.GetDevices(new DeviceQuery
|
||||||
|
{
|
||||||
|
UserId = user.Id
|
||||||
|
}).ConfigureAwait(false)).Items;
|
||||||
|
|
||||||
|
foreach (var device in existing)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(device.DeviceId) && !_deviceManager.CanAccessDevice(user, device.DeviceId))
|
||||||
|
{
|
||||||
|
await _sessionManager.Logout(device).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue