[PM-27593] Add docs for legacy mail service

src/Core/Services/Implementations/AmazonSesMailDeliveryService.cs → src/Core/Platform/Mail/Delivery/AmazonSesMailDeliveryService.cs

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

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

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

src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs → src/Core/Platform/Mail/Delivery/MailKitSmtpMailDeliveryService.cs

@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Logging;
 using MimeKit;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Services.Mail.Delivery;
 
 public class MailKitSmtpMailDeliveryService : IMailDeliveryService
 {
@@ -81,7 +81,7 @@
         {
             if (_globalSettings.Mail.Smtp.TrustServer)
             {
                 client.ServerCertificateValidationCallback = (s, c, h, e) => true;
             }
 
             if (!_globalSettings.Mail.Smtp.StartTls && !_globalSettings.Mail.Smtp.Ssl &&

src/Core/Services/Implementations/MultiServiceMailDeliveryService.cs → src/Core/Platform/Mail/Delivery/MultiServiceMailDeliveryService.cs

@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Services.Mail.Delivery;
 
 public class MultiServiceMailDeliveryService : IMailDeliveryService
 {
@@ -11,7 +11,7 @@
     private readonly IMailDeliveryService _sendGridService;
     private readonly int _sendGridPercentage;
 
     private static Random _random = new Random();
 
     public MultiServiceMailDeliveryService(
         GlobalSettings globalSettings,

src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs → src/Core/Platform/Mail/Delivery/NoopMailDeliveryService.cs

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

src/Core/Services/Implementations/SendGridMailDeliveryService.cs → src/Core/Platform/Mail/Delivery/SendGridMailDeliveryService.cs

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

src/Core/Services/Implementations/AzureQueueMailService.cs → src/Core/Platform/Mail/Enqueuing/AzureQueueMailService.cs

@@ -3,7 +3,7 @@
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Services.Mail.Enqueuing;
 
 public class AzureQueueMailService : AzureQueueService<IMailQueueMessage>, IMailEnqueuingService
 {

src/Core/Services/Implementations/BlockingMailQueueService.cs → src/Core/Platform/Mail/Enqueuing/BlockingMailQueueService.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Mail;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Services.Mail.Enqueuing;
 
 public class BlockingMailEnqueuingService : IMailEnqueuingService
 {

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

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

src/Core/Services/Implementations/HandlebarsMailService.cs → src/Core/Platform/Mail/HandlebarsMailService.cs

@@ -20,6 +20,8 @@
 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.Settings;
 using Bit.Core.Utilities;
 using Bit.Core.Vault.Models.Data;
@@ -28,7 +30,7 @@
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Services;
+namespace Bit.Core.Services.Mail;
 
 public class HandlebarsMailService : IMailService
 {

src/Core/Platform/Mail/README.md

@@ -0,0 +1,10 @@
+# Mail Service
+
+> [!CAUTION]
+> Adding new methods to the `HandlebarsMailService` is no longer the recommended approach to building and sending emails. Instead, the [Mailer](../Mailer/README.md) implementation is preferred, along with the [MJML](../../MailTemplates/README.md) pipeline.
+
+# Overriding email templates from disk
+
+The `HandlebarsMailService` supports loading the mail template from disk. This is intended to be used by self-hosted customers who want to modify their email appearance.
+
+However, any customer doing so acknowledges that they are responsible for reacting to any changes made to the templates as a part of the Bitwarden development process. This includes, but is not limited to, changes in Handlebars property names, removal of properties from the `ViewModel` classes, and changes in template names.  **Bitwarden is not responsible for maintaining backward compatibility between releases in order to support any overridden emails.**

src/Core/Platform/Mailer/Mailer.cs

@@ -1,5 +1,5 @@
 using Bit.Core.Models.Mail;
-using Bit.Core.Services;
+using Bit.Core.Services.Mail.Delivery;
 
 namespace Bit.Core.Platform.Mailer;
 

src/SharedWeb/Utilities/ServiceCollectionExtensions.cs

@@ -47,6 +47,9 @@
 using Bit.Core.SecretsManager.Repositories.Noop;
 using Bit.Core.Services;
 using Bit.Core.Services.Implementations;
+using Bit.Core.Services.Mail;
+using Bit.Core.Services.Mail.Delivery;
+using Bit.Core.Services.Mail.Enqueuing;
 using Bit.Core.Settings;
 using Bit.Core.Tokens;
 using Bit.Core.Tools.ImportFeatures;

test/Core.IntegrationTest/MailKitSmtpMailDeliveryServiceTests.cs

@@ -1,7 +1,7 @@
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using Bit.Core.Models.Mail;
-using Bit.Core.Services;
+using Bit.Core.Services.Mail.Delivery;
 using Bit.Core.Settings;
 using MailKit.Security;
 using Microsoft.Extensions.Logging;

test/Core.Test/Platform/Mailer/MailerTest.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Models.Mail;
 using Bit.Core.Platform.Mailer;
-using Bit.Core.Services;
+using Bit.Core.Services.Mail.Delivery;
 using Bit.Core.Test.Platform.Mailer.TestMail;
 using NSubstitute;
 using Xunit;

test/Core.Test/Services/AmazonSesMailDeliveryServiceTests.cs

@@ -1,7 +1,7 @@
 using Amazon.SimpleEmail;
 using Amazon.SimpleEmail.Model;
 using Bit.Core.Models.Mail;
-using Bit.Core.Services;
+using Bit.Core.Services.Mail.Delivery;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;

test/Core.Test/Services/HandlebarsMailServiceTests.cs

@@ -7,6 +7,9 @@
 using Bit.Core.Entities;
 using Bit.Core.Models.Mail;
 using Bit.Core.Services;
+using Bit.Core.Services.Mail;
+using Bit.Core.Services.Mail.Delivery;
+using Bit.Core.Services.Mail.Enqueuing;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;

test/Core.Test/Services/MailKitSmtpMailDeliveryServiceTests.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Services;
+using Bit.Core.Services.Mail.Delivery;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 using NSubstitute;

test/Core.Test/Services/SendGridMailDeliveryServiceTests.cs

@@ -1,5 +1,5 @@
 using Bit.Core.Models.Mail;
-using Bit.Core.Services;
+using Bit.Core.Services.Mail.Delivery;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;

test/IntegrationTestCommon/Factories/WebApplicationFactoryBase.cs

@@ -5,6 +5,7 @@
 using Bit.Core.Platform.PushRegistration.Internal;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Bit.Core.Services.Mail.Delivery;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;