markdown mail service when self hosted

src/Core/Services/Implementations/MarkdownMailService.cs

@@ -0,0 +1,210 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Bit.Core.Models.Table;
+using Bit.Core.Models.Mail;
+using System.IO;
+using System.Net;
+using System.Reflection;
+
+namespace Bit.Core.Services
+{
+    public class MarkdownMailService : IMailService
+    {
+        private const string Namespace = "Bit.Core.MailTemplates.Markdown";
+
+        private readonly GlobalSettings _globalSettings;
+        private readonly IMailDeliveryService _mailDeliveryService;
+
+        public MarkdownMailService(
+            GlobalSettings globalSettings,
+            IMailDeliveryService mailDeliveryService)
+        {
+            _globalSettings = globalSettings;
+            _mailDeliveryService = mailDeliveryService;
+        }
+
+        public async Task SendVerifyEmailEmailAsync(string email, Guid userId, string token)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["url"] = string.Format("{0}/verify-email?userId={1}&token={2}",
+                    _globalSettings.BaseServiceUri.Vault, userId, WebUtility.UrlEncode(token))
+            };
+
+            var message = await CreateMessageAsync("Verify Your Email", email, "VerifyEmail", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendVerifyDeleteEmailAsync(string email, Guid userId, string token)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["url"] = string.Format("{0}/verify-recover-delete?userId={1}&token={2}&email={3}",
+                    _globalSettings.BaseServiceUri.Vault,
+                    userId,
+                    WebUtility.UrlEncode(token),
+                    WebUtility.UrlEncode(email)),
+                ["email"] = WebUtility.HtmlEncode(email)
+            };
+
+            var message = await CreateMessageAsync("Delete Your Account", email, "VerifyDelete", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendChangeEmailAlreadyExistsEmailAsync(string fromEmail, string toEmail)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["fromEmail"] = WebUtility.HtmlEncode(fromEmail),
+                ["toEmail"] = WebUtility.HtmlEncode(toEmail),
+            };
+
+            var message = await CreateMessageAsync("Your Email Change", toEmail, "ChangeEmailAlreadyExists", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendChangeEmailEmailAsync(string newEmailAddress, string token)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["token"] = token
+            };
+
+            var message = await CreateMessageAsync("Your Email Change", newEmailAddress, "ChangeEmail", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendTwoFactorEmailAsync(string email, string token)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["token"] = token
+            };
+
+            var message = await CreateMessageAsync("Your Two-step Login Verification Code", email, "TwoFactorEmail", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendMasterPasswordHintEmailAsync(string email, string hint)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["hint"] = WebUtility.HtmlEncode(hint),
+                ["vaultUrl"] = _globalSettings.BaseServiceUri.Vault
+            };
+
+            var message = await CreateMessageAsync("Your Master Password Hint", email, "MasterPasswordHint", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendNoMasterPasswordHintEmailAsync(string email)
+        {
+            var message = await CreateMessageAsync("Your Master Password Hint", email, "NoMasterPasswordHint", null);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendOrganizationAcceptedEmailAsync(string organizationName, string userEmail,
+            IEnumerable<string> adminEmails)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["userEmail"] = WebUtility.HtmlEncode(userEmail),
+                ["organizationName"] = WebUtility.HtmlEncode(organizationName)
+            };
+
+            var message = await CreateMessageAsync($"User {userEmail} Has Accepted Invite", adminEmails,
+                "OrganizationUserAccepted", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendOrganizationConfirmedEmailAsync(string organizationName, string email)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["organizationName"] = WebUtility.HtmlEncode(organizationName)
+            };
+
+            var message = await CreateMessageAsync($"You Have Been Confirmed To {organizationName}", email,
+                "OrganizationUserConfirmed", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendOrganizationInviteEmailAsync(string organizationName, OrganizationUser orgUser, string token)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["organizationName"] = WebUtility.HtmlEncode(organizationName),
+                ["url"] = string.Format("{0}/accept-organization?organizationId={1}&organizationUserId={2}" +
+                    "&email={3}&organizationName={4}&token={5}",
+                    _globalSettings.BaseServiceUri.Vault,
+                    orgUser.OrganizationId,
+                    orgUser.Id,
+                    WebUtility.UrlEncode(orgUser.Email),
+                    WebUtility.UrlEncode(organizationName),
+                    WebUtility.UrlEncode(token))
+            };
+
+            var message = await CreateMessageAsync($"Join {organizationName}", orgUser.Email, "OrganizationUserInvited", model);
+            message.MetaData.Add("SendGridBypassListManagement", true);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        public async Task SendWelcomeEmailAsync(User user)
+        {
+            var model = new Dictionary<string, string>
+            {
+                ["vaultUrl"] = _globalSettings.BaseServiceUri.Vault
+            };
+
+            var message = await CreateMessageAsync("Welcome", user.Email, "Welcome", model);
+            await _mailDeliveryService.SendEmailAsync(message);
+        }
+
+        private async Task<MailMessage> CreateMessageAsync(string subject, string toEmail, string fileName,
+            Dictionary<string, string> model)
+        {
+            return await CreateMessageAsync(subject, new List<string> { toEmail }, fileName, model);
+        }
+
+        private async Task<MailMessage> CreateMessageAsync(string subject, IEnumerable<string> toEmails, string fileName,
+            Dictionary<string, string> model)
+        {
+            var message = new MailMessage
+            {
+                ToEmails = toEmails,
+                Subject = subject,
+                MetaData = new Dictionary<string, object>()
+            };
+
+            var assembly = typeof(MarkdownMailService).GetTypeInfo().Assembly;
+            using(var s = assembly.GetManifestResourceStream($"{Namespace}.{fileName}.md"))
+            using(var sr = new StreamReader(s))
+            {
+                var markdown = await sr.ReadToEndAsync();
+
+                if(model != null)
+                {
+                    foreach(var prop in model)
+                    {
+                        markdown = markdown.Replace($"{{{{{prop.Key}}}}}", prop.Value);
+                    }
+                }
+
+                message.HtmlContent = CommonMark.CommonMarkConverter.Convert(markdown);
+                message.TextContent = markdown;
+            }
+
+            return message;
+        }
+    }
+}

src/Core/Services/Implementations/RazorMailService.cs

@@ -10,20 +10,20 @@ using System.Net;
 
 namespace Bit.Core.Services
 {
-    public class RazorViewMailService : IMailService
+    public class RazorMailService : IMailService
     {
         private readonly GlobalSettings _globalSettings;
         private readonly IRazorLightEngine _engine;
         private readonly IMailDeliveryService _mailDeliveryService;
 
-        public RazorViewMailService(
+        public RazorMailService(
             GlobalSettings globalSettings,
             IMailDeliveryService mailDeliveryService)
         {
             _globalSettings = globalSettings;
             _mailDeliveryService = mailDeliveryService;
 
-            var manager = new CustomEmbeddedResourceTemplateManager("Bit.Core.MailTemplates");
+            var manager = new CustomEmbeddedResourceTemplateManager("Bit.Core.MailTemplates.Razor");
             var core = new EngineCore(manager, EngineConfiguration.Default);
             var pageFactory = new DefaultPageFactory(core.KeyCompile);
             var lookup = new DefaultPageLookup(pageFactory);
@@ -151,8 +151,8 @@ namespace Bit.Core.Services
                 WebVaultUrl = _globalSettings.BaseServiceUri.Vault,
                 SiteName = _globalSettings.SiteName
             };
-            message.HtmlContent = _engine.Parse("OrganizationUserInvited", model);
-            message.TextContent = _engine.Parse("OrganizationUserInvited.text", model);
+            message.HtmlContent = _engine.Parse("OrganizationUserAccepted", model);
+            message.TextContent = _engine.Parse("OrganizationUserAccepted.text", model);
             await _mailDeliveryService.SendEmailAsync(message);
         }
 

src/Core/Services/Implementations/SendGridTemplateMailService.cs

@@ -88,7 +88,7 @@ namespace Bit.Core.Services
 
             AddSubstitution(message, "{{fromEmail}}", fromEmail);
             AddSubstitution(message, "{{toEmail}}", toEmail);
-            AddCategories(message, new List<string> { AdministrativeCategoryName, "Change Email Alrady Exists" });
+            AddCategories(message, new List<string> { AdministrativeCategoryName, "Change Email Already Exists" });
 
             await _mailDeliveryService.SendEmailAsync(message);
         }