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

additional formatting & inclusion of org name

Browse Source
This commit is contained in:
Matt Portune 2020-05-19 18:22:03 -04:00
parent 9bf3a467fa
commit 545948220a
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
<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">
{{#if IsOrganization}}
This email is to notify you that your Bitwarden organization license has expired and must be updated for continued use. See the following article for details about replacing your license file:
This email is to notify you that your Bitwarden organization license for <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;">{{OrganizationName}}</b> has expired and must be updated for continued use. See the following article for details about replacing your license file:
{{else}}
This email is to notify you that your Bitwarden premium license has expired and must be updated for continued use. See the following article for details about replacing your license file:
{{/if}}

4
src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs
View File

@ -1,9 +1,7 @@
{{#>BasicTextLayout}}
{{#if IsOrganization}}
This email is to notify you that your Bitwarden organization license has expired and must be updated for continued use. See the following article for details about replacing your license file:
This email is to notify you that your Bitwarden organization license for {{OrganizationName}} has expired and must be updated for continued use. See the following article for details about replacing your license file:
{{else}}
This email is to notify you that your Bitwarden premium license has expired and must be updated for continued use. See the following article for details about replacing your license file:
{{/if}}

3
src/Core/Models/Mail/LicenseExpiredViewModel.cs
View File

@ -2,6 +2,7 @@
{
public class LicenseExpiredViewModel : BaseMailModel
{
public bool IsOrganization { get; set; }
public string OrganizationName { get; set; }
public bool IsOrganization => !string.IsNullOrWhiteSpace(OrganizationName);
}
}

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

@ -25,7 +25,7 @@ namespace Bit.Core.Services
bool mentionInvoices);
Task SendPaymentFailedAsync(string email, decimal amount, bool mentionInvoices);
Task SendAddedCreditAsync(string email, decimal amount);
Task SendLicenseExpiredAsync(IEnumerable<string> emails, bool isOrganization);
Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null);
Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip);
Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, string ip);
}

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

@ -279,12 +279,12 @@ namespace Bit.Core.Services
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendLicenseExpiredAsync(IEnumerable<string> emails, bool isOrganization)
public async Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null)
{
var message = CreateDefaultMessage("License Expired", emails);
var model = new LicenseExpiredViewModel
{
IsOrganization = isOrganization
OrganizationName = organizationName,
};
await AddMessageContentAsync(message, "LicenseExpired", model);
message.Category = "LicenseExpired";

4
src/Core/Services/Implementations/LicensingService.cs
View File

@ -128,7 +128,7 @@ namespace Bit.Core.Services
org.RevisionDate = DateTime.UtcNow;
await _organizationRepository.ReplaceAsync(org);
await _mailService.SendLicenseExpiredAsync(new List<string> { org.BillingEmail }, true);
await _mailService.SendLicenseExpiredAsync(new List<string> { org.BillingEmail }, org.Name);
}
public async Task ValidateUsersAsync()
@ -219,7 +219,7 @@ namespace Bit.Core.Services
user.RevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
await _mailService.SendLicenseExpiredAsync(new List<string> { user.Email }, false);
await _mailService.SendLicenseExpiredAsync(new List<string> { user.Email });
}
public bool VerifyLicense(ILicense license)

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

@ -88,7 +88,7 @@ namespace Bit.Core.Services
return Task.FromResult(0);
}
public Task SendLicenseExpiredAsync(IEnumerable<string> emails, bool isOrganization)
public Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null)
{
return Task.FromResult(0);
}