Fix concurrency issues

2 files changed, 8 insertions, 7 deletions

diff --git a/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs b/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
index b10b7a998..92be5477c 100644
--- a/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
+++ b/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
@@ -15,12 +15,12 @@ namespace Jellyfin.Server.Implementations.Security
 {
     public class AuthorizationContext : IAuthorizationContext
     {
-        private readonly JellyfinDb _jellyfinDb;
+        private readonly JellyfinDbProvider _jellyfinDbProvider;
         private readonly IUserManager _userManager;
 
-        public AuthorizationContext(JellyfinDb jellyfinDb, IUserManager userManager)
+        public AuthorizationContext(JellyfinDbProvider jellyfinDb, IUserManager userManager)
         {
-            _jellyfinDb = jellyfinDb;
+            _jellyfinDbProvider = jellyfinDb;
             _userManager = userManager;
         }
 
@@ -117,7 +117,8 @@ namespace Jellyfin.Server.Implementations.Security
 #pragma warning restore CA1508
 
             authInfo.HasToken = true;
-            var device = await _jellyfinDb.Devices.FirstOrDefaultAsync(d => d.AccessToken == token).ConfigureAwait(false);
+            await using var jellyfinDb = _jellyfinDbProvider.CreateContext();
+            var device = await jellyfinDb.Devices.FirstOrDefaultAsync(d => d.AccessToken == token).ConfigureAwait(false);
 
             if (device != null)
             {
@@ -186,8 +187,8 @@ namespace Jellyfin.Server.Implementations.Security
 
                 if (updateToken)
                 {
-                    _jellyfinDb.Devices.Update(device);
-                    await _jellyfinDb.SaveChangesAsync().ConfigureAwait(false);
+                    jellyfinDb.Devices.Update(device);
+                    await jellyfinDb.SaveChangesAsync().ConfigureAwait(false);
                 }
             }
 
diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index 362be8531..e480b9a69 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -95,7 +95,7 @@ namespace Jellyfin.Server
             ServiceCollection.AddSingleton<IWebSocketListener, ScheduledTasksWebSocketListener>();
             ServiceCollection.AddSingleton<IWebSocketListener, SessionInfoWebSocketListener>();
 
-            ServiceCollection.AddScoped<IAuthorizationContext, AuthorizationContext>();
+            ServiceCollection.AddSingleton<IAuthorizationContext, AuthorizationContext>();
 
             base.RegisterServices();
         }