diff --git a/src/Core/MailTemplates/Handlebars/LicenseExpired.html.hbs b/src/Core/MailTemplates/Handlebars/LicenseExpired.html.hbs new file mode 100644 index 0000000000..869c279993 --- /dev/null +++ b/src/Core/MailTemplates/Handlebars/LicenseExpired.html.hbs @@ -0,0 +1,18 @@ +{{#>FullHtmlLayout}} + + + + + + + +
+ {{#if IsOrganization}} + 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}} +
+ {{{link 'https://bitwarden.com/help/article/licensing-on-premise/'}}} +
+{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs b/src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs new file mode 100644 index 0000000000..829e16f55c --- /dev/null +++ b/src/Core/MailTemplates/Handlebars/LicenseExpired.text.hbs @@ -0,0 +1,9 @@ +{{#>BasicTextLayout}} +{{#if IsOrganization}} +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}} + +https://bitwarden.com/help/article/licensing-on-premise/ +{{/BasicTextLayout}} \ No newline at end of file diff --git a/src/Core/Models/Mail/LicenseExpiredViewModel.cs b/src/Core/Models/Mail/LicenseExpiredViewModel.cs new file mode 100644 index 0000000000..70f5f32cd2 --- /dev/null +++ b/src/Core/Models/Mail/LicenseExpiredViewModel.cs @@ -0,0 +1,8 @@ +namespace Bit.Core.Models.Mail +{ + public class LicenseExpiredViewModel : BaseMailModel + { + public string OrganizationName { get; set; } + public bool IsOrganization => !string.IsNullOrWhiteSpace(OrganizationName); + } +} diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs index 72c4e5b01d..d4c84b39f3 100644 --- a/src/Core/Services/IMailService.cs +++ b/src/Core/Services/IMailService.cs @@ -25,6 +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 emails, string organizationName = null); Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip); Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, string ip); } diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs index 373995af88..da5ab933a0 100644 --- a/src/Core/Services/Implementations/HandlebarsMailService.cs +++ b/src/Core/Services/Implementations/HandlebarsMailService.cs @@ -278,6 +278,18 @@ namespace Bit.Core.Services message.Category = "AddedCredit"; await _mailDeliveryService.SendEmailAsync(message); } + + public async Task SendLicenseExpiredAsync(IEnumerable emails, string organizationName = null) + { + var message = CreateDefaultMessage("License Expired", emails); + var model = new LicenseExpiredViewModel + { + OrganizationName = organizationName, + }; + await AddMessageContentAsync(message, "LicenseExpired", model); + message.Category = "LicenseExpired"; + await _mailDeliveryService.SendEmailAsync(message); + } public async Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip) { diff --git a/src/Core/Services/Implementations/LicensingService.cs b/src/Core/Services/Implementations/LicensingService.cs index 5b41c6fcca..f663989e63 100644 --- a/src/Core/Services/Implementations/LicensingService.cs +++ b/src/Core/Services/Implementations/LicensingService.cs @@ -24,6 +24,7 @@ namespace Bit.Core.Services private readonly IUserRepository _userRepository; private readonly IOrganizationRepository _organizationRepository; private readonly IOrganizationUserRepository _organizationUserRepository; + private readonly IMailService _mailService; private readonly ILogger _logger; private IDictionary _userCheckCache = new Dictionary(); @@ -32,6 +33,7 @@ namespace Bit.Core.Services IUserRepository userRepository, IOrganizationRepository organizationRepository, IOrganizationUserRepository organizationUserRepository, + IMailService mailService, IWebHostEnvironment environment, ILogger logger, GlobalSettings globalSettings) @@ -39,6 +41,7 @@ namespace Bit.Core.Services _userRepository = userRepository; _organizationRepository = organizationRepository; _organizationUserRepository = organizationUserRepository; + _mailService = mailService; _logger = logger; _globalSettings = globalSettings; @@ -124,6 +127,8 @@ namespace Bit.Core.Services org.ExpirationDate = license?.Expires ?? DateTime.UtcNow; org.RevisionDate = DateTime.UtcNow; await _organizationRepository.ReplaceAsync(org); + + await _mailService.SendLicenseExpiredAsync(new List { org.BillingEmail }, org.Name); } public async Task ValidateUsersAsync() @@ -213,6 +218,8 @@ namespace Bit.Core.Services user.PremiumExpirationDate = license?.Expires ?? DateTime.UtcNow; user.RevisionDate = DateTime.UtcNow; await _userRepository.ReplaceAsync(user); + + await _mailService.SendLicenseExpiredAsync(new List { user.Email }); } public bool VerifyLicense(ILicense license) diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs index bdbb742d73..0ccf7740bf 100644 --- a/src/Core/Services/NoopImplementations/NoopMailService.cs +++ b/src/Core/Services/NoopImplementations/NoopMailService.cs @@ -88,6 +88,11 @@ namespace Bit.Core.Services return Task.FromResult(0); } + public Task SendLicenseExpiredAsync(IEnumerable emails, string organizationName = null) + { + return Task.FromResult(0); + } + public Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip) { return Task.FromResult(0); diff --git a/test/Core.Test/Services/LicensingServiceTests.cs b/test/Core.Test/Services/LicensingServiceTests.cs index 025ab1f561..b234a0054a 100644 --- a/test/Core.Test/Services/LicensingServiceTests.cs +++ b/test/Core.Test/Services/LicensingServiceTests.cs @@ -16,6 +16,7 @@ namespace Bit.Core.Test.Services private readonly IUserRepository _userRepository; private readonly IOrganizationRepository _organizationRepository; private readonly IOrganizationUserRepository _organizationUserRepository; + private readonly IMailService _mailService; private readonly IWebHostEnvironment _hostingEnvironment; private readonly ILogger _logger; @@ -24,6 +25,7 @@ namespace Bit.Core.Test.Services _userRepository = Substitute.For(); _organizationRepository = Substitute.For(); _organizationUserRepository = Substitute.For(); + _mailService = Substitute.For(); _hostingEnvironment = Substitute.For(); _logger = Substitute.For>(); _globalSettings = new GlobalSettings(); @@ -32,6 +34,7 @@ namespace Bit.Core.Test.Services _userRepository, _organizationRepository, _organizationUserRepository, + _mailService, _hostingEnvironment, _logger, _globalSettings