dtourolleandClaude Opus 5
bd08629fff
Jellyfin 12 moved to .NET 10 and changed the IUserManager surface the plugin relies on: Users/UsersIds became GetUsers()/GetUsersIds(), ChangePassword takes a user id, HasPassword left the provider contract, and the user cache is gone, so every lookup is a detached copy. The plugin now multi-targets net9.0 (against 10.11.5) and net10.0 (against 12.0.0). The differences sit behind a JELLYFIN_12 constant in Compat/UserManagerCompat.cs, whose ChangePasswordAsync also carries the stored hash back onto the caller's instance: on 12 the UpdateUserAsync that claims the account would otherwise write the stale null password back over the one provisioning just set. Each release ships one package per generation, with the fourth version segment naming the target (x.y.z.11 and x.y.z.12) so a 12 server picks the 12 package over the 10.11 one. scripts/package.sh wraps jprm for a single generation and the workflows call it twice. The builder image moves to the .NET 10 SDK, which builds both targets; the net9.0 test run rolls forward onto the .NET 10 runtime. CA1873 is a .NET 10 analyzer that flags the same log calls CA1848 does; it is set to Info, as in the upstream Jellyfin 12 tree. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
42 lines
1.6 KiB
C#
42 lines
1.6 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Threading.Tasks;
|
|
using Jellyfin.Database.Implementations.Entities;
|
|
using MediaBrowser.Controller.Library;
|
|
using Moq;
|
|
|
|
namespace Jellyfin.Plugin.WatchedTogether.Tests;
|
|
|
|
/// <summary>
|
|
/// Sets up the <see cref="IUserManager"/> members whose signatures differ between Jellyfin 10.11
|
|
/// and 12, so the suites read the same whichever generation they are compiled against.
|
|
/// </summary>
|
|
internal static class UserManagerMockExtensions
|
|
{
|
|
/// <summary>
|
|
/// Routes <c>ChangePassword</c> to <paramref name="onChange"/> with the user the real server
|
|
/// would act on: the instance handed in on 10.11, the stored row looked up by id on 12.
|
|
/// </summary>
|
|
/// <param name="mock">The user manager mock.</param>
|
|
/// <param name="users">The users the mock knows about, used to resolve ids on 12.</param>
|
|
/// <param name="onChange">The behaviour to run for the change.</param>
|
|
public static void SetupChangePassword(
|
|
this Mock<IUserManager> mock,
|
|
List<User> users,
|
|
Func<User, string, Task> onChange)
|
|
{
|
|
#if JELLYFIN_12
|
|
mock.Setup(m => m.ChangePassword(It.IsAny<Guid>(), It.IsAny<string>()))
|
|
.Returns((Guid id, string password) =>
|
|
{
|
|
var user = users.Find(u => u.Id == id)
|
|
?? throw new KeyNotFoundException($"No user with id {id}");
|
|
return onChange(user, password);
|
|
});
|
|
#else
|
|
mock.Setup(m => m.ChangePassword(It.IsAny<User>(), It.IsAny<string>()))
|
|
.Returns((User user, string password) => onChange(user, password));
|
|
#endif
|
|
}
|
|
}
|