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

Fixes null reference exception triggered when configuring to hide disabled users in the backoffice (#18823)

Browse Source 
* Fixes null reference exception triggered when configuring to hide disabled users in the backoffice.

* Updated integration test suppressions.
This commit is contained in:
Andy Butland
2025-03-28 11:24:52 +01:00
committed by GitHub
parent aca908c549
commit 6dc4eca607
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/Umbraco.Tests.Integration/CompatibilitySuppressions.xml
View File

@@ -78,6 +78,13 @@
<Right>lib/net9.0/Umbraco.Tests.Integration.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Umbraco.Cms.Tests.Integration.Umbraco.Core.Services.UserServiceCrudTests.Cannot_Request_Disabled_If_Hidden(Umbraco.Cms.Core.Models.Membership.UserState)</Target>
<Left>lib/net9.0/Umbraco.Tests.Integration.dll</Left>
<Right>lib/net9.0/Umbraco.Tests.Integration.dll</Right>
<IsBaselineSuppression>true</IsBaselineSuppression>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services.ContentPublishingServiceTests.Publish_Branch_Does_Not_Publish_Unpublished_Children_Unless_Explicitly_Instructed_To(System.Boolean)</Target>

26
tests/Umbraco.Tests.Integration/Umbraco.Core/Services/UserServiceCrudTests.Filter.cs
View File

@@ -1,4 +1,4 @@
using NUnit.Framework;
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models;
@@ -10,12 +10,14 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
public partial class UserServiceCrudTests
{
[Test]
[TestCase(UserState.Disabled)]
[TestCase(UserState.All)]
public async Task Cannot_Request_Disabled_If_Hidden(UserState includeState)
[TestCase(null, 1)] // Requesting no filter, will just get the admin user but not the created and disabled one.
// - verifies fix for https://github.com/umbraco/Umbraco-CMS/issues/18812
[TestCase(UserState.Inactive, 1)] // Requesting inactive, will just get the admin user but not the created and disabled one.
[TestCase(UserState.Disabled, 0)] // Requesting disabled, won't get any as admin user isn't disabled and, whilst the created one is, disabled users are hidden.
[TestCase(UserState.All, 1)] // Requesting all, will just get the admin user but not the created and disabled one.
public async Task Cannot_Request_Disabled_If_Hidden(UserState? includeState, int expectedCount)
{
var userService = CreateUserService(new SecuritySettings {HideDisabledUsersInBackOffice = true});
var userService = CreateUserService(new SecuritySettings { HideDisabledUsersInBackOffice = true });
var editorGroup = await UserGroupService.GetAsync(Constants.Security.EditorGroupKey);
var createModel = new UserCreateModel
@@ -23,21 +25,25 @@ public partial class UserServiceCrudTests
UserName = "editor@mail.com",
Email = "editor@mail.com",
Name = "Editor",
UserGroupKeys = new HashSet<Guid> { editorGroup.Key }
UserGroupKeys = new HashSet<Guid> { editorGroup.Key },
};
var createAttempt = await userService.CreateAsync(Constants.Security.SuperUserKey, createModel, true);
Assert.IsTrue(createAttempt.Success);
var disableStatus =
await userService.DisableAsync(Constants.Security.SuperUserKey, new HashSet<Guid>{ createAttempt.Result.CreatedUser!.Key });
await userService.DisableAsync(Constants.Security.SuperUserKey, new HashSet<Guid> { createAttempt.Result.CreatedUser!.Key });
Assert.AreEqual(UserOperationStatus.Success, disableStatus);
var filter = new UserFilter {IncludeUserStates = new HashSet<UserState> {includeState}};
var filter = new UserFilter();
if (includeState.HasValue)
{
filter.IncludeUserStates = new HashSet<UserState> { includeState.Value };
}
var filterAttempt = await userService.FilterAsync(Constants.Security.SuperUserKey, filter, 0, 1000);
Assert.IsTrue(filterAttempt.Success);
Assert.AreEqual(0, filterAttempt.Result.Items.Count());
Assert.AreEqual(expectedCount, filterAttempt.Result.Items.Count());
}
[Test]