From 0338c2fc4a78dfcdd53dfcb069249770406dbc78 Mon Sep 17 00:00:00 2001
From: Scott Brady <scott@scottbrady91.com>
Date: Fri, 24 Apr 2020 12:52:49 +0100
Subject: [PATCH] Removed null checks from normalizer (breaks Umbraco bootstrap
 process)

---
 .../Security/NopLookupNormalizerTests.cs       | 18 +++++++++++-------
 .../Security/NopLookupNormalizer.cs            | 15 +++------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Tests/Security/NopLookupNormalizerTests.cs b/src/Umbraco.Tests/Security/NopLookupNormalizerTests.cs
index 1e035035dc..2abecbb4dd 100644
--- a/src/Umbraco.Tests/Security/NopLookupNormalizerTests.cs
+++ b/src/Umbraco.Tests/Security/NopLookupNormalizerTests.cs
@@ -10,11 +10,13 @@ namespace Umbraco.Tests.Security
         [TestCase(null)]
         [TestCase("")]
         [TestCase(" ")]
-        public void NormalizeName_When_Name_Null_Or_Whitespace_Expect_ArgumentNullException(string name)
+        public void NormalizeName_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string name)
         {
             var sut = new NopLookupNormalizer();
 
-            Assert.Throws<ArgumentNullException>(() => sut.NormalizeName(name));
+            var normalizedName = sut.NormalizeName(name);
+
+            Assert.AreEqual(name, normalizedName);
         }
 
         [Test]
@@ -31,22 +33,24 @@ namespace Umbraco.Tests.Security
         [TestCase(null)]
         [TestCase("")]
         [TestCase(" ")]
-        public void NormalizeEmail_When_Name_Null_Or_Whitespace_Expect_ArgumentNullException(string email)
+        public void NormalizeEmail_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string email)
         {
             var sut = new NopLookupNormalizer();
 
-            Assert.Throws<ArgumentNullException>(() => sut.NormalizeEmail(email));
+            var normalizedEmail = sut.NormalizeEmail(email);
+
+            Assert.AreEqual(email, normalizedEmail);
         }
 
         [Test]
         public void NormalizeEmail_Expect_Input_Returned()
         {
-            var name = $"{Guid.NewGuid()}@umbraco";
+            var email = $"{Guid.NewGuid()}@umbraco";
             var sut = new NopLookupNormalizer();
 
-            var normalizedName = sut.NormalizeEmail(name);
+            var normalizedEmail = sut.NormalizeEmail(email);
 
-            Assert.AreEqual(name, normalizedName);
+            Assert.AreEqual(email, normalizedEmail);
         }
     }
 }
diff --git a/src/Umbraco.Web/Security/NopLookupNormalizer.cs b/src/Umbraco.Web/Security/NopLookupNormalizer.cs
index 48e42c2d5e..08aa8d548a 100644
--- a/src/Umbraco.Web/Security/NopLookupNormalizer.cs
+++ b/src/Umbraco.Web/Security/NopLookupNormalizer.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity;
 
 namespace Umbraco.Web.Security
 {
@@ -8,16 +7,8 @@ namespace Umbraco.Web.Security
     /// </summary>
     public class NopLookupNormalizer : ILookupNormalizer
     {
-        public string NormalizeName(string name)
-        {
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullException(nameof(name));
-            return name;
-        }
+        public string NormalizeName(string name) => name;
 
-        public string NormalizeEmail(string email)
-        {
-            if (string.IsNullOrWhiteSpace(email)) throw new ArgumentNullException(nameof(email));
-            return email;
-        }
+        public string NormalizeEmail(string email) => email;
     }
 }