Code Tidy: Clean up further obsoleted code scheduled for removal in Umbraco 18 (IEmailSender, MemberConfigurationResponseModel, MediaPermissions)

src/Umbraco.Cms.Api.Management/Factories/ConfigurationPresentationFactory.cs

@@ -4,7 +4,6 @@
 using Umbraco.Cms.Api.Management.ViewModels.Element;
 using Umbraco.Cms.Api.Management.ViewModels.Media;
 using Umbraco.Cms.Api.Management.ViewModels.MediaType;
-using Umbraco.Cms.Api.Management.ViewModels.Member;
 using Umbraco.Cms.Api.Management.ViewModels.MemberType;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Features;
@@ -73,13 +72,6 @@ public DocumentTypeConfigurationResponseModel CreateDocumentTypeConfigurationRes
             ReservedFieldNames = _reservedFieldNamesService.GetDocumentReservedFieldNames(),
         };
 
-    /// <summary>
-    /// Instantiates and returns a new <see cref="MemberConfigurationResponseModel"/>.
-    /// </summary>
-    /// <returns>A new <see cref="MemberConfigurationResponseModel"/>.</returns>
-    public MemberConfigurationResponseModel CreateMemberConfigurationResponseModel() =>
-        new();
-
     /// <summary>
     /// Creates a <see cref="Umbraco.Cms.Api.Management.Models.MemberTypeConfigurationResponseModel"/> containing the reserved member field names.
     /// </summary>

src/Umbraco.Cms.Api.Management/Factories/IConfigurationPresentationFactory.cs

@@ -3,7 +3,6 @@
 using Umbraco.Cms.Api.Management.ViewModels.Element;
 using Umbraco.Cms.Api.Management.ViewModels.Media;
 using Umbraco.Cms.Api.Management.ViewModels.MediaType;
-using Umbraco.Cms.Api.Management.ViewModels.Member;
 using Umbraco.Cms.Api.Management.ViewModels.MemberType;
 
 namespace Umbraco.Cms.Api.Management.Factories;
@@ -26,12 +25,6 @@ public interface IConfigurationPresentationFactory
     DocumentTypeConfigurationResponseModel CreateDocumentTypeConfigurationResponseModel()
         => throw new NotImplementedException();
 
-    /// <summary>
-    /// Creates a response model representing the member configuration.
-    /// </summary>
-    /// <returns>A <see cref="Umbraco.Cms.Api.Management.Models.MemberConfigurationResponseModel"/> instance.</returns>
-    MemberConfigurationResponseModel CreateMemberConfigurationResponseModel();
-
     /// <summary>
     /// Creates and returns a new <see cref="Umbraco.Cms.Api.Management.Models.MemberTypeConfigurationResponseModel"/> instance.
     /// </summary>

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs

@@ -249,8 +249,7 @@
 
             Services.AddSingleton<LegacyPasswordSecurity>();
             Services.AddSingleton<UserEditorAuthorizationHelper>();
             Services.AddSingleton<ContentPermissions>();
-            Services.AddSingleton<MediaPermissions>();
 
             Services.AddSingleton<PropertyEditorCollection>();
 

src/Umbraco.Core/Mail/IEmailSender.cs

@@ -10,22 +10,7 @@ public interface IEmailSender
     /// <summary>
     /// Sends a message asynchronously.
     /// </summary>
-    [Obsolete("Please use the overload with expires parameter. Scheduled for removal in Umbraco 18.")]
-    Task SendAsync(EmailMessage message, string emailType);
-
-    /// <summary>
-    /// Sends a message asynchronously.
-    /// </summary>
-    [Obsolete("Please use the overload with expires parameter. Scheduled for removal in Umbraco 18.")]
-    Task SendAsync(EmailMessage message, string emailType, bool enableNotification);
-
-    /// <summary>
-    /// Sends a message asynchronously.
-    /// </summary>
-    Task SendAsync(EmailMessage message, string emailType, bool enableNotification = false, TimeSpan? expires = null)
-#pragma warning disable CS0618 // Type or member is obsolete
-        => SendAsync(message, emailType, enableNotification);
-#pragma warning restore CS0618 // Type or member is obsolete
+    Task SendAsync(EmailMessage message, string emailType, bool enableNotification = false, TimeSpan? expires = null);
 
     /// <summary>
     /// Verifies if the email sender is configured to send emails.

src/Umbraco.Core/Mail/NotImplementedEmailSender.cs

@@ -12,17 +12,7 @@ namespace Umbraco.Cms.Core.Mail;
 internal sealed class NotImplementedEmailSender : IEmailSender
 {
     /// <inheritdoc />
-    public Task SendAsync(EmailMessage message, string emailType)
-        => throw new NotImplementedException(
-            "To send an Email ensure IEmailSender is implemented with a custom implementation");
-
-    /// <inheritdoc />
-    public Task SendAsync(EmailMessage message, string emailType, bool enableNotification) =>
-        throw new NotImplementedException(
-            "To send an Email ensure IEmailSender is implemented with a custom implementation");
-
-    /// <inheritdoc />
-    public Task SendAsync(EmailMessage message, string emailType, bool enableNotification, TimeSpan? expires) =>
+    public Task SendAsync(EmailMessage message, string emailType, bool enableNotification = false, TimeSpan? expires = null) =>
         throw new NotImplementedException(
             "To send an Email ensure IEmailSender is implemented with a custom implementation");
 

src/Umbraco.Infrastructure/Mail/EmailSender.cs

@@ -47,14 +47,6 @@ public EmailSender(
         globalSettings.OnChange(x => _globalSettings = x);
     }
 
-    /// <inheritdoc/>
-    public async Task SendAsync(EmailMessage message, string emailType) =>
-        await SendAsyncInternal(message, emailType, false, null);
-
-    /// <inheritdoc/>
-    public async Task SendAsync(EmailMessage message, string emailType, bool enableNotification) =>
-        await SendAsyncInternal(message, emailType, enableNotification, null);
-
     /// <inheritdoc/>
     public async Task SendAsync(EmailMessage message, string emailType, bool enableNotification = false, TimeSpan? expires = null) =>
         await SendAsyncInternal(message, emailType, enableNotification, expires);