nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 16:12:49 -05:00
Code Activity

two factor emails

Browse Source
This commit is contained in:
Kyle Spearrin
2017-06-24 12:08:34 -04:00
parent f4fa990cb1
commit d57a68aae3
10 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Core/Services/Implementations/RazorViewMailService.cs
View File

@ -48,7 +48,7 @@ namespace Bit.Core.Services
public async Task SendChangeEmailEmailAsync(string newEmailAddress, string token)
{
var message = CreateDefaultMessage("Your Email Change", newEmailAddress);
var model = new ChangeEmailViewModel
var model = new EmailTokenViewModel
{
Token = token,
WebVaultUrl = _globalSettings.BaseVaultUri,
@ -61,6 +61,22 @@ namespace Bit.Core.Services
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendTwoFactorEmailAsync(string email, string token)
{
var message = CreateDefaultMessage("Your Two-step Login Verification Code", email);
var model = new EmailTokenViewModel
{
Token = token,
WebVaultUrl = _globalSettings.BaseVaultUri,
SiteName = _globalSettings.SiteName
};
message.HtmlContent = _engine.Parse("TwoFactorEmail", model);
message.TextContent = _engine.Parse("TwoFactorEmail.text", model);
message.MetaData.Add("SendGridBypassListManagement", true);
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendMasterPasswordHintEmailAsync(string email, string hint)
{
var message = CreateDefaultMessage("Your Master Password Hint", email);

15
src/Core/Services/Implementations/SendGridTemplateMailService.cs
View File

@ -12,6 +12,7 @@ namespace Bit.Core.Services
private const string WelcomeTemplateId = "045f8ad5-5547-4fa2-8d3d-6d46e401164d";
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";
@ -72,6 +73,20 @@ namespace Bit.Core.Services
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(

2
src/Core/Services/Implementations/UserService.cs
View File

@ -201,7 +201,7 @@ namespace Bit.Core.Services
var token = await base.GenerateUserTokenAsync(user, TokenOptions.DefaultEmailProvider,
"2faEmail:" + provider.MetaData["Email"]);
await _mailService.SendChangeEmailEmailAsync((string)provider.MetaData["Email"], token);
await _mailService.SendTwoFactorEmailAsync((string)provider.MetaData["Email"], token);
}
public async Task<bool> VerifyTwoFactorEmailAsync(User user, string token)