mirror of
https://github.com/bitwarden/server.git
synced 2025-07-02 00:22:50 -05:00
clean out deprecated services. update libs.
This commit is contained in:
Kyle Spearrin
@ -1,210 +0,0 @@
|
||||
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.VaultWithHash, 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.VaultWithHash,
|
||||
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.VaultWithHash
|
||||
};
|
||||
|
||||
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.VaultWithHash,
|
||||
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.VaultWithHash
|
||||
};
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,254 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading.Tasks;
|
||||
using Bit.Core.Models.Table;
|
||||
using System.Net;
|
||||
using Bit.Core.Models.Mail;
|
||||
|
||||
namespace Bit.Core.Services
|
||||
{
|
||||
public class SendGridTemplateMailService : IMailService
|
||||
{
|
||||
private const string WelcomeTemplateId = "045f8ad5-5547-4fa2-8d3d-6d46e401164d";
|
||||
private const string VerifyEmailTemplateId = "TODO";
|
||||
private const string VerifyDeleteTemplateId = "TODO";
|
||||
private const string ChangeEmailAlreadyExistsTemplateId = "b69d2038-6ad9-4cf6-8f7f-7880921cba43";
|
||||
private const string ChangeEmailTemplateId = "ec2c1471-8292-4f17-b6b6-8223d514f86e";
|
||||
private const string TwoFactorEmailTemplateId = "264cfe69-5258-4c89-8d90-76b4659de589";
|
||||
private const string NoMasterPasswordHintTemplateId = "136eb299-e102-495a-88bd-f96736eea159";
|
||||
private const string MasterPasswordHintTemplateId = "be77cfde-95dd-4cb9-b5e0-8286b53885f1";
|
||||
private const string OrganizationInviteTemplateId = "1eff5512-e36c-49a8-b9e2-2b215d6bbced";
|
||||
private const string OrganizationAcceptedTemplateId = "28f7f741-598e-449c-85fe-601e1cc32ba3";
|
||||
private const string OrganizationConfirmedTemplateId = "a8afe2a0-6161-4eb9-b40c-08a7f520ec50";
|
||||
|
||||
private const string AdministrativeCategoryName = "Administrative";
|
||||
private const string MarketingCategoryName = "Marketing";
|
||||
|
||||
private readonly GlobalSettings _globalSettings;
|
||||
private readonly IMailDeliveryService _mailDeliveryService;
|
||||
|
||||
public SendGridTemplateMailService(
|
||||
GlobalSettings globalSettings,
|
||||
IMailDeliveryService mailDeliveryService)
|
||||
{
|
||||
_globalSettings = globalSettings;
|
||||
_mailDeliveryService = mailDeliveryService;
|
||||
}
|
||||
|
||||
public async Task SendWelcomeEmailAsync(User user)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Welcome",
|
||||
user.Email,
|
||||
WelcomeTemplateId);
|
||||
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Welcome" });
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendVerifyEmailEmailAsync(string email, Guid userId, string token)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Verify Your Email",
|
||||
email,
|
||||
VerifyEmailTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{token}}", WebUtility.UrlEncode(token));
|
||||
AddSubstitution(message, "{{userId}}", userId.ToString());
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Verify Email" });
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendVerifyDeleteEmailAsync(string email, Guid userId, string token)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Delete Your Account",
|
||||
email,
|
||||
VerifyDeleteTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{token}}", WebUtility.UrlEncode(token));
|
||||
AddSubstitution(message, "{{email}}", email);
|
||||
AddSubstitution(message, "{{emailUrlEncoded}}", WebUtility.UrlEncode(email));
|
||||
AddSubstitution(message, "{{userId}}", userId.ToString());
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Verify Delete" });
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendChangeEmailAlreadyExistsEmailAsync(string fromEmail, string toEmail)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Your Email Change",
|
||||
toEmail,
|
||||
ChangeEmailAlreadyExistsTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{fromEmail}}", fromEmail);
|
||||
AddSubstitution(message, "{{toEmail}}", toEmail);
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Change Email Already Exists" });
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendChangeEmailEmailAsync(string newEmailAddress, string token)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Your Email Change",
|
||||
newEmailAddress,
|
||||
ChangeEmailTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{token}}", Uri.EscapeDataString(token));
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Change Email" });
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendTwoFactorEmailAsync(string email, string token)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Your Two-step Login Verification Code",
|
||||
email,
|
||||
TwoFactorEmailTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{token}}", Uri.EscapeDataString(token));
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Two Factor Email" });
|
||||
message.MetaData.Add("SendGridBypassListManagement", true);
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendNoMasterPasswordHintEmailAsync(string email)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Your Master Password Hint",
|
||||
email,
|
||||
NoMasterPasswordHintTemplateId);
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "No Master Password Hint" });
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendMasterPasswordHintEmailAsync(string email, string hint)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
"Your Master Password Hint",
|
||||
email,
|
||||
MasterPasswordHintTemplateId);
|
||||
|
||||
message.Subject = "Your Master Password Hint";
|
||||
AddSubstitution(message, "{{hint}}", hint);
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Master Password Hint" });
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendOrganizationInviteEmailAsync(string organizationName, OrganizationUser orgUser, string token)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
$"Join {organizationName}",
|
||||
orgUser.Email,
|
||||
OrganizationInviteTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{organizationName}}", organizationName);
|
||||
AddSubstitution(message, "{{organizationId}}", orgUser.OrganizationId.ToString());
|
||||
AddSubstitution(message, "{{organizationUserId}}", orgUser.Id.ToString());
|
||||
AddSubstitution(message, "{{token}}", token);
|
||||
AddSubstitution(message, "{{email}}", WebUtility.UrlEncode(orgUser.Email));
|
||||
AddSubstitution(message, "{{organizationNameUrlEncoded}}", WebUtility.UrlEncode(organizationName));
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Organization User Invite" });
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendOrganizationAcceptedEmailAsync(string organizationName, string userEmail,
|
||||
IEnumerable<string> adminEmails)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
$"User {userEmail} Has Accepted Invite",
|
||||
adminEmails,
|
||||
OrganizationAcceptedTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{userEmail}}", userEmail);
|
||||
AddSubstitution(message, "{{organizationName}}", organizationName);
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Organization User Accepted" });
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
public async Task SendOrganizationConfirmedEmailAsync(string organizationName, string email)
|
||||
{
|
||||
var message = CreateDefaultMessage(
|
||||
$"You Have Been Confirmed To {organizationName}",
|
||||
email,
|
||||
OrganizationConfirmedTemplateId);
|
||||
|
||||
AddSubstitution(message, "{{organizationName}}", organizationName);
|
||||
AddCategories(message, new List<string> { AdministrativeCategoryName, "Organization User Confirmed" });
|
||||
|
||||
await _mailDeliveryService.SendEmailAsync(message);
|
||||
}
|
||||
|
||||
private MailMessage CreateDefaultMessage(string subject, string toEmail, string templateId)
|
||||
{
|
||||
return CreateDefaultMessage(subject, new List<string> { toEmail }, templateId);
|
||||
}
|
||||
|
||||
private MailMessage CreateDefaultMessage(string subject, IEnumerable<string> toEmails, string templateId)
|
||||
{
|
||||
var message = new MailMessage
|
||||
{
|
||||
HtmlContent = " ",
|
||||
TextContent = " ",
|
||||
MetaData = new Dictionary<string, object>(),
|
||||
ToEmails = toEmails,
|
||||
Subject = subject
|
||||
};
|
||||
|
||||
if(!string.IsNullOrWhiteSpace(templateId))
|
||||
{
|
||||
message.MetaData.Add("SendGridTemplateId", templateId);
|
||||
}
|
||||
|
||||
AddSubstitution(message, "{{siteName}}", _globalSettings.SiteName);
|
||||
AddSubstitution(message, "{{baseVaultUri}}", _globalSettings.BaseServiceUri.VaultWithHash);
|
||||
|
||||
return message;
|
||||
}
|
||||
|
||||
private void AddSubstitution(MailMessage message, string key, string value)
|
||||
{
|
||||
Dictionary<string, string> dict;
|
||||
if(!message.MetaData.ContainsKey("SendGridSubstitutions"))
|
||||
{
|
||||
dict = new Dictionary<string, string>();
|
||||
}
|
||||
else
|
||||
{
|
||||
dict = message.MetaData["SendGridSubstitutions"] as Dictionary<string, string>;
|
||||
}
|
||||
|
||||
dict.Add(key, value);
|
||||
message.MetaData["SendGridSubstitutions"] = dict;
|
||||
}
|
||||
|
||||
private void AddCategories(MailMessage message, List<string> categories)
|
||||
{
|
||||
List<string> cats;
|
||||
if(!message.MetaData.ContainsKey("SendGridCategories"))
|
||||
{
|
||||
cats = categories;
|
||||
}
|
||||
else
|
||||
{
|
||||
cats = message.MetaData["SendGridCategories"] as List<string>;
|
||||
cats.AddRange(categories);
|
||||
}
|
||||
|
||||
message.MetaData["SendGridCategories"] = cats;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user