diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index 1e7068b24b..b23053ae89 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -93,7 +93,7 @@ namespace Emby.Server.Implementations.Library
transaction.Commit();
- var userId = user.InternalId;
+ var userId = user.Id;
var cacheKey = GetCacheKey(userId, item.Id);
_cache.AddOrUpdate(cacheKey, userData);
item.UserData = dbContext.UserData.Where(e => e.ItemId == item.Id).AsNoTracking().ToArray(); // rehydrate the cached userdata
@@ -201,7 +201,7 @@ namespace Emby.Server.Implementations.Library
foreach (var item in items)
{
- var cacheKey = GetCacheKey(user.InternalId, item.Id);
+ var cacheKey = GetCacheKey(user.Id, item.Id);
if (_cache.TryGet(cacheKey, out var cachedData))
{
result[item.Id] = cachedData;
@@ -252,7 +252,7 @@ namespace Emby.Server.Implementations.Library
}
result[item.Id] = userData;
- var cacheKey = GetCacheKey(user.InternalId, item.Id);
+ var cacheKey = GetCacheKey(user.Id, item.Id);
_cache.AddOrUpdate(cacheKey, userData);
}
@@ -360,9 +360,10 @@ namespace Emby.Server.Implementations.Library
/// Gets the internal key.
///
/// System.String.
- private static string GetCacheKey(long internalUserId, Guid itemId)
+ private static string GetCacheKey(Guid userId, Guid itemId)
{
- return internalUserId.ToString(CultureInfo.InvariantCulture) + "-" + itemId.ToString("N", CultureInfo.InvariantCulture);
+ // Keyed by the user's Guid: a new user can get the InternalId of a deleted one.
+ return userId.ToString("N", CultureInfo.InvariantCulture) + "-" + itemId.ToString("N", CultureInfo.InvariantCulture);
}
///
@@ -553,7 +554,7 @@ namespace Emby.Server.Implementations.Library
dbContext.SaveChanges();
- var cacheKey = GetCacheKey(user.InternalId, item.Id);
+ var cacheKey = GetCacheKey(user.Id, item.Id);
if (_cache.TryGet(cacheKey, out var cached))
{
cached.AudioStreamIndex = null;
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/UserDataManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/UserDataManagerTests.cs
index 2ed16de15b..a6c4fa6f72 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Library/UserDataManagerTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/UserDataManagerTests.cs
@@ -210,6 +210,34 @@ public sealed class UserDataManagerTests : IDisposable
Assert.Equal(333, result[retiredItem.Id].PlaybackPositionTicks);
}
+ [Fact]
+ public void GetUserDataBatch_UserReusingInternalIdOfDeletedUser_DoesNotGetItsCachedData()
+ {
+ // a new user gets the next InternalId, so it takes the number of the newest user once that one is deleted
+ _user.InternalId = 2;
+ var newUser = new User("new user", "auth-provider", "reset-provider")
+ {
+ Id = Guid.NewGuid(),
+ InternalId = 2
+ };
+
+ var item = CreateAudioBook();
+ item.UserData = new List
+ {
+ CreateUserDataRow(item, item.GetUserDataKeys()[0], 222)
+ };
+
+ // caches _user's data for the item
+ Assert.Equal(222, _userDataManager.GetUserDataBatch([item], _user)[item.Id].PlaybackPositionTicks);
+
+ // deleting _user removes its rows
+ item.UserData = new List();
+
+ var userData = _userDataManager.GetUserDataBatch([item], newUser)[item.Id];
+
+ Assert.Equal(0, userData.PlaybackPositionTicks);
+ }
+
[Fact]
public void SaveUserData_RowUnderRetiredKey_IsKeptInAgreement()
{