Files
Andy Butland 825f791d01 Remove the non-controversial, straightforward obsoleted constructs for Umbraco 16 (#18661)
* Removed obsoletes from IConfigManipulator.

* Removed obsolete models builder extensions.

* Removed the obsolete ContentDashboardSettings.

* Removed the obsolete InstallMissingDatabase setting on GlobalSettings.

* Removed obsolete NuCache settings.

* Removed obsolete RuntimeMinificationSettings.

* Removed obsolete health check constant.

* Removed obsolete icon constant.

* Removed obsolete telemetry constant.

* Removed obsolete property and constructor on UmbracoBuilder.

* Removed obsolete constructor on AuditNotificationsHandler.

* Removed obsolete constructor on HTTP header health checks.

* Removed obsolete constructor on MediaFileManager.

* Removed obsolete GetDefaultFileContent on ViewHelper.

* Remove obsoleted methods on embed providers.

* Fix tests.

* Removed obsolete constructors on BlockEditorDataConverter.

* Removed obsolete SeedCacheDuration property on CacheSettings.

* Removed obsolete PublishCulture on ContentRepositoryExtensions.

* Removed obsolete MonitorLock.

* Removed obsolete synchronous HasSavedValues from IDataTypeUsageService and IDataTypeUsageRepository.

* Removed obsolete HasSavedPropertyValues from IPropertyTypeUsageService and IPropertyTypeUsageRepository.

* Removed obsolete methods in ITrackedReferencesService and ITrackedReferencesRepository.

* Removed obsolete DateValueEditor constructors.

* Removed obsolete GetAutomaticRelationTypesAliases.

* Removed obsolete constructor on TextOnlyValueEditor.

* Removed obsolete constructors on RegexValidator and RequiredValidator.

* Removed obsolete constructs on SliderValueConverter and TagsValueConverter.

* Removed obsolete GetContentType methods from IPublishedCache.

* Removed ContentFinderByIdPath.

* Removed obsolete constructor on DefaultMediaUrlProvider.

* Removed obsolete constructor on Domain.

* Removed obsolete constructor on PublishedRequest.

* Removed obsolete methods on CheckPermissions.

* Removed obsolete GetUserId from IBackOfficeSecurity.

* Removed obsolete methods on LegacyPasswordSecurity.

* Removed obsolete constructors on AuditService.

* Removed obsolete methods on IContentEditingService.

* Remove obsolete constructors and methods on ContentService/IContentService.

* Removed obsolete constructor in ContentTypeEditingService.

* Removed obsolete constructor in MediaTypeEditingService.

* Removed obsolete constructor in MemberTypeEditingService.

* Removed obsolete constructor in ContentTypeService.

* Removed obsolete constructors in ContentTypeServiceBase.

* Removed obsolete constructors and methods in ContentVersionService.

* Removed obsolete constructor in DataTypeUsageService.

* Removed obsolete constructor in DomainService.

* Removed obsolete constructor in FileService.

* Removes obsolete AttemptMove from IContentService.

* Removes obsolete SetPreventCleanup from IContentVersionService.

* Removes obsolete GetReferences from IDataTypeService.

* Removed obsolete SetConsentLevel from IMetricsConsentService.

* Removed obsolete methods from IPackageDataInstallation.

* Removed obsolete methods from IPackagingService.

* Removed obsolete methods on ITwoFactorLoginService.
Removed obsolete ITemporaryMediaService.

* Removed obsolete constructor from MediaService, MemberTypeService and MediaTypeService.

* More obsolete constructors.

* Removed obsoleted overloads on IPropertyValidationService.

* Fixed build for tests.

* Removed obsolete constructor for PublicAccessService, UserService and RelationService.

* Removed GetDefaultMemberType.

* Removed obsolete user group functionality from IUserService.

* Removed obsolete extension methods on IUserService.

* Removed obsolete method from ITelemetryService.

* Removed obsolete UdiParserServiceConnectors.

* Removed obsolete method on ICookieManager.

* Removed obsolete DynamicContext.

* Removed obsolete XmlHelper.

* Fixed failing integration tests.

* Removed obsoletes in Umbraco.Cms.Api.Common

* Removed obsoletes in Umbraco.Cms.Api.Delivery

* Removed obsoletes in Umbraco.Cms.Api.Management

* Removed obsoletes in Umbraco.Examine.Lucene

* Removed obsoletes in Umbraco.Infrastructure

* Fix failing delivery API contract integration test.

* Made integration tests internal.

* Removed obsoletes from web projects.

* Fix build.

* Removed Twitter OEmbed provider

* Removed obsolete constructor on PublishedDataType.

* Removed obsolete constructors on PublishedCacheBase.

* Removed the obsolete PropertyEditorTagsExtensions.

* Removed obsoletion properties on configuration response  models (#18697)

* Removed obsolete methods from server-side models.

* Update client-side types and sdk.

* Update client-side files.

* Removed obsoletion of Utf8ToAsciiConverter.ToAsciiString overload. (#18694)

* Removed obsolete method in UserService. (#18710)

* Removed obsoleted group alias keys from being publicly available. (#18682)

* Removed unneceessary ApiVersion attribute.

* Clean-up obsoletions on MemberService (#18703)

* Removed obsoleted method on MemberService, added future obsoletion to interface and updated all callers.

* Removed obsoletion on member service method that's not obsolete on the interface.
2025-03-21 17:02:31 +00:00

165 lines
6.1 KiB
C#

using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.Membership;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Services.OperationStatus;
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
internal sealed partial class UserServiceCrudTests
{
[Test]
[TestCase("test@email.com", "test@email.com", true, true)]
[TestCase("test@email.com", "notTheUserName@email.com", true, false)]
[TestCase("NotAnEmail", "test@email.com", true, false)]
[TestCase("test@email.com", "test@email.com", false, true)]
[TestCase("NotAnEmail", "test@email.com", false, true)]
[TestCase("aDifferentEmail@email.com", "test@email.com", false, true)]
public async Task Invite_User_Name_Must_Be_Email(
string username,
string email,
bool userNameIsEmailEnabled,
bool shouldSucceed)
{
var securitySettings = new SecuritySettings { UsernameIsEmail = userNameIsEmailEnabled };
var userService = CreateUserService(securitySettings);
var userGroup = await UserGroupService.GetAsync(Constants.Security.AdminGroupAlias);
var inviteModel = new UserInviteModel
{
UserName = username,
Email = email,
Name = "Test Mc. Gee",
UserGroupKeys = new HashSet<Guid> { userGroup.Key },
};
var result = await userService.InviteAsync(Constants.Security.SuperUserKey, inviteModel);
if (shouldSucceed is false)
{
Assert.IsFalse(result.Success);
Assert.AreEqual(UserOperationStatus.UserNameIsNotEmail, result.Status);
return;
}
Assert.IsTrue(result.Success);
Assert.AreEqual(UserOperationStatus.Success, result.Status);
var invitedUser = result.Result.InvitedUser;
Assert.IsNotNull(invitedUser);
Assert.AreEqual(username, invitedUser.Username);
Assert.AreEqual(email, invitedUser.Email);
}
[Test]
public async Task Cannot_Invite_User_With_Duplicate_Email()
{
var email = "test@test.com";
var userGroup = await UserGroupService.GetAsync(Constants.Security.AdminGroupAlias);
var initialUserCreateModel = new UserCreateModel
{
UserName = "Test1",
Email = email,
Name = "Test Mc. Gee",
UserGroupKeys = new HashSet<Guid> { userGroup.Key },
};
var userService = CreateUserService(new SecuritySettings { UsernameIsEmail = false });
var result = await userService.CreateAsync(Constants.Security.SuperUserKey, initialUserCreateModel, true);
Assert.IsTrue(result.Success);
var duplicateUserInviteModel = new UserInviteModel
{
UserName = "Test2",
Email = email,
Name = "Duplicate Mc. Gee",
UserGroupKeys = new HashSet<Guid> { userGroup.Key },
};
var secondResult = await userService.InviteAsync(Constants.Security.SuperUserKey, duplicateUserInviteModel);
Assert.IsFalse(secondResult.Success);
Assert.AreEqual(UserOperationStatus.DuplicateEmail, secondResult.Status);
}
[Test]
public async Task Cannot_Invite_User_With_Duplicate_UserName()
{
var userName = "UserName";
var userGroup = await UserGroupService.GetAsync(Constants.Security.AdminGroupAlias);
var initialUserCreateModel = new UserCreateModel
{
UserName = userName,
Email = "test@email.com",
Name = "Test Mc. Gee",
UserGroupKeys = new HashSet<Guid> { userGroup.Key },
};
var userService = CreateUserService(new SecuritySettings { UsernameIsEmail = false });
var result = await userService.CreateAsync(Constants.Security.SuperUserKey, initialUserCreateModel, true);
Assert.IsTrue(result.Success);
var duplicateUserInviteModelModel = new UserInviteModel
{
UserName = userName,
Email = "another@email.com",
Name = "Duplicate Mc. Gee",
UserGroupKeys = new HashSet<Guid> { userGroup.Key },
};
var secondResult = await userService.InviteAsync(Constants.Security.SuperUserKey, duplicateUserInviteModelModel);
Assert.IsFalse(secondResult.Success);
Assert.AreEqual(UserOperationStatus.DuplicateUserName, secondResult.Status);
}
[Test]
public async Task Cannot_Invite_User_Without_User_Group()
{
UserInviteModel userInviteModel = new UserInviteModel
{
UserName = "NoUser@Group.com",
Email = "NoUser@Group.com",
Name = "NoUser@Group.com",
};
IUserService userService = CreateUserService();
var result = await userService.InviteAsync(Constants.Security.SuperUserKey, userInviteModel);
Assert.IsFalse(result.Success);
Assert.AreEqual(UserOperationStatus.NoUserGroup, result.Status);
}
[Test]
public async Task Performing_User_Must_Exist_When_Inviting()
{
IUserService userService = CreateUserService();
var result = await userService.InviteAsync(Guid.Empty, new UserInviteModel());
Assert.IsFalse(result.Success);
Assert.AreEqual(UserOperationStatus.MissingUser, result.Status);
}
[Test]
public async Task Invited_Users_Has_Invited_state()
{
var userGroup = await UserGroupService.GetAsync(Constants.Security.AdminGroupAlias);
UserInviteModel userInviteModel = new UserInviteModel
{
UserName = "some@email.com",
Email = "some@email.com",
Name = "Bob",
UserGroupKeys = new HashSet<Guid> { userGroup.Key },
};
IUserService userService = CreateUserService();
var result = await userService.InviteAsync(Constants.Security.SuperUserKey, userInviteModel);
Assert.IsTrue(result.Success);
var invitedUser = await userService.GetAsync(result.Result.InvitedUser!.Key);
Assert.IsNotNull(invitedUser);
Assert.AreEqual(UserState.Invited, invitedUser.UserState);
}
}