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

Renamed MembersUserManager

Browse Source
This commit is contained in:
Emma Garland
2021-02-12 14:38:20 +00:00
parent 89ef1aab37
commit 2d00ece365
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Infrastructure/Security/IMembersUserManager.cs → src/Umbraco.Infrastructure/Security/IMemberManager.cs
View File

@@ -3,7 +3,7 @@ namespace Umbraco.Infrastructure.Security
/// <summary>
/// The user manager for members
/// </summary>
public interface IMembersUserManager : IUmbracoUserManager<MembersIdentityUser>
public interface IMemberManager : IUmbracoUserManager<MembersIdentityUser>
{
}
}

2
src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/MembersServiceCollectionExtensionsTests.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Tests.Integration.Umbraco.Web.BackOffice
[Test]
public void AddMembersIdentity_ExpectMembersUserManagerResolvable()
{
IMembersUserManager userManager = Services.GetService<IMembersUserManager>();
IMemberManager userManager = Services.GetService<IMemberManager>();
Assert.NotNull(userManager);
}

2
src/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
View File

@@ -55,7 +55,7 @@ namespace Umbraco.Tests.UnitTests.AutoFixture
.Customize(new ConstructorCustomization(typeof(MemberController), new GreedyConstructorQuery()))
.Customize(new ConstructorCustomization(typeof(BackOfficeController), new GreedyConstructorQuery()))
.Customize(new ConstructorCustomization(typeof(BackOfficeUserManager), new GreedyConstructorQuery()))
.Customize(new ConstructorCustomization(typeof(MembersUserManager), new GreedyConstructorQuery()));
.Customize(new ConstructorCustomization(typeof(MemberManager), new GreedyConstructorQuery()));
fixture.Customize(new AutoMoqCustomization());

10
src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberIdentityUserManagerTests.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
private Mock<ILogger<UserManager<MembersIdentityUser>>> _mockLogger;
private Mock<IOptions<MemberPasswordConfigurationSettings>> _mockPasswordConfiguration;
public MembersUserManager CreateSut()
public MemberManager CreateSut()
{
_mockMemberStore = new Mock<IUserStore<MembersIdentityUser>>();
_mockIdentityOptions = new Mock<IOptions<MembersIdentityOptions>>();
@@ -62,7 +62,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
new PasswordValidator<MembersIdentityUser>()
};
var userManager = new MembersUserManager(
var userManager = new MemberManager(
new Mock<IIpResolver>().Object,
_mockMemberStore.Object,
_mockIdentityOptions.Object,
@@ -87,7 +87,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
public async Task GivenICreateUser_AndTheIdentityResultFailed_ThenIShouldGetAFailedResultAsync()
{
//arrange
MembersUserManager sut = CreateSut();
MemberManager sut = CreateSut();
MembersIdentityUser fakeUser = new MembersIdentityUser()
{
PasswordConfig = "testConfig"
@@ -120,7 +120,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
public async Task GivenICreateUser_AndTheUserIsNull_ThenIShouldGetAFailedResultAsync()
{
//arrange
MembersUserManager sut = CreateSut();
MemberManager sut = CreateSut();
CancellationToken fakeCancellationToken = new CancellationToken() { };
IdentityError[] identityErrors =
{
@@ -148,7 +148,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.Security
public async Task GivenICreateANewUser_AndTheUserIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
{
//arrange
MembersUserManager sut = CreateSut();
MemberManager sut = CreateSut();
MembersIdentityUser fakeUser = new MembersIdentityUser()
{
PasswordConfig = "testConfig"

14
src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
View File

@@ -64,7 +64,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
[Test]
[AutoMoqData]
public void PostSaveMember_WhenModelStateIsNotValid_ExpectFailureResponse(
[Frozen] IMembersUserManager umbracoMembersUserManager,
[Frozen] IMemberManager umbracoMembersUserManager,
IMemberService memberService,
IMemberTypeService memberTypeService,
IMemberGroupService memberGroupService,
@@ -99,7 +99,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
[Test]
[AutoMoqData]
public async Task PostSaveMember_SaveNew_NoCustomField_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
[Frozen] IMembersUserManager umbracoMembersUserManager,
[Frozen] IMemberManager umbracoMembersUserManager,
IMemberService memberService,
IMemberTypeService memberTypeService,
IMemberGroupService memberGroupService,
@@ -137,7 +137,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
[Test]
[AutoMoqData]
public async Task PostSaveMember_SaveNew_CustomField_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
[Frozen] IMembersUserManager umbracoMembersUserManager,
[Frozen] IMemberManager umbracoMembersUserManager,
IMemberService memberService,
IMemberTypeService memberTypeService,
IMemberGroupService memberGroupService,
@@ -176,7 +176,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
[Test]
[AutoMoqData]
public async Task PostSaveMember_SaveExisting_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
[Frozen] IMembersUserManager umbracoMembersUserManager,
[Frozen] IMemberManager umbracoMembersUserManager,
IMemberService memberService,
IMemberTypeService memberTypeService,
IMemberGroupService memberGroupService,
@@ -222,7 +222,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
[Test]
[AutoMoqData]
public void PostSaveMember_SaveNew_WhenMemberEmailAlreadyExists_ExpectFailResponse(
[Frozen] IMembersUserManager umbracoMembersUserManager,
[Frozen] IMemberManager umbracoMembersUserManager,
IMemberService memberService,
IMemberTypeService memberTypeService,
IMemberGroupService memberGroupService,
@@ -261,7 +261,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
[Test]
[AutoMoqData]
public async Task PostSaveMember_SaveExistingMember_WithNoRoles_Add1Role_ExpectSuccessResponse(
[Frozen] IMembersUserManager umbracoMembersUserManager,
[Frozen] IMemberManager umbracoMembersUserManager,
IMemberService memberService,
IMemberTypeService memberTypeService,
IMemberGroupService memberGroupService,
@@ -330,7 +330,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
IMemberService memberService,
IMemberTypeService memberTypeService,
IMemberGroupService memberGroupService,
IMembersUserManager membersUserManager,
IMemberManager membersUserManager,
IDataTypeService dataTypeService,
IBackOfficeSecurityAccessor backOfficeSecurityAccessor)
{

4
src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
View File

@@ -50,7 +50,7 @@ namespace Umbraco.Web.BackOffice.Controllers
private readonly UmbracoMapper _umbracoMapper;
private readonly IMemberService _memberService;
private readonly IMemberTypeService _memberTypeService;
private readonly IMembersUserManager _memberManager;
private readonly IMemberManager _memberManager;
private readonly IDataTypeService _dataTypeService;
private readonly ILocalizedTextService _localizedTextService;
private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
@@ -83,7 +83,7 @@ namespace Umbraco.Web.BackOffice.Controllers
UmbracoMapper umbracoMapper,
IMemberService memberService,
IMemberTypeService memberTypeService,
IMembersUserManager memberManager,
IMemberManager memberManager,
IDataTypeService dataTypeService,
IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
IJsonSerializer jsonSerializer)

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

@@ -45,7 +45,7 @@ namespace Umbraco.Web.BackOffice.DependencyInjection
services.BuildMembersIdentity()
.AddDefaultTokenProviders()
.AddUserStore<MembersUserStore>()
.AddMembersUserManager<IMembersUserManager, MembersUserManager>();
.AddMembersUserManager<IMemberManager, MemberManager>();
private static BackOfficeIdentityBuilder BuildUmbracoBackOfficeIdentity(this IServiceCollection services)
{

4
src/Umbraco.Web.Common/Security/MembersUserManager.cs → src/Umbraco.Web.Common/Security/MemberManager.cs
View File

@@ -17,11 +17,11 @@ using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.Web.Common.Security
{
public class MembersUserManager : UmbracoUserManager<MembersIdentityUser, MemberPasswordConfigurationSettings>, IMembersUserManager
public class MemberManager : UmbracoUserManager<MembersIdentityUser, MemberPasswordConfigurationSettings>, IMemberManager
{
private readonly IHttpContextAccessor _httpContextAccessor;
public MembersUserManager(
public MemberManager(
IIpResolver ipResolver,
IUserStore<MembersIdentityUser> store,
IOptions<MembersIdentityOptions> optionsAccessor,