Consolidated under Platform.Mail namespace

Author: trmartin4

src/Core/Platform/Mail/Delivery/AmazonSesMailDeliveryService.cs

@@ -9,7 +9,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services.Mail.Delivery;
+namespace Bit.Core.Platform.Mail.Delivery;
 
 public class AmazonSesMailDeliveryService : IMailDeliveryService, IDisposable
 {

src/Core/Platform/Mail/Delivery/IMailDeliveryService.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Mail;
 
-namespace Bit.Core.Services.Mail.Delivery;
+namespace Bit.Core.Platform.Mail.Delivery;
 
 public interface IMailDeliveryService
 {

src/Core/Platform/Mail/Delivery/MailKitSmtpMailDeliveryService.cs

@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Logging;
 using MimeKit;
 
-namespace Bit.Core.Services.Mail.Delivery;
+namespace Bit.Core.Platform.Mail.Delivery;
 
 public class MailKitSmtpMailDeliveryService : IMailDeliveryService
 {

src/Core/Platform/Mail/Delivery/MultiServiceMailDeliveryService.cs

@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services.Mail.Delivery;
+namespace Bit.Core.Platform.Mail.Delivery;
 
 public class MultiServiceMailDeliveryService : IMailDeliveryService
 {

src/Core/Platform/Mail/Delivery/NoopMailDeliveryService.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Mail;
 
-namespace Bit.Core.Services.Mail.Delivery;
+namespace Bit.Core.Platform.Mail.Delivery;
 
 public class NoopMailDeliveryService : IMailDeliveryService
 {

src/Core/Platform/Mail/Delivery/SendGridMailDeliveryService.cs

@@ -6,7 +6,7 @@
 using SendGrid;
 using SendGrid.Helpers.Mail;
 
-namespace Bit.Core.Services.Mail.Delivery;
+namespace Bit.Core.Platform.Mail.Delivery;
 
 public class SendGridMailDeliveryService : IMailDeliveryService, IDisposable
 {

src/Core/Platform/Mail/Enqueuing/AzureQueueMailService.cs

@@ -1,10 +1,10 @@
 using Azure.Storage.Queues;
 using Bit.Core.Models.Mail;
+using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Services.Mail.Enqueuing;
-
+namespace Bit.Core.Platform.Mail.Enqueuing;
 public class AzureQueueMailService : AzureQueueService<IMailQueueMessage>, IMailEnqueuingService
 {
     public AzureQueueMailService(GlobalSettings globalSettings) : base(

src/Core/Platform/Mail/Enqueuing/BlockingMailQueueService.cs

@@ -1,7 +1,6 @@
 using Bit.Core.Models.Mail;
 
-namespace Bit.Core.Services.Mail.Enqueuing;
-
+namespace Bit.Core.Platform.Mail.Enqueuing;
 public class BlockingMailEnqueuingService : IMailEnqueuingService
 {
     public async Task EnqueueAsync(IMailQueueMessage message, Func<IMailQueueMessage, Task> fallback)

src/Core/Platform/Mail/Enqueuing/IMailEnqueuingService.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Mail;
 
-namespace Bit.Core.Services.Mail.Enqueuing;
+namespace Bit.Core.Platform.Mail.Enqueuing;
 
 public interface IMailEnqueuingService
 {

src/Core/Platform/Mail/HandlebarsMailService.cs

@@ -20,18 +20,19 @@
 using Bit.Core.Models.Mail.FamiliesForEnterprise;
 using Bit.Core.Models.Mail.Provider;
 using Bit.Core.SecretsManager.Models.Mail;
-using Bit.Core.Services.Mail.Delivery;
-using Bit.Core.Services.Mail.Enqueuing;
+using Bit.Core.Platform.Mail.Delivery;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.Core.Vault.Models.Data;
 using Core.Auth.Enums;
 using HandlebarsDotNet;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
+using Bit.Core.Platform.Mail.Enqueuing;
 
 namespace Bit.Core.Services.Mail;
 
+[Obsolete("The IMailService has been deprecated in favor of the IMailer. All new emails should be sent with the Mailer.")]
 public class HandlebarsMailService : IMailService
 {
     private const string Namespace = "Bit.Core.MailTemplates.Handlebars";