From 9f3aa2cead95ec0a66a518919c179eea4cad5d9c Mon Sep 17 00:00:00 2001
From: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
Date: Mon, 18 Feb 2019 00:31:03 -0800
Subject: Apply suggestions from code review

Adding minor stylistic suggestions from Bond-009

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
---
 .../Library/DefaultAuthenticationProvider.cs                     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs')

diff --git a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
index 33428c05e..016de6db7 100644
--- a/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
+++ b/Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
@@ -44,7 +44,7 @@ namespace Emby.Server.Implementations.Library
             PasswordHash readyHash = new PasswordHash(resolvedUser.Password);
             byte[] CalculatedHash;
             string CalculatedHashString;
-            if (_cryptographyProvider.GetSupportedHashMethods().Any(i => i == readyHash.Id))
+            if (_cryptographyProvider.GetSupportedHashMethods().Contains(readyHash.Id))
             {
                 if (String.IsNullOrEmpty(readyHash.Salt))
                 {
@@ -64,7 +64,7 @@ namespace Emby.Server.Implementations.Library
             }
             else
             {
-                throw new Exception(String.Format("Requested crypto method not available in provider: {0}", readyHash.Id));
+                throw new Exception(String.Format($"Requested crypto method not available in provider: {readyHash.Id}"));
             }
 
             //var success = string.Equals(GetPasswordHash(resolvedUser), GetHashedString(resolvedUser, password), StringComparison.OrdinalIgnoreCase);
@@ -95,7 +95,7 @@ namespace Emby.Server.Implementations.Library
                 if (user.EasyPassword != null && !user.EasyPassword.Contains("$"))
                 {
                     string hash = user.EasyPassword;
-                    user.EasyPassword = String.Format("$SHA1${0}", hash);
+                    user.EasyPassword = string.Format("$SHA1${0}", hash);
                 }
             }
         }
@@ -122,7 +122,8 @@ namespace Emby.Server.Implementations.Library
                 passwordHash.Salt = PasswordHash.ConvertToByteString(passwordHash.SaltBytes);
                 passwordHash.Id = _cryptographyProvider.DefaultHashMethod;
                 passwordHash.Hash = GetHashedStringChangeAuth(newPassword, passwordHash);
-            }else if (newPassword != null)
+            }
+            else if (newPassword != null)
             {
                 passwordHash.Hash = GetHashedString(user, newPassword);
             }
-- 
cgit v1.2.3