From 7d9b5524031fe6b5c23b4282cb1f9ec850b114fe Mon Sep 17 00:00:00 2001
From: ConfusedPolarBear <33811686+ConfusedPolarBear@users.noreply.github.com>
Date: Tue, 9 Jun 2020 13:28:40 -0500
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 .../ApplicationHost.cs                        |  1 -
 .../QuickConnect/ConfigurationExtension.cs    | 17 +++++----
 .../QuickConnect/QuickConnectConfiguration.cs | 11 ++----
 .../QuickConnect/QuickConnectManager.cs       | 35 +++++++++++++------
 .../Session/SessionManager.cs                 |  2 +-
 5 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 0a349bb33..51e63ecfc 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -646,7 +646,6 @@ namespace Emby.Server.Implementations
             serviceCollection.AddSingleton<IAttachmentExtractor, MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor>();
         }
 
-
         /// <summary>
         /// Create services registered with the service container that need to be initialized at application startup.
         /// </summary>
diff --git a/Emby.Server.Implementations/QuickConnect/ConfigurationExtension.cs b/Emby.Server.Implementations/QuickConnect/ConfigurationExtension.cs
index 349010039..596ded8ca 100644
--- a/Emby.Server.Implementations/QuickConnect/ConfigurationExtension.cs
+++ b/Emby.Server.Implementations/QuickConnect/ConfigurationExtension.cs
@@ -1,18 +1,17 @@
-using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
 
 namespace Emby.Server.Implementations.QuickConnect
 {
     /// <summary>
-    /// Configuration extension to support persistent quick connect configuration
+    /// Configuration extension to support persistent quick connect configuration.
     /// </summary>
     public static class ConfigurationExtension
     {
         /// <summary>
-        /// Return the current quick connect configuration
+        /// Return the current quick connect configuration.
         /// </summary>
-        /// <param name="manager">Configuration manager</param>
-        /// <returns></returns>
+        /// <param name="manager">Configuration manager.</param>
+        /// <returns>Current quick connect configuration.</returns>
         public static QuickConnectConfiguration GetQuickConnectConfiguration(this IConfigurationManager manager)
         {
             return manager.GetConfiguration<QuickConnectConfiguration>("quickconnect");
@@ -20,17 +19,17 @@ namespace Emby.Server.Implementations.QuickConnect
     }
 
     /// <summary>
-    /// Configuration factory for quick connect
+    /// Configuration factory for quick connect.
     /// </summary>
     public class QuickConnectConfigurationFactory : IConfigurationFactory
     {
         /// <summary>
-        /// Returns the current quick connect configuration
+        /// Returns the current quick connect configuration.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>Current quick connect configuration.</returns>
         public IEnumerable<ConfigurationStore> GetConfigurations()
         {
-            return new ConfigurationStore[]
+            return new[]
             {
                 new ConfigurationStore
                 {
diff --git a/Emby.Server.Implementations/QuickConnect/QuickConnectConfiguration.cs b/Emby.Server.Implementations/QuickConnect/QuickConnectConfiguration.cs
index e1881f278..2302ddbc3 100644
--- a/Emby.Server.Implementations/QuickConnect/QuickConnectConfiguration.cs
+++ b/Emby.Server.Implementations/QuickConnect/QuickConnectConfiguration.cs
@@ -3,19 +3,12 @@ using MediaBrowser.Model.QuickConnect;
 namespace Emby.Server.Implementations.QuickConnect
 {
     /// <summary>
-    /// Persistent quick connect configuration
+    /// Persistent quick connect configuration.
     /// </summary>
     public class QuickConnectConfiguration
     {
         /// <summary>
-        /// Quick connect configuration object
-        /// </summary>
-        public QuickConnectConfiguration()
-        {
-        }
-
-        /// <summary>
-        /// Persistent quick connect availability state
+        /// Gets or sets persistent quick connect availability state.
         /// </summary>
         public QuickConnectState State { get; set; }
     }
diff --git a/Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs b/Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
index 929e021a3..62b775fa6 100644
--- a/Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
+++ b/Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
@@ -27,15 +27,11 @@ namespace Emby.Server.Implementations.QuickConnect
         private readonly RNGCryptoServiceProvider _rng = new RNGCryptoServiceProvider();
         private Dictionary<string, QuickConnectResult> _currentRequests = new Dictionary<string, QuickConnectResult>();
 
-        private IServerConfigurationManager _config;
-        private ILogger _logger;
-        private IUserManager _userManager;
-        private ILocalizationManager _localizationManager;
-        private IJsonSerializer _jsonSerializer;
-        private IAuthenticationRepository _authenticationRepository;
-        private IAuthorizationContext _authContext;
-        private IServerApplicationHost _appHost;
-        private ITaskManager _taskManager;
+        private readonly IServerConfigurationManager _config;
+        private readonly ILogger<QuickConnectManager> _logger;
+        private readonly IAuthenticationRepository _authenticationRepository;
+        private readonly IAuthorizationContext _authContext;
+        private readonly IServerApplicationHost _appHost;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="QuickConnectManager"/> class.
@@ -207,7 +203,7 @@ namespace Emby.Server.Implementations.QuickConnect
                 scale = BitConverter.ToUInt32(raw, 0);
             }
 
-            int code = (int)(min + (max - min) * (scale / (double)uint.MaxValue));
+            int code = (int)(min + ((max - min) * (scale / (double)uint.MaxValue)));
             return code.ToString(CultureInfo.InvariantCulture);
         }
 
@@ -272,7 +268,26 @@ namespace Emby.Server.Implementations.QuickConnect
 
             return tokens.Count();
         }
+        /// <summary>
+        /// Dispose.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
 
+        /// <summary>
+        /// Dispose.
+        /// </summary>
+        /// <param name="disposing">Dispose unmanaged resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _rng?.Dispose();
+            }
+        }
         private string GenerateSecureRandom(int length = 32)
         {
             var bytes = new byte[length];
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index d7054e0b1..188b366aa 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1413,7 +1413,7 @@ namespace Emby.Server.Implementations.Session
                 Limit = 1
             });
 
-            if(result.TotalRecordCount < 1)
+            if (result.TotalRecordCount < 1)
             {
                 throw new SecurityException("Unknown quick connect token");
             }