From 5d51427858df950730771da0fe270a8df51a2b6f Mon Sep 17 00:00:00 2001
From: Emma Garland <emmagarland77@gmail.com>
Date: Tue, 9 Feb 2021 13:45:08 +0000
Subject: [PATCH] PR Review: Renamed to Noop for consistency

---
 .../Security/NoOpLookupNormalizer.cs                      | 4 +---
 src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs | 2 +-
 .../Security/NoOpLookupNormalizerTests.cs                 | 8 ++++----
 .../DependencyInjection/ServiceCollectionExtensions.cs    | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Infrastructure/Security/NoOpLookupNormalizer.cs b/src/Umbraco.Infrastructure/Security/NoOpLookupNormalizer.cs
index c81a46e726..7c114835d7 100644
--- a/src/Umbraco.Infrastructure/Security/NoOpLookupNormalizer.cs
+++ b/src/Umbraco.Infrastructure/Security/NoOpLookupNormalizer.cs
@@ -6,10 +6,8 @@ namespace Umbraco.Infrastructure.Security
     /// <summary>
     /// No-op lookup normalizer to maintain compatibility with ASP.NET Identity 2
     /// </summary>
-    public class NoOpLookupNormalizer : ILookupNormalizer
+    public class NoopLookupNormalizer : ILookupNormalizer
     {
-        // TODO: Do we need this?
-
         public string NormalizeName(string name) => name;
 
         public string NormalizeEmail(string email) => email;
diff --git a/src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs b/src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
index 7c767865b0..43155b4567 100644
--- a/src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
+++ b/src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
@@ -38,7 +38,7 @@ namespace Umbraco.Infrastructure.Security
             IServiceProvider services,
             ILogger<UserManager<TUser>> logger,
             IOptions<TPasswordConfig> passwordConfiguration)
-            : base(store, optionsAccessor, passwordHasher, userValidators, passwordValidators, new NoOpLookupNormalizer(), errors, services, logger)
+            : base(store, optionsAccessor, passwordHasher, userValidators, passwordValidators, new NoopLookupNormalizer(), errors, services, logger)
         {
             IpResolver = ipResolver ?? throw new ArgumentNullException(nameof(ipResolver));
             PasswordConfiguration = passwordConfiguration.Value ?? throw new ArgumentNullException(nameof(passwordConfiguration));
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
index 86cb339625..27202e9353 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
         public void NormalizeName_Expect_Input_Returned()
         {
             var name = Guid.NewGuid().ToString();
-            var sut = new NoOpLookupNormalizer();
+            var sut = new NoopLookupNormalizer();
 
             var normalizedName = sut.NormalizeName(name);
 
@@ -24,7 +24,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
         public void NormalizeEmail_Expect_Input_Returned()
         {
             var email = $"{Guid.NewGuid()}@umbraco";
-            var sut = new NoOpLookupNormalizer();
+            var sut = new NoopLookupNormalizer();
 
             var normalizedEmail = sut.NormalizeEmail(email);
 
@@ -37,7 +37,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
         [TestCase(" ")]
         public void NormalizeName_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string name)
         {
-            var sut = new NoOpLookupNormalizer();
+            var sut = new NoopLookupNormalizer();
 
             var normalizedName = sut.NormalizeName(name);
 
@@ -50,7 +50,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
         [TestCase(" ")]
         public void NormalizeEmail_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string email)
         {
-            var sut = new NoOpLookupNormalizer();
+            var sut = new NoopLookupNormalizer();
 
             var normalizedEmail = sut.NormalizeEmail(email);
 
diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
index bca0c67ed7..56ab6a904d 100644
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
@@ -67,7 +67,7 @@ namespace Umbraco.Web.BackOffice.DependencyInjection
             services.TryAddScoped<IUserClaimsPrincipalFactory<BackOfficeIdentityUser>, UserClaimsPrincipalFactory<BackOfficeIdentityUser>>();
 
             // CUSTOM:
-            services.TryAddScoped<NoOpLookupNormalizer>();
+            services.TryAddScoped<NoopLookupNormalizer>();
             services.TryAddScoped<BackOfficeIdentityErrorDescriber>();
             services.TryAddScoped<IIpResolver, AspNetCoreIpResolver>();
             services.TryAddSingleton<IBackOfficeExternalLoginProviders, BackOfficeExternalLoginProviders>();
@@ -79,7 +79,7 @@ namespace Umbraco.Web.BackOffice.DependencyInjection
              * To validate the container the following registrations are required (dependencies of UserManager<T>)
              * Perhaps we shouldn't be registering UserManager<T> at all and only registering/depending the UmbracoBackOffice prefixed types.
              */
-            services.TryAddScoped<ILookupNormalizer, NoOpLookupNormalizer>();
+            services.TryAddScoped<ILookupNormalizer, NoopLookupNormalizer>();
             services.TryAddScoped<IdentityErrorDescriber, BackOfficeIdentityErrorDescriber>();
 
             return new BackOfficeIdentityBuilder(services);