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

PR Review: Renamed to Noop for consistency

Browse Source
This commit is contained in:
Emma Garland
2021-02-09 13:45:08 +00:00
parent 19fcbf80f4
commit 5d51427858
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Infrastructure/Security/NoOpLookupNormalizer.cs
View File

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

2
src/Umbraco.Infrastructure/Security/UmbracoUserManager.cs
View File

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

8
src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
View File

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

4
src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
View File

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