nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

send payment failed emails

Browse Source
This commit is contained in:
Kyle Spearrin 2019-02-14 11:49:39 -05:00
parent f70ececa9d
commit 67146cd4be
9 changed files with 77 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Billing/Controllers/StripeController.cs
View File

@ -166,7 +166,7 @@ namespace Bit.Billing.Controllers
{
var items = invoice.Lines.Select(i => i.Description).ToList();
await _mailService.SendInvoiceUpcomingAsync(email, invoice.AmountDue / 100M,
invoice.NextPaymentAttempt.Value, items, ids.Item1.HasValue);
invoice.NextPaymentAttempt.Value, items, true);
}
}
else if(parsedEvent.Type.Equals("charge.succeeded"))
@ -409,7 +409,10 @@ namespace Bit.Billing.Controllers
if(!transactionResult.IsSuccess())
{
// TODO: Send payment failure email?
if(invoice.AttemptCount < 4)
{
await _mailService.SendPaymentFailedAsync(customer.Email, btInvoiceAmount, true);
}
return false;
}

2
src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs
View File

@ -23,7 +23,7 @@
{{#if MentionInvoices}}
<tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top">
Invoices for your payments can also be downloaded from Billing page for your account.
Invoices for your subscription can also be downloaded from the Billing page for your account.
</td>
</tr>
{{/if}}

2
src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs
View File

@ -12,7 +12,7 @@ Summary Of Charges
To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account.
{{#if MentionInvoices}}
Invoices for your payments can also be downloaded from Billing page for your account.
Invoices for your subscription can also be downloaded from the Billing page for your account.
{{/if}}
If you have any questions or problems, please feel free to email us at hello@bitwarden.com.

26
src/Core/MailTemplates/Handlebars/PaymentFailed.html.hbs Normal file
View File

@ -0,0 +1,26 @@
{{#>FullHtmlLayout}}
<table width="100%" cellpadding="0" cellspacing="0" style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top">
We wanted to let you know that a <b style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">{{usd Amount}}</b> payment for your subscription with Bitwarden was unsuccessful. We will re-attempt to collect payment a few more times over the coming days.
</td>
</tr>
<tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top">
To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{link WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account.
</td>
</tr>
{{#if MentionInvoices}}
<tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top">
Invoices for your subscription can also be downloaded from the Billing page for your account.
</td>
</tr>
{{/if}}
<tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
<td class="content-block last" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0; -webkit-text-size-adjust: none;" valign="top">
If you have any questions or problems, please feel free to email us at hello@bitwarden.com.
</td>
</tr>
</table>
{{/FullHtmlLayout}}

11
src/Core/MailTemplates/Handlebars/PaymentFailed.text.hbs Normal file
View File

@ -0,0 +1,11 @@
{{#>BasicTextLayout}}
We wanted to let you know that a {{usd Amount}} payment for your subscription with Bitwarden was unsuccessful. We will re-attempt to collect payment a few more times over the coming days.
To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account.
{{#if MentionInvoices}}
Invoices for your subscription can also be downloaded from the Billing page for your account.
{{/if}}
If you have any questions or problems, please feel free to email us at hello@bitwarden.com.
{{/BasicTextLayout}}

8
src/Core/Models/Mail/PaymentFailedViewModel.cs Normal file
View File

@ -0,0 +1,8 @@
namespace Bit.Core.Models.Mail
{
public class PaymentFailedViewModel : BaseMailModel
{
public decimal Amount { get; set; }
public bool MentionInvoices { get; set; }
}
}

7
src/Core/Services/IMailService.cs
View File

@ -16,10 +16,13 @@ namespace Bit.Core.Services
Task SendNoMasterPasswordHintEmailAsync(string email);
Task SendMasterPasswordHintEmailAsync(string email, string hint);
Task SendOrganizationInviteEmailAsync(string organizationName, OrganizationUser orgUser, string token);
Task SendOrganizationAcceptedEmailAsync(string organizationName, string userEmail, IEnumerable<string> adminEmails);
Task SendOrganizationAcceptedEmailAsync(string organizationName, string userEmail,
IEnumerable<string> adminEmails);
Task SendOrganizationConfirmedEmailAsync(string organizationName, string email);
Task SendPasswordlessSignInAsync(string returnUrl, string token, string email);
Task SendInvoiceUpcomingAsync(string email, decimal amount, DateTime dueDate, List<string> items, bool mentionInvoices);
Task SendInvoiceUpcomingAsync(string email, decimal amount, DateTime dueDate, List<string> items,
bool mentionInvoices);
Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices);
Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip);
}
}

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

@ -236,6 +236,21 @@ namespace Bit.Core.Services
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices)
{
var message = CreateDefaultMessage("Payment Failed", email);
var model = new PaymentFailedViewModel
{
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
SiteName = _globalSettings.SiteName,
Amount = amount,
MentionInvoices = mentionInvoices
};
await AddMessageContentAsync(message, "PaymentFailed", model);
message.MetaData.Add("SendGridCategories", new List<string> { "PaymentFailed" });
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip)
{
var message = CreateDefaultMessage($"New Device Logged In From {deviceType}", email);

5
src/Core/Services/NoopImplementations/NoopMailService.cs
View File

@ -73,6 +73,11 @@ namespace Bit.Core.Services
return Task.FromResult(0);
}
public Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices)
{
return Task.FromResult(0);
}
public Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip)
{
return Task.FromResult(0);