From b836fe96857de9e39d9b565b1f57a151a82e401d Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Fri, 21 Oct 2022 11:55:32 +0200
Subject: remove JellyfinDbProvider and add second level caching

---
 .../Security/AuthenticationManager.cs              | 70 ++++++++++++----------
 1 file changed, 38 insertions(+), 32 deletions(-)

(limited to 'Jellyfin.Server.Implementations/Security/AuthenticationManager.cs')

diff --git a/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs b/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs
index b79e46469..33c08c8c2 100644
--- a/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs
+++ b/Jellyfin.Server.Implementations/Security/AuthenticationManager.cs
@@ -10,13 +10,13 @@ namespace Jellyfin.Server.Implementations.Security
     /// <inheritdoc />
     public class AuthenticationManager : IAuthenticationManager
     {
-        private readonly JellyfinDbProvider _dbProvider;
+        private readonly IDbContextFactory<JellyfinDb> _dbProvider;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AuthenticationManager"/> class.
         /// </summary>
         /// <param name="dbProvider">The database provider.</param>
-        public AuthenticationManager(JellyfinDbProvider dbProvider)
+        public AuthenticationManager(IDbContextFactory<JellyfinDb> dbProvider)
         {
             _dbProvider = dbProvider;
         }
@@ -24,50 +24,56 @@ namespace Jellyfin.Server.Implementations.Security
         /// <inheritdoc />
         public async Task CreateApiKey(string name)
         {
-            await using var dbContext = _dbProvider.CreateContext();
-
-            dbContext.ApiKeys.Add(new ApiKey(name));
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
+            {
+                dbContext.ApiKeys.Add(new ApiKey(name));
 
-            await dbContext.SaveChangesAsync().ConfigureAwait(false);
+                await dbContext.SaveChangesAsync().ConfigureAwait(false);
+            }
         }
 
         /// <inheritdoc />
         public async Task<IReadOnlyList<AuthenticationInfo>> GetApiKeys()
         {
-            await using var dbContext = _dbProvider.CreateContext();
-
-            return await dbContext.ApiKeys
-                .AsAsyncEnumerable()
-                .Select(key => new AuthenticationInfo
-                {
-                    AppName = key.Name,
-                    AccessToken = key.AccessToken,
-                    DateCreated = key.DateCreated,
-                    DeviceId = string.Empty,
-                    DeviceName = string.Empty,
-                    AppVersion = string.Empty
-                }).ToListAsync().ConfigureAwait(false);
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
+            {
+                return await dbContext.ApiKeys
+                    .AsAsyncEnumerable()
+                    .Select(key => new AuthenticationInfo
+                    {
+                        AppName = key.Name,
+                        AccessToken = key.AccessToken,
+                        DateCreated = key.DateCreated,
+                        DeviceId = string.Empty,
+                        DeviceName = string.Empty,
+                        AppVersion = string.Empty
+                    }).ToListAsync().ConfigureAwait(false);
+            }
         }
 
         /// <inheritdoc />
         public async Task DeleteApiKey(string accessToken)
         {
-            await using var dbContext = _dbProvider.CreateContext();
-
-            var key = await dbContext.ApiKeys
-                .AsQueryable()
-                .Where(apiKey => apiKey.AccessToken == accessToken)
-                .FirstOrDefaultAsync()
-                .ConfigureAwait(false);
-
-            if (key == null)
+            var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
             {
-                return;
-            }
+                var key = await dbContext.ApiKeys
+                    .AsQueryable()
+                    .Where(apiKey => apiKey.AccessToken == accessToken)
+                    .FirstOrDefaultAsync()
+                    .ConfigureAwait(false);
 
-            dbContext.Remove(key);
+                if (key == null)
+                {
+                    return;
+                }
+
+                dbContext.Remove(key);
 
-            await dbContext.SaveChangesAsync().ConfigureAwait(false);
+                await dbContext.SaveChangesAsync().ConfigureAwait(false);
+            }
         }
     }
 }
-- 
cgit v1.2.3