Apply minor suggestions from code review

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>

2 files changed, 113 insertions, 112 deletions

diff --git a/Emby.Server.Implementations/Library/DefaultPasswordResetProvider.cs b/Emby.Server.Implementations/Library/DefaultPasswordResetProvider.cs
index 1ae8960ee..46f3732d6 100644
--- a/Emby.Server.Implementations/Library/DefaultPasswordResetProvider.cs
+++ b/Emby.Server.Implementations/Library/DefaultPasswordResetProvider.cs
@@ -1,113 +1,114 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Authentication;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Users;
-
-namespace Emby.Server.Implementations.Library
-{
-    public class DefaultPasswordResetProvider : IPasswordResetProvider
-    {
-        public string Name => "Default Password Reset Provider";
-
-        public bool IsEnabled => true;
-
-        private readonly string _passwordResetFileBase;
-        private readonly string _passwordResetFileBaseDir;
-        private readonly string _passwordResetFileBaseName = "passwordreset";
-
-        private IJsonSerializer _jsonSerializer;
-        private IUserManager _userManager;
-
-        public DefaultPasswordResetProvider(IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IUserManager userManager)
-        {
-            _passwordResetFileBaseDir = configurationManager.ApplicationPaths.ProgramDataPath;
-            _passwordResetFileBase = Path.Combine(_passwordResetFileBaseDir, _passwordResetFileBaseName);
-            _jsonSerializer = jsonSerializer;
-            _userManager = userManager;
-        }
-
-        public async Task<PinRedeemResult> RedeemPasswordResetPin(string pin)
-        {
-            HashSet<string> usersreset = new HashSet<string>();
-            foreach (var resetfile in Directory.EnumerateFiles(_passwordResetFileBaseDir, $"{_passwordResetFileBaseName}*"))
-            {
-                var spr = (SerializablePasswordReset) _jsonSerializer.DeserializeFromFile(typeof(SerializablePasswordReset), resetfile);
-                if (spr.ExpirationDate < DateTime.Now)
-                {
-                    File.Delete(resetfile);
-                }
-                else
-                {
-                    if (spr.Pin == pin)
-                    {
-                        var resetUser = _userManager.GetUserByName(spr.UserName);
-                        if (!string.IsNullOrEmpty(resetUser.Password))
-                        {
-                            await _userManager.ChangePassword(resetUser, pin).ConfigureAwait(false);
-                            usersreset.Add(resetUser.Name);
-                        }
-                    }
-                }
-            }
-
-            if (usersreset.Count < 1)
-            {
-                throw new ResourceNotFoundException($"No Users found with a password reset request matching pin {pin}");
-            }
-            else
-            {
-                return new PinRedeemResult
-                {
-                    Success = true,
-                    UsersReset = usersreset.ToArray()
-                };
-            }
-            throw new System.NotImplementedException();
-        }
-
-        public async Task<ForgotPasswordResult> StartForgotPasswordProcess(MediaBrowser.Controller.Entities.User user, bool isInNetwork)
-        {
-            string pin = new Random().Next(99999999).ToString("00000000",CultureInfo.InvariantCulture);
-            DateTime expireTime = DateTime.Now.AddMinutes(30);
-            string filePath = _passwordResetFileBase + user.Name.ToLowerInvariant() + ".json";
-            SerializablePasswordReset spr = new SerializablePasswordReset
-            {
-                ExpirationDate = expireTime,
-                Pin = pin,
-                PinFile = filePath,
-                UserName = user.Name
-            };
-
-            try
-            {
-                await Task.Run(() => File.WriteAllText(filePath, _jsonSerializer.SerializeToString(spr))).ConfigureAwait(false);
-            }
-            catch (Exception e)
-            {
-                throw new Exception($"Error serializing or writing password reset for {user.Name} to location:{filePath}", e);
-            }
-
-            return new ForgotPasswordResult
-            {
-                Action = ForgotPasswordAction.PinCode,
-                PinExpirationDate = expireTime,
-                PinFile = filePath
-            };
-        }
-
-        private class SerializablePasswordReset : PasswordPinCreationResult
-        {
-            public string Pin { get; set; }
+using System;

+using System.Collections.Generic;

+using System.Globalization;

+using System.IO;

+using System.Linq;

+using System.Threading.Tasks;

+using MediaBrowser.Common.Extensions;

+using MediaBrowser.Controller.Authentication;

+using MediaBrowser.Controller.Configuration;

+using MediaBrowser.Controller.Library;

+using MediaBrowser.Model.Serialization;

+using MediaBrowser.Model.Users;

 

-            public string UserName { get; set; }
-        }
-    }
+namespace Emby.Server.Implementations.Library

+{

+    public class DefaultPasswordResetProvider : IPasswordResetProvider

+    {

+        public string Name => "Default Password Reset Provider";

+

+        public bool IsEnabled => true;

+

+        private readonly string _passwordResetFileBase;

+        private readonly string _passwordResetFileBaseDir;

+        private readonly string _passwordResetFileBaseName = "passwordreset";

+

+        private IJsonSerializer _jsonSerializer;

+        private IUserManager _userManager;

+

+        public DefaultPasswordResetProvider(IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IUserManager userManager)

+        {

+            _passwordResetFileBaseDir = configurationManager.ApplicationPaths.ProgramDataPath;

+            _passwordResetFileBase = Path.Combine(_passwordResetFileBaseDir, _passwordResetFileBaseName);

+            _jsonSerializer = jsonSerializer;

+            _userManager = userManager;

+        }

+

+        public async Task<PinRedeemResult> RedeemPasswordResetPin(string pin)

+        {

+            HashSet<string> usersreset = new HashSet<string>();

+            foreach (var resetfile in Directory.EnumerateFiles(_passwordResetFileBaseDir, $"{_passwordResetFileBaseName}*"))

+            {

+                var spr = (SerializablePasswordReset) _jsonSerializer.DeserializeFromFile(typeof(SerializablePasswordReset), resetfile);

+                if (spr.ExpirationDate < DateTime.Now)

+                {

+                    File.Delete(resetfile);

+                }

+                else

+                {

+                    if (spr.Pin == pin)

+                    {

+                        var resetUser = _userManager.GetUserByName(spr.UserName);

+                        if (!string.IsNullOrEmpty(resetUser.Password))

+                        {

+                            await _userManager.ChangePassword(resetUser, pin).ConfigureAwait(false);

+                            usersreset.Add(resetUser.Name);

+                        }

+                    }

+                }

+            }

+

+            if (usersreset.Count < 1)

+            {

+                throw new ResourceNotFoundException($"No Users found with a password reset request matching pin {pin}");

+            }

+            else

+            {

+                return new PinRedeemResult

+                {

+                    Success = true,

+                    UsersReset = usersreset.ToArray()

+                };

+            }

+

+            throw new System.NotImplementedException();

+        }

+

+        public async Task<ForgotPasswordResult> StartForgotPasswordProcess(MediaBrowser.Controller.Entities.User user, bool isInNetwork)

+        {

+            string pin = new Random().Next(99999999).ToString("00000000",CultureInfo.InvariantCulture);

+            DateTime expireTime = DateTime.Now.AddMinutes(30);

+            string filePath = _passwordResetFileBase + user.Name.ToLowerInvariant() + ".json";

+            SerializablePasswordReset spr = new SerializablePasswordReset

+            {

+                ExpirationDate = expireTime,

+                Pin = pin,

+                PinFile = filePath,

+                UserName = user.Name

+            };

+

+            try

+            {

+                await Task.Run(() => File.WriteAllText(filePath, _jsonSerializer.SerializeToString(spr))).ConfigureAwait(false);

+            }

+            catch (Exception e)

+            {

+                throw new Exception($"Error serializing or writing password reset for {user.Name} to location: {filePath}", e);

+            }

+

+            return new ForgotPasswordResult

+            {

+                Action = ForgotPasswordAction.PinCode,

+                PinExpirationDate = expireTime,

+                PinFile = filePath

+            };

+        }

+

+        private class SerializablePasswordReset : PasswordPinCreationResult

+        {

+            public string Pin { get; set; }

+

+            public string UserName { get; set; }

+        }

+    }

 }

diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs
index 05ec750ba..75c82ca71 100644
--- a/Emby.Server.Implementations/Library/UserManager.cs
+++ b/Emby.Server.Implementations/Library/UserManager.cs
@@ -373,7 +373,7 @@ namespace Emby.Server.Implementations.Library
 
         private IPasswordResetProvider GetPasswordResetProvider(User user)
         {
-            return GetPasswordResetProviders(user).First();
+            return GetPasswordResetProviders(user)[0];
         }
 
         private IAuthenticationProvider[] GetAuthenticationProviders(User user)