new plain text body

jamesmh · Sep 26, 2024 · 7a37736 · 7a37736
1 parent 4beda47
commit 7a37736
Show file tree

Hide file tree

Showing 15 changed files with 377 additions and 77 deletions.
diff --git a/Demo/Controllers/MailController.cs b/Demo/Controllers/MailController.cs
@@ -94,6 +94,25 @@ public async Task<IActionResult> RenderViewWithInlineMailable()
             return Content(message, "text/html");
         }
 
+        public async Task<IActionResult> WithHtmlAndPlainText()
+        {
+            UserModel user = new UserModel()
+            {
+                Email = "FromUserModel@test.com",
+                Name = "Coravel Test Person"
+            };
+
+            await this._mailer.SendAsync(
+                Mailable.AsInline<UserModel>()
+                    .To(user)
+                    .From("from@test.com")
+                    .View("~/Views/Mail/NewUser.cshtml", user)
+                    .Text("This is a plain text version of the email!")
+            );
+
+            return Ok();
+        }
+
         public IActionResult QueueMail()
         {
             UserModel user = new UserModel()

diff --git a/DocsV2/docs/Mailing/README.md b/DocsV2/docs/Mailing/README.md
@@ -122,7 +122,7 @@ public class MyHttpApiCustomMailer : ICanSendMail
         this._httpClient = httpFactory.CreateHttpClient("MailApi");
     }
 
-    public async Task SendAsync(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null)
+    public async Task SendAsync(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null)
     {
         // Code that uses the HttpClient to send mail via an HTTP API.
     }
@@ -237,7 +237,7 @@ public async Task<IActionResult> SendMyEmail()
 }
 ```
 
-The non-generic version is suited to using `Html()` when passing a view model is not needed.
+The non-generic version is suited to using `Html()` and/or `Text()` when passing a view model is not needed.
 
 ```csharp
 public async Task<IActionResult> SendMyEmail()
@@ -253,6 +253,7 @@ public async Task<IActionResult> SendMyEmail()
             .To(user)
             .From("from@test.com")
             .Html($"<html><body><h1>Welcome {user.Name}</h1></body></html>")
+            .Text($"Welcome {user.Name}")
     );
 
     return Ok();
@@ -301,6 +302,37 @@ You can also pass:
 - `To(MailRecipient)`
 - `To(IEnumerable<MailRecipient>)`
 
+### Html
+
+If you want to supply raw Html as your e-mail use the `Html(string html)` method:
+
+```csharp
+public override void Build()
+{
+    this.To(this._user)
+        .From("from@test.com")
+        .Html(someHtml);
+}
+```
+
+In this case, your Mailable class should use the `string` generic type: `public class MyMailable : Mailable<string>`.
+
+### Text
+
+If you want to add a plain text representation of your email then use `Text(string plainText)`:
+
+```csharp
+public override void Build()
+{
+    this.To(this._user)
+        .From("from@test.com")
+        .Html(someHtml)
+        .Text(plainText);
+}
+```
+
+`Text()` doesn't replace `Html()` or `View()`. It _adds_ a plain text representation to your email that the email client will use in the event it doesn't support HTML.
+
 ### Sender
 
 To specify the sender of the email (different from the `From` address), use the `Sender()` method:
@@ -339,11 +371,9 @@ Further methods, which all accept either `IEnumerable<string>` or `IEnumerable<M
 - `Bcc`
 - `ReplyTo`
 
-### Specifying Mail Templates
-
-#### Razor Templates
+### Mail Templates With `View()`
 
-##### .NET Core 3.1+
+#### .NET Core 3.1+
 
 For a standard .NET 6+ web project, this should work out-of-the-box. If using a shared library, the following applies.
 
@@ -359,10 +389,14 @@ If you have a shared library with razor views inside, you'll need to make sure .
   </PropertyGroup>
 ```
 
-##### Razor Views
+#### View
 
 Using a razor view to send e-mails is done using the `View(string viewPath, T viewModel)` method.
 
+:::tip
+You can still use `Text(string planText)` to add an alternative plain text representation beside the HTML message that calling `View()` produces.
+:::
+
 The type of the `viewModel` parameter must match the type of your Mailable's generic type parameter. For example, a `Mailable<UserModel>` will have the method `View(string viewPath, UserModel viewModel)`. Coravel will automatically bind the model to your view so you can generate dynamic content (just like using `View()` inside your MVC controllers).
 
 For views that do not require a view model, just inherit your Mailable from `Mailable<string>` and use `View(string viewPath)`.
@@ -379,8 +413,6 @@ public class MyMailable : Mailable<string>
 }
 ```
 
-##### Example
-
 :::tip
 The CLI generated a sample for you at `~/Views/Example.cshtml`.
 :::
@@ -408,22 +440,7 @@ It might look like this (which uses a built-in template):
 }
 ```
 
-#### Html Template
-
-If you want to supply raw Html as your e-mail use the `Html(string html)` method:
-
-```csharp
-public override void Build()
-{
-    this.To(this._user)
-        .From("from@test.com")
-        .Html(someHtml);
-}
-```
-
-In this case, your Mailable class should use the `string` generic type: `public class MyMailable : Mailable<string>`.
-
-## Mail Templates
+## Mail Template Components
 
 When using razor views, there are various pieces of data that Coravel will automatically passes for you:
 
@@ -558,3 +575,7 @@ public async Task<IActionResult> RenderView()
     return Content(message, "text/html");
 }
 ```
+
+:::tip
+Since we can only render 1 mail body, using `Html()` or `View()` will take precedence over `Text()` when rendering an email with `RenderAsync()`.
+:::
diff --git a/Src/Coravel.Mailer/Mail/Interfaces/ICanSendMail.cs b/Src/Coravel.Mailer/Mail/Interfaces/ICanSendMail.cs
@@ -4,5 +4,5 @@
 
 public interface ICanSendMail
 {
-    Task SendAsync(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null);
+    Task SendAsync(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null);
 }
diff --git a/Src/Coravel.Mailer/Mail/Mailable.cs b/Src/Coravel.Mailer/Mail/Mailable.cs
@@ -10,7 +10,7 @@ namespace Coravel.Mailer.Mail
 {
     public class Mailable<T>
     {
-        private static readonly string NoRenderFoundMessage = "Please use one of the available methods for specifying how to render your mail (e.g. Html() or View())";
+        private static readonly string NoRenderFoundMessage = "Please use one of the available methods for specifying how to render your mail (e.g. Html(), Text() or View())";
 
         /// <summary>
         /// Who the email is from.
@@ -50,7 +50,7 @@ public class Mailable<T>
         /// <summary>
         /// Raw HTML to use as email message.
         /// </summary>
-        private string _html;
+        private MessageBody _messageBody;
 
         /// <summary>
         /// The MVC view to use to generate the message.
@@ -155,7 +155,17 @@ public Mailable<T> Attach(Attachment attachment)
 
         public Mailable<T> Html(string html)
         {
-            this._html = html;
+            this._messageBody = this._messageBody is null
+                ? new MessageBody(html, null)
+                : new MessageBody(html, this._messageBody.Text);
+            return this;
+        }
+
+        public Mailable<T> Text(string plainText)
+        {
+            this._messageBody = this._messageBody is null
+                ? new MessageBody(null, plainText)
+                : new MessageBody(this._messageBody.Html, plainText);
             return this;
         }
 
@@ -178,7 +188,7 @@ internal async Task SendAsync(RazorRenderer renderer, IMailer mailer)
         {
             this.Build();
 
-            string message = await this.BuildMessage(renderer, mailer).ConfigureAwait(false);
+            MessageBody message = await this.BuildMessage(renderer, mailer).ConfigureAwait(false);
 
             await mailer.SendAsync(
                 message,
@@ -196,25 +206,40 @@ await mailer.SendAsync(
         internal async Task<string> RenderAsync(RazorRenderer renderer, IMailer mailer)
         {
             this.Build();
-            return await this.BuildMessage(renderer, mailer).ConfigureAwait(false);
+            var mailMessage = await this.BuildMessage(renderer, mailer).ConfigureAwait(false);
+            return mailMessage.HasHtmlMessage() ? mailMessage.Html : mailMessage.Text;
         }
 
-        private async Task<string> BuildMessage(RazorRenderer renderer, IMailer mailer)
+        private async Task<MessageBody> BuildMessage(RazorRenderer renderer, IMailer mailer)
         {
             this.BindDynamicProperties();
 
-            if (this._html != null)
+            // If View() was used, the caller can still also use Text() too, so we need to handle
+            // when only View() is called and when both View() and Text() are used.
+            if (this._viewPath is not null)
             {
-                return this._html;
+                var htmlRendered = await renderer
+                    .RenderViewToStringAsync<T>(this._viewPath, this._viewModel)
+                    .ConfigureAwait(false);
+
+                if(this._messageBody is null)
+                {
+                    this._messageBody = new MessageBody(htmlRendered, null);
+                }
+                else {
+                    this._messageBody.Html = htmlRendered;
+                }
+
+                return this._messageBody;
             }
 
-            if (this._viewPath != null)
+            // View() wasn't called, so we'll see if a message body was defined.
+            if (this._messageBody is not null)
             {
-                return await renderer
-                    .RenderViewToStringAsync<T>(this._viewPath, this._viewModel)
-                    .ConfigureAwait(false);
+                return this._messageBody;
             }
 
+            // No render or message body found. e.g. View(), Html() nor Text() were called.
             throw new NoMailRendererFound(NoRenderFoundMessage);
         }
 

diff --git a/Src/Coravel.Mailer/Mail/Mailers/AssertMailer.cs b/Src/Coravel.Mailer/Mail/Mailers/AssertMailer.cs
@@ -9,7 +9,7 @@ public class AssertMailer : IMailer
     {
         public class Data
         {
-            public string message { get; set; }
+            public MessageBody message { get; set; }
             public string subject { get; set; }
             public IEnumerable<MailRecipient> to { get; set; }
             public MailRecipient from { get; set; }
@@ -27,7 +27,7 @@ public AssertMailer(Action<Data> assertAction)
             this._assertAction = assertAction;
         }
 
-        public Task SendAsync(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments, MailRecipient sender = null)
+        public Task SendAsync(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments, MailRecipient sender = null)
         {
             this._assertAction(new Data
             {

diff --git a/Src/Coravel.Mailer/Mail/Mailers/CanSendMailWrapper.cs b/Src/Coravel.Mailer/Mail/Mailers/CanSendMailWrapper.cs
@@ -25,7 +25,7 @@ public Task<string> RenderAsync<T>(Mailable<T> mailable) =>
         public async Task SendAsync<T>(Mailable<T> mailable) =>
             await mailable.SendAsync(this._renderer, this);
 
-        public async Task SendAsync(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments, MailRecipient sender = null)
+        public async Task SendAsync(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments, MailRecipient sender = null)
         {
             await using (var scope = this._scopeFactory.CreateAsyncScope())
             {

diff --git a/Src/Coravel.Mailer/Mail/Mailers/CustomMailer.cs b/Src/Coravel.Mailer/Mail/Mailers/CustomMailer.cs
@@ -7,7 +7,7 @@ namespace Coravel.Mailer.Mail.Mailers
 {
     public class CustomMailer : IMailer
     {
-        public delegate Task SendAsyncFunc(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null);
+        public delegate Task SendAsyncFunc(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null);
         private RazorRenderer _renderer;
         private SendAsyncFunc _sendAsyncFunc;
         private MailRecipient _globalFrom;
@@ -25,7 +25,7 @@ public Task<string> RenderAsync<T>(Mailable<T> mailable) =>
         public async Task SendAsync<T>(Mailable<T> mailable) =>
             await mailable.SendAsync(this._renderer, this);
 
-        public async Task SendAsync(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments, MailRecipient sender = null)
+        public async Task SendAsync(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments, MailRecipient sender = null)
         {
             await this._sendAsyncFunc(
                 message, subject, to, from ?? this._globalFrom, replyTo, cc, bcc, attachments, sender: sender

diff --git a/Src/Coravel.Mailer/Mail/Mailers/FileLogMailer.cs b/Src/Coravel.Mailer/Mail/Mailers/FileLogMailer.cs
@@ -27,7 +27,7 @@ public async Task<string> RenderAsync<T>(Mailable<T> mailable)
             return await mailable.RenderAsync(this._renderer, this);
         }
 
-        public async Task SendAsync(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null)
+        public async Task SendAsync(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null)
         {
             from = from ?? this._globalFrom;
 
@@ -45,7 +45,17 @@ await writer.WriteAsync($@"
 Attachment: { (attachments is null ? "N/A" : string.Join(";", attachments.Select(a => a.Name))) }
 ---------------------------------------------
 
-{message}
+------------------
+Message Type: HTML
+------------------
+{ (message.HasHtmlMessage() ? message.Html : "N/A") }
+
+!!!!!!!!!!!!!!!!!!!!!!!
+
+-----------------------
+Message Type: Plan Text
+-----------------------
+{ (message.HasPlainTextMessage() ? message.Text : "N/A") }
                 ").ConfigureAwait(false);
             }
         }

diff --git a/Src/Coravel.Mailer/Mail/Mailers/SmtpMailer.cs b/Src/Coravel.Mailer/Mail/Mailers/SmtpMailer.cs
@@ -50,7 +50,7 @@ public async Task SendAsync<T>(Mailable<T> mailable)
             await mailable.SendAsync(this._renderer, this);
         }
 
-        public async Task SendAsync(string message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null)
+        public async Task SendAsync(MessageBody message, string subject, IEnumerable<MailRecipient> to, MailRecipient from, MailRecipient replyTo, IEnumerable<MailRecipient> cc, IEnumerable<MailRecipient> bcc, IEnumerable<Attachment> attachments = null, MailRecipient sender = null)
         {
             var mail = new MimeMessage();
 
@@ -82,9 +82,9 @@ public async Task SendAsync(string message, string subject, IEnumerable<MailReci
             }
         }
 
-        private static void SetMailBody(string message, IEnumerable<Attachment> attachments, MimeMessage mail)
+        private static void SetMailBody(MessageBody message, IEnumerable<Attachment> attachments, MimeMessage mail)
         {
-            var bodyBuilder = new BodyBuilder { HtmlBody = message };
+            var bodyBuilder = new BodyBuilder { HtmlBody = message.Html, TextBody = message.Text };
             if (attachments != null)
             {
                 foreach (var attachment in attachments)

diff --git a/Src/Coravel.Mailer/Mail/MessageBody.cs b/Src/Coravel.Mailer/Mail/MessageBody.cs
@@ -0,0 +1,22 @@
+namespace Coravel.Mailer.Mail;
+
+public class MessageBody
+{
+    public string Html { get; set; }
+    public string Text { get; set; }
+
+    public MessageBody(string? html, string? text)
+    {
+        if(html is null && text is null)
+        {
+            throw new System.ArgumentException("You need to supply either an HTML or plain text message - or both.");
+        }
+
+        this.Html = html;
+        this.Text = text;
+    }
+
+    public bool HasHtmlMessage() => this.Html != null;
+
+    public bool HasPlainTextMessage() => this.Text != null;
+}