yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed null checks from normalizer (breaks Umbraco bootstrap process)

Browse Source
This commit is contained in:
Scott Brady
2020-04-24 12:52:49 +01:00
parent 9c9bd1dd1e
commit 0338c2fc4a
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Tests/Security/NopLookupNormalizerTests.cs
View File

@@ -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);
}
}
}

15
src/Umbraco.Web/Security/NopLookupNormalizer.cs
View File

@@ -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;
}
}