From b1b6fcdbd27217bc9d4ab4253110f41308523788 Mon Sep 17 00:00:00 2001 From: Jared Date: Wed, 28 Jan 2026 13:16:35 -0500 Subject: [PATCH 1/2] =?UTF-8?q?Update=20email=20and=20text=20templates=20f?= =?UTF-8?q?or=20Domain=20Claimed=20by=20Organization=20no=E2=80=A6=20(#689?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update email and text templates for Domain Claimed by Organization notification - Changed the heading to "What this means for you" for clarity. - Revised bullet points to better reflect user experience and responsibilities within the organization. - Updated the phrasing of the help article reference for consistency. * Fix HandlebarsMailService claimed domain email --- .../AdminConsole/DomainClaimedByOrganization.html.hbs | 10 +++++----- .../AdminConsole/DomainClaimedByOrganization.text.hbs | 11 +++++------ src/Core/Platform/Mail/HandlebarsMailService.cs | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs b/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs index f10c47c78f..766aefa804 100644 --- a/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs +++ b/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs @@ -2,17 +2,17 @@
- Here's what that means: + What this means for you
    -
  • Your Bitwarden account is owned by {{OrganizationName}}
    • -
  • Your administrators can delete your account at any time
    • -
  • You cannot leave the organization
    • +
  • Your day-to-day use of Bitwarden remains the same.
    • +
  • Only store work-related items in your {{OrganizationName}} vault.
    • +
  • {{OrganizationName}} admins now manage your account, meaning they can revoke or delete your account.
- For more information, please refer to the following help article: Claimed Accounts + For more information, please refer to the following help article: Claimed accounts
diff --git a/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.text.hbs b/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.text.hbs index b3041a21e9..e33b8fe1b9 100644 --- a/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.text.hbs +++ b/src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.text.hbs @@ -1,7 +1,6 @@ -As a member of {{OrganizationName}}, your Bitwarden account is claimed and owned by your organization. +What this means for you: +- Your day-to-day use of Bitwarden remains the same. +- Only store work-related items in your {{OrganizationName}} vault. +- {{OrganizationName}} admins now manage your account, meaning they can revoke or delete your account. -Here's what that means: -- Your administrators can delete your account at any time -- You cannot leave the organization - -For more information, please refer to the following help article: Claimed Accounts (https://bitwarden.com/help/claimed-accounts) +For more information, please refer to the following help article: Claimed accounts (https://bitwarden.com/help/claimed-accounts) diff --git a/src/Core/Platform/Mail/HandlebarsMailService.cs b/src/Core/Platform/Mail/HandlebarsMailService.cs index d57ca400fd..e92fa34daa 100644 --- a/src/Core/Platform/Mail/HandlebarsMailService.cs +++ b/src/Core/Platform/Mail/HandlebarsMailService.cs @@ -657,11 +657,11 @@ public class HandlebarsMailService : IMailService return; MailQueueMessage CreateMessage(string emailAddress, Organization org) => - new(CreateDefaultMessage($"Your Bitwarden account is claimed by {org.DisplayName()}", emailAddress), + new(CreateDefaultMessage($"Important update to your Bitwarden account", emailAddress), "AdminConsole.DomainClaimedByOrganization", new ClaimedDomainUserNotificationViewModel { - TitleFirst = $"Your Bitwarden account is claimed by {org.DisplayName()}", + TitleFirst = $"Important update to your Bitwarden account", OrganizationName = CoreHelpers.SanitizeForEmail(org.DisplayName(), false) }); } From bfefd27a3827c91c36d9c27f92511a42dd0611df Mon Sep 17 00:00:00 2001 From: Vijay Oommen Date: Wed, 28 Jan 2026 13:57:06 -0600 Subject: [PATCH 2/2] PM-30538 Add feature flag for Milestone 11 DIRT (#6916) --- src/Core/Constants.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Core/Constants.cs b/src/Core/Constants.cs index 67f3e051af..58b50a6512 100644 --- a/src/Core/Constants.cs +++ b/src/Core/Constants.cs @@ -262,6 +262,7 @@ public static class FeatureFlagKeys public const string EventManagementForDataDogAndCrowdStrike = "event-management-for-datadog-and-crowdstrike"; public const string EventDiagnosticLogging = "pm-27666-siem-event-log-debugging"; public const string EventManagementForHuntress = "event-management-for-huntress"; + public const string Milestone11AppPageImprovements = "pm-30538-dirt-milestone-11-app-page-improvements"; /* UIF Team */ public const string RouterFocusManagement = "router-focus-management";