6 Commits
Author SHA1 Message Date
dtourolleandClaude Opus 5 44ab98e082 Set version to 0.0.4
🏗️ Build Plugin / build (push) Successful in 36s
🧪 Test Plugin / test (push) Successful in 34s
🚀 Release Plugin / build-and-release (push) Successful in 47s
Dynamic group creation fix on top of 0.0.3.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-09 10:56:36 +02:00
dtourolleandClaude Opus 5 bb8814644c Set the shared account's password before claiming it
Provisioning assigned AuthenticationProviderId and only then called
IUserManager.ChangePassword. Jellyfin dispatches that call to the provider the
user is currently assigned to, so it reached this plugin's own ChangePassword,
which refuses by design. Creating a group by typing "alice+bob" at the login
screen therefore died with NotSupportedException.

Set the placeholder password first, while the freshly created account is still
on Jellyfin's default provider, then claim it.

The new end-to-end tests wire the real provisioning, group and authentication
services together rather than mocking IProvisioningService, and cover a group
created on demand being unlocked afterwards by either member's password. With
the old ordering restored, six of them fail with the original exception.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-09 10:56:36 +02:00
Gitea Actions 69f7a87cef Update manifest.json for version 0.0.3.0 2026-08-09 08:49:28 +00:00
dtourolleandClaude Opus 5 fd08d7ea1a Set version to 0.0.3
🏗️ Build Plugin / build (push) Successful in 1m43s
🧪 Test Plugin / test (push) Successful in 37s
🚀 Release Plugin / build-and-release (push) Successful in 45s
Startup-crash fix on top of 0.0.2.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-09 10:46:09 +02:00
dtourolleandClaude Opus 5 da779514fe Resolve the group services lazily in the authentication provider
Jellyfin's UserManager constructor-injects every IAuthenticationProvider, so
building IUserManager forced SharedAccountAuthenticationProvider to be built
first. That provider eagerly required IGroupService and IDynamicGroupService,
both of which need IUserManager, and the container refused to start the server
with "a circular dependency was detected".

Take the two group services as Lazy<T> and dereference them at authentication
time instead. Nobody can log in before the host is up, so the deferred lookup
is always safe. Microsoft's container has no built-in Lazy<T> support, hence
the explicit factory registrations.

The accompanying test builds the service graph through a stand-in that mimics
UserManager's constructor shape and validates it on build, so a reintroduced
cycle fails in CI rather than at server startup.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-09 10:46:09 +02:00
Gitea Actions dfab79e92a Update manifest.json for version 0.0.2 2026-07-31 07:45:09 +00:00
10 changed files with 479 additions and 24 deletions
+3 -3
View File
@@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>0.0.2.0</Version> <Version>0.0.4.0</Version>
<AssemblyVersion>0.0.2.0</AssemblyVersion> <AssemblyVersion>0.0.4.0</AssemblyVersion>
<FileVersion>0.0.2.0</FileVersion> <FileVersion>0.0.4.0</FileVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
@@ -63,8 +63,8 @@ public class AuthenticationTests
return new SharedAccountAuthenticationProvider( return new SharedAccountAuthenticationProvider(
crypto, crypto,
groups.Object, new Lazy<IGroupService>(() => groups.Object),
dynamic.Object, new Lazy<IDynamicGroupService>(() => dynamic.Object),
NullLogger<SharedAccountAuthenticationProvider>.Instance); NullLogger<SharedAccountAuthenticationProvider>.Instance);
} }
@@ -0,0 +1,151 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Jellyfin.Database.Implementations.Entities;
using Jellyfin.Plugin.WatchedTogether.Services;
using MediaBrowser.Controller.Library;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using Xunit;
namespace Jellyfin.Plugin.WatchedTogether.Tests;
/// <summary>
/// Covers shared-account provisioning against a user manager that dispatches password changes the
/// way Jellyfin's real one does.
/// </summary>
[Collection(nameof(PluginTestContext))]
public class ProvisioningTests
{
private static readonly string AuthProviderId =
typeof(Auth.SharedAccountAuthenticationProvider).FullName!;
private static User MakeUser(string name) => new(name, "Prov", "ResetProv");
/// <summary>
/// Builds a user manager that mimics the one behaviour that matters here: ChangePassword is
/// routed to the provider named by the user's AuthenticationProviderId, so an account already
/// claimed by us lands in our provider and is refused.
/// </summary>
private static Mock<IUserManager> MakeUserManager(List<User> users, List<string> callLog)
{
var userManager = new Mock<IUserManager>();
userManager.Setup(m => m.GetUserById(It.IsAny<Guid>()))
.Returns((Guid id) => users.Find(u => u.Id == id));
userManager.Setup(m => m.CreateUserAsync(It.IsAny<string>()))
.ReturnsAsync((string name) =>
{
var created = MakeUser(name);
users.Add(created);
callLog.Add("CreateUser");
return created;
});
userManager.Setup(m => m.ChangePassword(It.IsAny<User>(), It.IsAny<string>()))
.Returns((User user, string password) =>
{
callLog.Add($"ChangePassword(provider={user.AuthenticationProviderId})");
// This is the dispatch that made provisioning fail in 0.0.3: once the account is
// claimed, the call reaches our provider, which refuses it by design.
if (string.Equals(user.AuthenticationProviderId, AuthProviderId, StringComparison.Ordinal))
{
return new Auth.SharedAccountAuthenticationProvider(
Mock.Of<MediaBrowser.Model.Cryptography.ICryptoProvider>(),
new Lazy<IGroupService>(() => Mock.Of<IGroupService>()),
new Lazy<IDynamicGroupService>(() => Mock.Of<IDynamicGroupService>()),
NullLogger<Auth.SharedAccountAuthenticationProvider>.Instance)
.ChangePassword(user, password);
}
user.Password = password;
return Task.CompletedTask;
});
userManager.Setup(m => m.UpdateUserAsync(It.IsAny<User>()))
.Returns((User user) =>
{
callLog.Add($"UpdateUser(provider={user.AuthenticationProviderId})");
return Task.CompletedTask;
});
return userManager;
}
private static ProvisioningService MakeService(Mock<IUserManager> userManager)
=> new(
userManager.Object,
Mock.Of<ILibraryAccessService>(),
NullLogger<ProvisioningService>.Instance);
[Fact]
public async Task CreateGroupAsync_SetsPasswordBeforeClaimingTheAccount()
{
using var context = PluginTestContext.Create();
var alice = MakeUser("alice");
var bob = MakeUser("bob");
var users = new List<User> { alice, bob };
var callLog = new List<string>();
var service = MakeService(MakeUserManager(users, callLog));
// Before the fix this threw NotSupportedException from our own ChangePassword.
var group = await service.CreateGroupAsync([alice.Id, bob.Id], null);
Assert.NotEqual(Guid.Empty, group.SharedUserId);
// The password must be set while the account is still on Jellyfin's default provider.
var changeIndex = callLog.FindIndex(c => c.StartsWith("ChangePassword", StringComparison.Ordinal));
var claimIndex = callLog.FindIndex(c => c.Contains(AuthProviderId, StringComparison.Ordinal));
Assert.True(changeIndex >= 0, "provisioning should set a password on the shared account");
Assert.True(claimIndex >= 0, "provisioning should claim the account for our provider");
Assert.True(
changeIndex < claimIndex,
$"password must be set before the account is claimed, but call order was: {string.Join(" -> ", callLog)}");
}
[Fact]
public async Task CreateGroupAsync_LeavesTheAccountClaimedByOurProvider()
{
using var context = PluginTestContext.Create();
var alice = MakeUser("alice");
var bob = MakeUser("bob");
var users = new List<User> { alice, bob };
var callLog = new List<string>();
var service = MakeService(MakeUserManager(users, callLog));
var group = await service.CreateGroupAsync([alice.Id, bob.Id], null);
// Claiming the account is what routes its logins to us; provisioning is useless without it.
var sharedUser = users.Find(u => u.Id == group.SharedUserId);
Assert.NotNull(sharedUser);
Assert.Equal(AuthProviderId, sharedUser!.AuthenticationProviderId);
}
[Fact]
public async Task CreateGroupAsync_GivesTheSharedAccountANonEmptyPassword()
{
using var context = PluginTestContext.Create();
var alice = MakeUser("alice");
var bob = MakeUser("bob");
var users = new List<User> { alice, bob };
var callLog = new List<string>();
var service = MakeService(MakeUserManager(users, callLog));
var group = await service.CreateGroupAsync([alice.Id, bob.Id], null);
// A passwordless shared account would be directly loginable if the provider were ever
// unassigned, which is the reason provisioning sets one at all.
var sharedUser = users.Find(u => u.Id == group.SharedUserId);
Assert.NotNull(sharedUser);
Assert.False(string.IsNullOrEmpty(sharedUser!.Password));
}
}
@@ -0,0 +1,105 @@
using System;
using System.Collections.Generic;
using Jellyfin.Plugin.WatchedTogether;
using MediaBrowser.Controller.Authentication;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Cryptography;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using Xunit;
namespace Jellyfin.Plugin.WatchedTogether.Tests;
/// <summary>
/// Guards the plugin's service graph against container-level cycles.
/// </summary>
/// <remarks>
/// Jellyfin's real <c>UserManager</c> constructor-injects <c>IEnumerable&lt;IAuthenticationProvider&gt;</c>.
/// That means any plugin service reachable eagerly from our authentication provider must not itself
/// require <see cref="IUserManager"/>, or the host dies at startup with "a circular dependency was
/// detected". A cycle like that is invisible to unit tests that construct services by hand, so these
/// tests build the graph the way the host does.
/// </remarks>
public class ServiceRegistrationTests
{
/// <summary>
/// Stands in for Jellyfin's UserManager, whose constructor takes every registered authentication
/// provider. Only the constructor shape matters here - it is what closes the cycle.
/// </summary>
private sealed class UserManagerWithAuthProviders
{
public UserManagerWithAuthProviders(IEnumerable<IAuthenticationProvider> authenticationProviders)
{
AuthenticationProviders = authenticationProviders;
}
public IEnumerable<IAuthenticationProvider> AuthenticationProviders { get; }
}
private static ServiceProvider BuildHostLikeProvider()
{
var services = new ServiceCollection();
services.AddLogging(builder => builder.AddProvider(NullLoggerProvider.Instance));
// Host services the plugin consumes, other than IUserManager.
services.AddSingleton(Mock.Of<ILibraryManager>());
services.AddSingleton(Mock.Of<IUserDataManager>());
services.AddSingleton(Mock.Of<ICryptoProvider>());
// IUserManager resolves through the fake UserManager so that building it forces every
// IAuthenticationProvider to be built first, exactly as the real host does.
services.AddSingleton<UserManagerWithAuthProviders>();
services.AddSingleton(provider =>
{
provider.GetRequiredService<UserManagerWithAuthProviders>();
return Mock.Of<IUserManager>();
});
new ServiceRegistrator().RegisterServices(services, Mock.Of<MediaBrowser.Controller.IServerApplicationHost>());
return services.BuildServiceProvider(new ServiceProviderOptions
{
ValidateOnBuild = true,
ValidateScopes = true
});
}
[Fact]
public void PluginServices_ResolveWithoutCircularDependency()
{
using var provider = BuildHostLikeProvider();
// Resolving IUserManager is what the host does during startup, and is the exact path that
// previously threw InvalidOperationException for a circular dependency.
var userManager = provider.GetRequiredService<IUserManager>();
Assert.NotNull(userManager);
}
[Fact]
public void AuthenticationProvider_IsConstructedWithoutResolvingUserManager()
{
using var provider = BuildHostLikeProvider();
var authProviders = provider.GetRequiredService<IEnumerable<IAuthenticationProvider>>();
Assert.Contains(authProviders, p => p is Auth.SharedAccountAuthenticationProvider);
}
[Fact]
public void GroupServices_AreStillResolvableOnceTheHostIsUp()
{
using var provider = BuildHostLikeProvider();
// The Lazy<T> indirection must not change what the services resolve to at authentication
// time, and must hand back the same singletons the rest of the plugin uses.
var lazyGroupService = provider.GetRequiredService<Lazy<Services.IGroupService>>();
var lazyDynamicGroupService = provider.GetRequiredService<Lazy<Services.IDynamicGroupService>>();
Assert.Same(provider.GetRequiredService<Services.IGroupService>(), lazyGroupService.Value);
Assert.Same(provider.GetRequiredService<Services.IDynamicGroupService>(), lazyDynamicGroupService.Value);
}
}
@@ -0,0 +1,160 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Jellyfin.Database.Implementations.Entities;
using Jellyfin.Plugin.WatchedTogether.Auth;
using Jellyfin.Plugin.WatchedTogether.Services;
using MediaBrowser.Controller.Authentication;
using MediaBrowser.Controller.Library;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using Xunit;
namespace Jellyfin.Plugin.WatchedTogether.Tests;
/// <summary>
/// Exercises the whole path a real login takes: a group created on demand by typing "alice+bob",
/// then logged into again afterwards by each member in turn.
/// </summary>
/// <remarks>
/// The other suites mock <see cref="IProvisioningService"/>, which is why an ordering bug inside the
/// real provisioning code reached a release. These tests wire the real services together and only
/// stub the host's user manager and crypto.
/// </remarks>
[Collection(nameof(PluginTestContext))]
public class SharedAccountEndToEndTests
{
private const string AliceHash = "$PBKDF2-SHA512$iterations=210000$A1A1A1A1$AAAAAAAABBBBBBBB";
private const string BobHash = "$PBKDF2-SHA512$iterations=210000$B2B2B2B2$CCCCCCCCDDDDDDDD";
private static readonly string AuthProviderId =
typeof(SharedAccountAuthenticationProvider).FullName!;
private sealed record Harness(
SharedAccountAuthenticationProvider Provider,
List<User> Users);
private static User MakeUser(string name, string? password = null)
=> new(name, "Prov", "ResetProv") { Password = password! };
/// <summary>
/// Wires the real provisioning, group, dynamic-group and authentication services over a user
/// manager that behaves like Jellyfin's: password changes dispatch to the user's assigned
/// provider, and users resolve by both name and id.
/// </summary>
private static Harness MakeHarness(List<User> users, params (string Hash, string Password)[] validPairs)
{
var crypto = new StubCryptoProvider(validPairs);
var userManager = new Mock<IUserManager>();
userManager.Setup(m => m.GetUserById(It.IsAny<Guid>()))
.Returns((Guid id) => users.Find(u => u.Id == id)!);
userManager.Setup(m => m.GetUserByName(It.IsAny<string>()))
.Returns((string n) => users.Find(
u => string.Equals(u.Username, n, StringComparison.OrdinalIgnoreCase))!);
userManager.Setup(m => m.CreateUserAsync(It.IsAny<string>()))
.ReturnsAsync((string name) =>
{
var created = MakeUser(name);
users.Add(created);
return created;
});
userManager.Setup(m => m.UpdateUserAsync(It.IsAny<User>())).Returns(Task.CompletedTask);
userManager.Setup(m => m.ChangePassword(It.IsAny<User>(), It.IsAny<string>()))
.Returns((User user, string password) =>
{
// Jellyfin routes this to the user's assigned provider; ours refuses by design.
if (string.Equals(user.AuthenticationProviderId, AuthProviderId, StringComparison.Ordinal))
{
throw new NotSupportedException(
"A Watched Together shared account has no password of its own.");
}
user.Password = password;
return Task.CompletedTask;
});
var groupService = new GroupService(
userManager.Object,
NullLogger<GroupService>.Instance);
var provisioning = new ProvisioningService(
userManager.Object,
Mock.Of<ILibraryAccessService>(),
NullLogger<ProvisioningService>.Instance);
var dynamicGroups = new DynamicGroupService(
userManager.Object,
provisioning,
crypto,
NullLogger<DynamicGroupService>.Instance);
var provider = new SharedAccountAuthenticationProvider(
crypto,
new Lazy<IGroupService>(() => groupService),
new Lazy<IDynamicGroupService>(() => dynamicGroups),
NullLogger<SharedAccountAuthenticationProvider>.Instance);
return new Harness(provider, users);
}
[Theory]
[InlineData("alice-pw")]
[InlineData("bob-pw")]
public async Task GroupCreatedOnDemand_ThenUnlockedByEitherMemberPassword(string creatingPassword)
{
using var ctx = PluginTestContext.Create();
var alice = MakeUser("alice", AliceHash);
var bob = MakeUser("bob", BobHash);
var users = new List<User> { alice, bob };
var h = MakeHarness(users, (AliceHash, "alice-pw"), (BobHash, "bob-pw"));
// Creating the group by typing both names. Whichever member types their own password, the
// resulting account must behave identically.
var created = await h.Provider.Authenticate("alice+bob", creatingPassword, null);
Assert.Equal("alice+bob", created.Username);
var shared = h.Users.Find(u => u.Username == "alice+bob");
Assert.NotNull(shared);
// The account exists now, so Jellyfin resolves it and hands it to us as resolvedUser. Both
// members must be able to unlock it, regardless of who created it.
var asAlice = await h.Provider.Authenticate("alice+bob", "alice-pw", shared);
Assert.Equal("alice+bob", asAlice.Username);
var asBob = await h.Provider.Authenticate("alice+bob", "bob-pw", shared);
Assert.Equal("alice+bob", asBob.Username);
// And an outsider's password still must not.
await Assert.ThrowsAsync<AuthenticationException>(
() => h.Provider.Authenticate("alice+bob", "not-a-member-pw", shared!));
}
[Fact]
public async Task GroupCreatedOnDemand_ClaimsTheAccountAndKeepsAPassword()
{
using var ctx = PluginTestContext.Create();
var alice = MakeUser("alice", AliceHash);
var bob = MakeUser("bob", BobHash);
var users = new List<User> { alice, bob };
var h = MakeHarness(users, (AliceHash, "alice-pw"), (BobHash, "bob-pw"));
await h.Provider.Authenticate("alice+bob", "alice-pw", null);
var shared = h.Users.Find(u => u.Username == "alice+bob");
Assert.NotNull(shared);
// Claimed by us, so future logins route here, and holding a password of its own so it is
// not directly loginable if the provider is ever unassigned.
Assert.Equal(AuthProviderId, shared!.AuthenticationProviderId);
Assert.False(string.IsNullOrEmpty(shared.Password));
}
}
@@ -28,21 +28,28 @@ namespace Jellyfin.Plugin.WatchedTogether.Auth;
public class SharedAccountAuthenticationProvider : IAuthenticationProvider, IRequiresResolvedUser public class SharedAccountAuthenticationProvider : IAuthenticationProvider, IRequiresResolvedUser
{ {
private readonly ICryptoProvider _cryptoProvider; private readonly ICryptoProvider _cryptoProvider;
private readonly Services.IGroupService _groupService; private readonly Lazy<Services.IGroupService> _groupService;
private readonly Services.IDynamicGroupService _dynamicGroupService; private readonly Lazy<Services.IDynamicGroupService> _dynamicGroupService;
private readonly ILogger<SharedAccountAuthenticationProvider> _logger; private readonly ILogger<SharedAccountAuthenticationProvider> _logger;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="SharedAccountAuthenticationProvider"/> class. /// Initializes a new instance of the <see cref="SharedAccountAuthenticationProvider"/> class.
/// </summary> /// </summary>
/// <param name="cryptoProvider">The crypto provider used to verify stored password hashes.</param> /// <param name="cryptoProvider">The crypto provider used to verify stored password hashes.</param>
/// <param name="groupService">The group service.</param> /// <param name="groupService">A deferred handle to the group service.</param>
/// <param name="dynamicGroupService">The on-demand group creation service.</param> /// <param name="dynamicGroupService">A deferred handle to the on-demand group creation service.</param>
/// <param name="logger">The logger.</param> /// <param name="logger">The logger.</param>
/// <remarks>
/// The group services are taken as <see cref="Lazy{T}"/> to break a container-level cycle.
/// Jellyfin's <c>UserManager</c> constructor-injects every <see cref="IAuthenticationProvider"/>,
/// so resolving those services eagerly here would require <c>IUserManager</c> while it is still
/// being built and the host would refuse to start. Deferring the lookup to the first
/// authentication is safe: nobody can log in until the host is fully up.
/// </remarks>
public SharedAccountAuthenticationProvider( public SharedAccountAuthenticationProvider(
ICryptoProvider cryptoProvider, ICryptoProvider cryptoProvider,
Services.IGroupService groupService, Lazy<Services.IGroupService> groupService,
Services.IDynamicGroupService dynamicGroupService, Lazy<Services.IDynamicGroupService> dynamicGroupService,
ILogger<SharedAccountAuthenticationProvider> logger) ILogger<SharedAccountAuthenticationProvider> logger)
{ {
_cryptoProvider = cryptoProvider; _cryptoProvider = cryptoProvider;
@@ -73,7 +80,7 @@ public class SharedAccountAuthenticationProvider : IAuthenticationProvider, IReq
// a real user with that exact name always resolves first and never reaches this branch. // a real user with that exact name always resolves first and never reaches this branch.
if (resolvedUser is null) if (resolvedUser is null)
{ {
var created = await _dynamicGroupService var created = await _dynamicGroupService.Value
.TryCreateFromLoginAsync(username, password) .TryCreateFromLoginAsync(username, password)
.ConfigureAwait(false); .ConfigureAwait(false);
@@ -85,7 +92,7 @@ public class SharedAccountAuthenticationProvider : IAuthenticationProvider, IReq
return new ProviderAuthenticationResult { Username = created.SharedUsername }; return new ProviderAuthenticationResult { Username = created.SharedUsername };
} }
var group = _groupService.GetGroupForSharedUser(resolvedUser.Id); var group = _groupService.Value.GetGroupForSharedUser(resolvedUser.Id);
if (group is null) if (group is null)
{ {
// Either not one of ours, or the group is disabled. Either way this account has no // Either not one of ours, or the group is disabled. Either way this account has no
@@ -96,7 +103,7 @@ public class SharedAccountAuthenticationProvider : IAuthenticationProvider, IReq
throw new AuthenticationException("Invalid username or password."); throw new AuthenticationException("Invalid username or password.");
} }
var members = _groupService.GetEligibleMembers(group); var members = _groupService.Value.GetEligibleMembers(group);
if (members.Count == 0) if (members.Count == 0)
{ {
_logger.LogWarning( _logger.LogWarning(
@@ -1,3 +1,4 @@
using System;
using Jellyfin.Plugin.WatchedTogether.Auth; using Jellyfin.Plugin.WatchedTogether.Auth;
using Jellyfin.Plugin.WatchedTogether.Services; using Jellyfin.Plugin.WatchedTogether.Services;
using MediaBrowser.Controller; using MediaBrowser.Controller;
@@ -20,6 +21,14 @@ public class ServiceRegistrator : IPluginServiceRegistrator
serviceCollection.AddSingleton<IProvisioningService, ProvisioningService>(); serviceCollection.AddSingleton<IProvisioningService, ProvisioningService>();
serviceCollection.AddSingleton<IDynamicGroupService, DynamicGroupService>(); serviceCollection.AddSingleton<IDynamicGroupService, DynamicGroupService>();
// The auth provider takes these lazily so the container can build it while IUserManager is
// still under construction; see SharedAccountAuthenticationProvider's constructor remarks.
// Microsoft's container has no built-in Lazy<T> support, so the factories are explicit.
serviceCollection.AddSingleton(
provider => new Lazy<IGroupService>(provider.GetRequiredService<IGroupService>));
serviceCollection.AddSingleton(
provider => new Lazy<IDynamicGroupService>(provider.GetRequiredService<IDynamicGroupService>));
// Discovered by Jellyfin and matched to shared accounts via User.AuthenticationProviderId. // Discovered by Jellyfin and matched to shared accounts via User.AuthenticationProviderId.
serviceCollection.AddSingleton<IAuthenticationProvider, SharedAccountAuthenticationProvider>(); serviceCollection.AddSingleton<IAuthenticationProvider, SharedAccountAuthenticationProvider>();
@@ -100,15 +100,20 @@ public class ProvisioningService : IProvisioningService
var sharedUser = await _userManager.CreateUserAsync(accountName).ConfigureAwait(false); var sharedUser = await _userManager.CreateUserAsync(accountName).ConfigureAwait(false);
// The shared account never authenticates against its own password - our provider checks
// member hashes instead. Setting a random one avoids leaving a passwordless account behind
// if the provider is ever unassigned.
//
// This must happen before the account is claimed below. IUserManager.ChangePassword
// dispatches to the provider the user is currently assigned to, and ours refuses the call
// by design, so claiming first would make provisioning throw NotSupportedException. A
// freshly created user is still on Jellyfin's default provider, which stores the hash.
await _userManager.ChangePassword(sharedUser, GenerateUnusedPassword()).ConfigureAwait(false);
// Route this account's logins through our provider. Jellyfin matches providers by // Route this account's logins through our provider. Jellyfin matches providers by
// GetType().FullName, the same key the SSO plugin uses, and the assignment only sticks // GetType().FullName, the same key the SSO plugin uses, and the assignment only sticks
// once the user is updated. // once the user is updated.
sharedUser.AuthenticationProviderId = AuthProviderId; sharedUser.AuthenticationProviderId = AuthProviderId;
// The shared account never authenticates against its own password - our provider checks
// member hashes instead. Setting a random one avoids leaving a passwordless account behind
// if the provider is ever unassigned.
await _userManager.ChangePassword(sharedUser, GenerateUnusedPassword()).ConfigureAwait(false);
await _userManager.UpdateUserAsync(sharedUser).ConfigureAwait(false); await _userManager.UpdateUserAsync(sharedUser).ConfigureAwait(false);
await ApplyLibraryAccessAsync(sharedUser.Id, distinctIds).ConfigureAwait(false); await ApplyLibraryAccessAsync(sharedUser.Id, distinctIds).ConfigureAwait(false);
+7 -5
View File
@@ -1,7 +1,7 @@
--- ---
name: "Watched Together" name: "Watched Together"
guid: "aa3288a0-e8c1-43e2-8045-8c3411142a5b" guid: "aa3288a0-e8c1-43e2-8045-8c3411142a5b"
version: "0.0.2.0" version: "0.0.4.0"
targetAbi: "10.11.0.0" targetAbi: "10.11.0.0"
framework: "net9.0" framework: "net9.0"
overview: "One shared login for several people; watched state flows back to each member's own account" overview: "One shared login for several people; watched state flows back to each member's own account"
@@ -26,7 +26,9 @@ dotnet_framework: "net9.0"
# Point at the plugin project rather than the solution so the test project is not packaged. # Point at the plugin project rather than the solution so the test project is not packaged.
project: "Jellyfin.Plugin.WatchedTogether/Jellyfin.Plugin.WatchedTogether.csproj" project: "Jellyfin.Plugin.WatchedTogether/Jellyfin.Plugin.WatchedTogether.csproj"
changelog: > changelog: >
Member order no longer matters when resolving a group: "john+jane" and Fixes creating a group by typing "alice+bob" at the login screen, which failed
"jane+john" are the same account instead of creating a second one. Account with "a Watched Together shared account has no password of its own".
names are sorted alphabetically, and a member's password is checked in the Provisioning set the new account's placeholder password after routing it
order the names were typed. through this plugin's authentication provider, which refuses password changes
by design; the password is now set while the account is still on Jellyfin's
default provider.
+16
View File
@@ -7,6 +7,22 @@
"owner": "dtourolle", "owner": "dtourolle",
"category": "General", "category": "General",
"versions": [ "versions": [
{
"version": "0.0.3.0",
"changelog": "Release 0.0.3.0",
"targetAbi": "10.11.0.0",
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/WatchedTogether/releases/download/v0.0.3.0/watched-together_0.0.3.0.zip",
"checksum": "56aa6c2e8f12d7404889de8bc253eae3",
"timestamp": "2026-08-09T08:49:27Z"
},
{
"version": "0.0.2",
"changelog": "Release 0.0.2",
"targetAbi": "10.11.0.0",
"sourceUrl": "https://gitea.tourolle.paris/dtourolle/WatchedTogether/releases/download/v0.0.2/watched-together_0.0.2.0.zip",
"checksum": "0fedb68a0910414518d7dc45f05fd78f",
"timestamp": "2026-07-31T07:45:08Z"
},
{ {
"version": "0.0.1", "version": "0.0.1",
"changelog": "Release 0.0.1", "changelog": "Release 0.0.1",