From 8db1c25aa6785362665d6fc6dad5d2e2a57214b1 Mon Sep 17 00:00:00 2001 From: jrmccannon Date: Wed, 27 Nov 2024 12:03:11 -0600 Subject: [PATCH] Renames and fixed up email. --- .../VerifyOrganizationDomainCommand.cs | 2 +- .../AdminConsole/DomainClaimedByOrganization.html.hbs | 10 +++++----- ...el.cs => ClaimedDomainUserNotificationViewModel.cs} | 2 +- src/Core/Services/IMailService.cs | 2 +- .../Services/Implementations/HandlebarsMailService.cs | 6 +++--- .../Services/NoopImplementations/NoopMailService.cs | 2 +- .../VerifyOrganizationDomainCommandTests.cs | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename src/Core/Models/Mail/{VerifiedDomainUserNotificationViewModel.cs => ClaimedDomainUserNotificationViewModel.cs} (52%) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs index 85d51e7c60..995f8c0219 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommand.cs @@ -150,6 +150,6 @@ public class VerifyOrganizationDomainCommand( var organization = await organizationRepository.GetByIdAsync(domain.OrganizationId); - await mailService.SendVerifiedDomainUserEmailAsync(new ManagedUserDomainClaimedEmails(domainUserEmails, organization)); + await mailService.SendClaimedDomainUserEmailAsync(new ManagedUserDomainClaimedEmails(domainUserEmails, organization)); } } diff --git a/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs b/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs index 21a78a7f22..779de47f40 100644 --- a/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs +++ b/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs @@ -1,22 +1,22 @@ {{#>TitleContactUsHtmlLayout}} - +
- - diff --git a/src/Core/Models/Mail/VerifiedDomainUserNotificationViewModel.cs b/src/Core/Models/Mail/ClaimedDomainUserNotificationViewModel.cs similarity index 52% rename from src/Core/Models/Mail/VerifiedDomainUserNotificationViewModel.cs rename to src/Core/Models/Mail/ClaimedDomainUserNotificationViewModel.cs index 1b11d2bcfa..97591b51bc 100644 --- a/src/Core/Models/Mail/VerifiedDomainUserNotificationViewModel.cs +++ b/src/Core/Models/Mail/ClaimedDomainUserNotificationViewModel.cs @@ -1,6 +1,6 @@ namespace Bit.Core.Models.Mail; -public class VerifiedDomainUserNotificationViewModel : BaseTitleContactUsMailModel +public class ClaimedDomainUserNotificationViewModel : BaseTitleContactUsMailModel { public string OrganizationName { get; init; } } diff --git a/src/Core/Services/IMailService.cs b/src/Core/Services/IMailService.cs index 4cabfe29c5..c6c9dc7948 100644 --- a/src/Core/Services/IMailService.cs +++ b/src/Core/Services/IMailService.cs @@ -94,6 +94,6 @@ public interface IMailService Task SendRequestSMAccessToAdminEmailAsync(IEnumerable adminEmails, string organizationName, string userRequestingAccess, string emailContent); Task SendFamiliesForEnterpriseRemoveSponsorshipsEmailAsync(string email, string offerAcceptanceDate, string organizationId, string organizationName); - Task SendVerifiedDomainUserEmailAsync(ManagedUserDomainClaimedEmails emailList); + Task SendClaimedDomainUserEmailAsync(ManagedUserDomainClaimedEmails emailList); } diff --git a/src/Core/Services/Implementations/HandlebarsMailService.cs b/src/Core/Services/Implementations/HandlebarsMailService.cs index e32e806793..c220df18a1 100644 --- a/src/Core/Services/Implementations/HandlebarsMailService.cs +++ b/src/Core/Services/Implementations/HandlebarsMailService.cs @@ -461,7 +461,7 @@ public class HandlebarsMailService : IMailService await _mailDeliveryService.SendEmailAsync(message); } - public async Task SendVerifiedDomainUserEmailAsync(ManagedUserDomainClaimedEmails emailList) + public async Task SendClaimedDomainUserEmailAsync(ManagedUserDomainClaimedEmails emailList) { await EnqueueMailAsync(emailList.EmailList.Select(email => CreateMessage(email, emailList.Organization))); @@ -469,8 +469,8 @@ public class HandlebarsMailService : IMailService MailQueueMessage CreateMessage(string emailAddress, Organization org) => new(CreateDefaultMessage($"Your Bitwarden account is claimed by {org.DisplayName()}", emailAddress), - "AdminConsole.VerifiedDomainUserNotification", - new VerifiedDomainUserNotificationViewModel + "AdminConsole.DomainClaimedByOrganization", + new ClaimedDomainUserNotificationViewModel { TitleFirst = $"Hey {emailAddress}, here is a heads up on your claimed account:", OrganizationName = CoreHelpers.SanitizeForEmail(org.DisplayName(), false) diff --git a/src/Core/Services/NoopImplementations/NoopMailService.cs b/src/Core/Services/NoopImplementations/NoopMailService.cs index deb95aabc5..e8ea8d9863 100644 --- a/src/Core/Services/NoopImplementations/NoopMailService.cs +++ b/src/Core/Services/NoopImplementations/NoopMailService.cs @@ -310,6 +310,6 @@ public class NoopMailService : IMailService { return Task.FromResult(0); } - public Task SendVerifiedDomainUserEmailAsync(ManagedUserDomainClaimedEmails emailList) => Task.CompletedTask; + public Task SendClaimedDomainUserEmailAsync(ManagedUserDomainClaimedEmails emailList) => Task.CompletedTask; } diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs index 0565f89115..b565cf9a8e 100644 --- a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationDomains/VerifyOrganizationDomainCommandTests.cs @@ -311,7 +311,7 @@ public class VerifyOrganizationDomainCommandTests _ = await sutProvider.Sut.UserVerifyOrganizationDomainAsync(domain); - await sutProvider.GetDependency().Received().SendVerifiedDomainUserEmailAsync( + await sutProvider.GetDependency().Received().SendClaimedDomainUserEmailAsync( Arg.Is(x => x.EmailList.Count(e => e.EndsWith(domain.DomainName)) == mockedUsers.Count && x.Organization.Id == organization.Id));
As a member of {{OrganizationName}}, your Bitwarden account is claimed and owned by your organization.
+ Here's what that means:
  • This account should only be used to store items related to {{OrganizationName}}
    • -
  • Your admins managing your Bitwarden organization manages your email address and other account settings
    • -
  • Your admins can also revoke or delete your account at any time
    • +
  • Admins managing your Bitwarden organization manage your email address and other account settings
    • +
  • Admins can also revoke or delete your account at any time
+ For more information, please refer to the following help article: Claimed Accounts