Revert #18249 as it is reimplemented for v15 Revert #18320 as the new architecture explictly throws an error # Conflicts: # build/azure-pipelines.yml # src/Umbraco.Core/EmbeddedResources/Lang/en.xml # src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml # src/Umbraco.Core/Models/ContentEditing/ContentSaveAction.cs # src/Umbraco.Core/Services/ContentService.cs # src/Umbraco.Core/Services/IContentService.cs # src/Umbraco.Core/Services/MemberService.cs # src/Umbraco.Infrastructure/PropertyEditors/RichTextEditorPastedImages.cs # src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs # src/Umbraco.Infrastructure/Security/MemberUserStore.cs # src/Umbraco.Web.BackOffice/Controllers/ContentController.cs # src/Umbraco.Web.BackOffice/Controllers/EntityController.cs # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs # src/Umbraco.Web.BackOffice/Controllers/MemberController.cs # src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs # src/Umbraco.Web.BackOffice/Controllers/UsersController.cs # src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilder.BackOfficeAuth.cs # src/Umbraco.Web.BackOffice/Filters/ContentSaveValidationAttribute.cs # src/Umbraco.Web.BackOffice/Filters/MemberSaveModelValidator.cs # src/Umbraco.Web.BackOffice/Filters/MemberSaveValidationAttribute.cs # src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs # src/Umbraco.Web.Common/RuntimeMinification/SmidgeOptionsSetup.cs # src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs # src/Umbraco.Web.Common/Views/UmbracoViewPage.cs # src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbuttongroup.directive.js # src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js # src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js # src/Umbraco.Web.UI.Client/src/common/directives/components/property/umbproperty.directive.js # src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js # src/Umbraco.Web.UI.Client/src/common/resources/publicaccess.resource.js # src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js # src/Umbraco.Web.UI.Client/src/common/services/assets.service.js # src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediaentryeditor/mediaentryeditor.controller.js # src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html # src/Umbraco.Web.UI.Client/src/views/components/property/umb-property.html # src/Umbraco.Web.UI.Client/src/views/content/content.create.controller.js # src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js # src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.component.js # src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html # src/Umbraco.Web.UI.Client/src/views/webhooks/edit.controller.js # src/Umbraco.Web.UI.Client/src/views/webhooks/edit.html # src/Umbraco.Web.UI.Client/test/unit/app/content/create-content-controller.spec.js # src/Umbraco.Web.UI.Client~HEAD # src/Umbraco.Web.UI.Login/src/auth.element.ts # tests/Umbraco.TestData/UmbracoTestDataController.cs # tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentServiceTests.cs # tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs # tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs # tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs # version.json
260 lines
10 KiB
C#
260 lines
10 KiB
C#
using System.Collections.Generic;
|
|
using System.Data;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using Moq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
using Umbraco.Cms.Core.Events;
|
|
using Umbraco.Cms.Core.Mapping;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.PublishedCache;
|
|
using Umbraco.Cms.Core.Scoping;
|
|
using Umbraco.Cms.Core.Security;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Tests.UnitTests.TestHelpers;
|
|
using Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
|
|
using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security;
|
|
|
|
[TestFixture]
|
|
public class MemberUserStoreTests
|
|
{
|
|
private Mock<IMemberService> _mockMemberService;
|
|
|
|
public MemberUserStore CreateSut()
|
|
{
|
|
_mockMemberService = new Mock<IMemberService>();
|
|
var mockScopeProvider = TestHelper.ScopeProvider;
|
|
|
|
return new MemberUserStore(
|
|
_mockMemberService.Object,
|
|
new UmbracoMapper(new MapDefinitionCollection(() => new List<IMapDefinition>()), mockScopeProvider, NullLogger<UmbracoMapper>.Instance),
|
|
mockScopeProvider,
|
|
new IdentityErrorDescriber(),
|
|
Mock.Of<IPublishedSnapshotAccessor>(),
|
|
Mock.Of<IExternalLoginWithKeyService>(),
|
|
Mock.Of<ITwoFactorLoginService>());
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenISetNormalizedUserName_ThenIShouldGetASuccessResult()
|
|
{
|
|
// arrange
|
|
var sut = CreateSut();
|
|
var fakeUser = new MemberIdentityUser { UserName = "MyName" };
|
|
|
|
// act
|
|
await sut.SetNormalizedUserNameAsync(fakeUser, "NewName", CancellationToken.None);
|
|
|
|
// assert
|
|
Assert.AreEqual("NewName", fakeUser.UserName);
|
|
Assert.AreEqual("NewName", await sut.GetNormalizedUserNameAsync(fakeUser, CancellationToken.None));
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenICreateUser_AndTheUserIsNull_ThenIShouldGetAFailedResultAsync()
|
|
{
|
|
// arrange
|
|
var sut = CreateSut();
|
|
|
|
// act
|
|
var actual = await sut.CreateAsync(null);
|
|
|
|
// assert
|
|
Assert.IsFalse(actual.Succeeded);
|
|
Assert.IsTrue(actual.Errors.Any(x =>
|
|
x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
|
|
_mockMemberService.VerifyNoOtherCalls();
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenICreateUser_AndTheUserDoesNotHaveIdentity_ThenIShouldGetAFailedResultAsync()
|
|
{
|
|
// arrange
|
|
var sut = CreateSut();
|
|
var fakeUser = new MemberIdentityUser();
|
|
|
|
IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
|
|
var mockMember = Mock.Of<IMember>(m =>
|
|
m.Name == "fakeName" &&
|
|
m.Email == "fakeemail@umbraco.com" &&
|
|
m.Username == "fakeUsername" &&
|
|
m.RawPasswordValue == "fakePassword" &&
|
|
m.ContentTypeAlias == fakeMemberType.Alias &&
|
|
m.HasIdentity == false);
|
|
|
|
_mockMemberService
|
|
.Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
|
|
.Returns(mockMember);
|
|
_mockMemberService.Setup(x => x.Save(mockMember, Constants.Security.SuperUserId));
|
|
|
|
// act
|
|
var actual = await sut.CreateAsync(null);
|
|
|
|
// assert
|
|
Assert.IsFalse(actual.Succeeded);
|
|
Assert.IsTrue(actual.Errors.Any(x =>
|
|
x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
|
|
_mockMemberService.VerifyNoOtherCalls();
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenICreateANewUser_AndTheUserIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
|
|
{
|
|
// arrange
|
|
var sut = CreateSut();
|
|
var fakeUser = new MemberIdentityUser();
|
|
|
|
IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
|
|
var mockMember = Mock.Of<IMember>(m =>
|
|
m.Name == "fakeName" &&
|
|
m.Email == "fakeemail@umbraco.com" &&
|
|
m.Username == "fakeUsername" &&
|
|
m.RawPasswordValue == "fakePassword" &&
|
|
m.Comments == "hello" &&
|
|
m.ContentTypeAlias == fakeMemberType.Alias &&
|
|
m.HasIdentity == true);
|
|
|
|
_mockMemberService
|
|
.Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
|
|
.Returns(mockMember);
|
|
_mockMemberService
|
|
.Setup(x => x.Save(mockMember, PublishNotificationSaveOptions.Saving, Constants.Security.SuperUserId))
|
|
.Returns(Attempt.Succeed<OperationResult?>(null));
|
|
// act
|
|
var identityResult = await sut.CreateAsync(fakeUser, CancellationToken.None);
|
|
|
|
// assert
|
|
Assert.IsTrue(identityResult.Succeeded);
|
|
Assert.IsTrue(!identityResult.Errors.Any());
|
|
_mockMemberService.Verify(x =>
|
|
x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()));
|
|
_mockMemberService.Verify(x => x.Save(mockMember, PublishNotificationSaveOptions.Saving, Constants.Security.SuperUserId));
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenIUpdateAUser_ThenIShouldGetASuccessResultAsync()
|
|
{
|
|
// arrange
|
|
var sut = CreateSut();
|
|
var fakeUser = new MemberIdentityUser
|
|
{
|
|
Id = "123",
|
|
Name = "fakeName",
|
|
Email = "fakeemail@umbraco.com",
|
|
UserName = "fakeUsername",
|
|
Comments = "hello",
|
|
LastLoginDateUtc = DateTime.UtcNow,
|
|
LastPasswordChangeDateUtc = DateTime.UtcNow,
|
|
EmailConfirmed = true,
|
|
AccessFailedCount = 3,
|
|
LockoutEnd = DateTime.UtcNow.AddDays(10),
|
|
IsApproved = true,
|
|
PasswordHash = "abcde",
|
|
SecurityStamp = "abc",
|
|
};
|
|
fakeUser.Roles.Add(new IdentityUserRole<string> { RoleId = "role1", UserId = "123" });
|
|
fakeUser.Roles.Add(new IdentityUserRole<string> { RoleId = "role2", UserId = "123" });
|
|
|
|
IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
|
|
var mockMember = Mock.Of<IMember>(m =>
|
|
m.Id == 123 &&
|
|
m.Name == "a" &&
|
|
m.Email == "a@b.com" &&
|
|
m.Username == "c" &&
|
|
m.RawPasswordValue == "d" &&
|
|
m.Comments == "e" &&
|
|
m.ContentTypeAlias == fakeMemberType.Alias &&
|
|
m.HasIdentity == true &&
|
|
m.EmailConfirmedDate == DateTime.MinValue &&
|
|
m.FailedPasswordAttempts == 0 &&
|
|
m.LastLockoutDate == DateTime.MinValue &&
|
|
m.IsApproved == false &&
|
|
m.RawPasswordValue == "xyz" &&
|
|
m.SecurityStamp == "xyz");
|
|
|
|
_mockMemberService.Setup(x => x.Save(mockMember, Constants.Security.SuperUserId));
|
|
_mockMemberService.Setup(x => x.GetById(123)).Returns(mockMember);
|
|
|
|
// act
|
|
var identityResult = await sut.UpdateAsync(fakeUser, CancellationToken.None);
|
|
|
|
// assert
|
|
Assert.IsTrue(identityResult.Succeeded);
|
|
Assert.IsTrue(!identityResult.Errors.Any());
|
|
|
|
Assert.AreEqual(fakeUser.Name, mockMember.Name);
|
|
Assert.AreEqual(fakeUser.Email, mockMember.Email);
|
|
Assert.AreEqual(fakeUser.UserName, mockMember.Username);
|
|
Assert.AreEqual(fakeUser.Comments, mockMember.Comments);
|
|
Assert.AreEqual(fakeUser.LastPasswordChangeDateUtc.Value.ToLocalTime(), mockMember.LastPasswordChangeDate);
|
|
Assert.AreEqual(fakeUser.LastLoginDateUtc.Value.ToLocalTime(), mockMember.LastLoginDate);
|
|
Assert.AreEqual(fakeUser.AccessFailedCount, mockMember.FailedPasswordAttempts);
|
|
Assert.AreEqual(fakeUser.IsLockedOut, mockMember.IsLockedOut);
|
|
Assert.AreEqual(fakeUser.IsApproved, mockMember.IsApproved);
|
|
Assert.AreEqual(fakeUser.PasswordHash, mockMember.RawPasswordValue);
|
|
Assert.AreEqual(fakeUser.SecurityStamp, mockMember.SecurityStamp);
|
|
Assert.AreNotEqual(DateTime.MinValue, mockMember.EmailConfirmedDate.Value);
|
|
|
|
_mockMemberService.Verify(x => x.Save(mockMember, Constants.Security.SuperUserId));
|
|
_mockMemberService.Verify(x => x.GetById(123));
|
|
_mockMemberService.Verify(x => x.ReplaceRoles(new[] { 123 }, new[] { "role1", "role2" }));
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenIDeleteUser_AndTheUserIsNotPresent_ThenIShouldGetAFailedResultAsync()
|
|
{
|
|
// arrange
|
|
var sut = CreateSut();
|
|
|
|
// act
|
|
var actual = await sut.DeleteAsync(null);
|
|
|
|
// assert
|
|
Assert.IsTrue(actual.Succeeded == false);
|
|
Assert.IsTrue(actual.Errors.Any(x =>
|
|
x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
|
|
_mockMemberService.VerifyNoOtherCalls();
|
|
}
|
|
|
|
[Test]
|
|
public async Task GivenIDeleteUser_AndTheUserIsDeletedCorrectly_ThenIShouldGetASuccessResultAsync()
|
|
{
|
|
// arrange
|
|
var memberKey = new Guid("4B003A55-1DE9-4DEB-95A0-352FFC693D8F");
|
|
var sut = CreateSut();
|
|
var fakeUser = new MemberIdentityUser(777) { Key = memberKey };
|
|
var fakeCancellationToken = CancellationToken.None;
|
|
|
|
IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
|
|
IMember mockMember = new Member(fakeMemberType)
|
|
{
|
|
Id = 777,
|
|
Key = memberKey,
|
|
Name = "fakeName",
|
|
Email = "fakeemail@umbraco.com",
|
|
Username = "fakeUsername",
|
|
RawPasswordValue = "fakePassword",
|
|
};
|
|
|
|
_mockMemberService.Setup(x => x.GetById(mockMember.Id)).Returns(mockMember);
|
|
_mockMemberService.Setup(x => x.GetByKey(mockMember.Key)).Returns(mockMember);
|
|
_mockMemberService.Setup(x => x.Delete(mockMember, Constants.Security.SuperUserId));
|
|
|
|
// act
|
|
var identityResult = await sut.DeleteAsync(fakeUser, fakeCancellationToken);
|
|
|
|
// assert
|
|
Assert.IsTrue(identityResult.Succeeded);
|
|
Assert.IsTrue(!identityResult.Errors.Any());
|
|
_mockMemberService.Verify(x => x.GetByKey(mockMember.Key));
|
|
_mockMemberService.Verify(x => x.Delete(mockMember, Constants.Security.SuperUserId));
|
|
_mockMemberService.VerifyNoOtherCalls();
|
|
}
|
|
}
|