From 8bc74983addd49afa3b1bc9f7f535158d1c68f6e Mon Sep 17 00:00:00 2001 From: Ben Brooks Date: Wed, 26 Aug 2026 17:12:56 -0700 Subject: [PATCH 1/3] [PM-42584] Require single organization to enable Fill assist policy Signed-off-by: Ben Brooks --- src/Core/AdminConsole/Enums/PolicyType.cs | 2 +- .../PolicyEventHandlers/FillAssistPolicyEventHandler.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Core/AdminConsole/Enums/PolicyType.cs b/src/Core/AdminConsole/Enums/PolicyType.cs index f82f39b64eb1..98721877fbc6 100644 --- a/src/Core/AdminConsole/Enums/PolicyType.cs +++ b/src/Core/AdminConsole/Enums/PolicyType.cs @@ -66,7 +66,7 @@ public static string GetName(this PolicyType type) PolicyType.BlockClaimedDomainAccountCreation => "Block account creation for claimed domains", PolicyType.OrganizationUserNotification => "Vault banner message", PolicyType.SendControls => "Send controls", - PolicyType.FillAssist => "Fill Assist", + PolicyType.FillAssist => "Fill assist", }; } } diff --git a/src/Core/AdminConsole/OrganizationFeatures/Policies/PolicyEventHandlers/FillAssistPolicyEventHandler.cs b/src/Core/AdminConsole/OrganizationFeatures/Policies/PolicyEventHandlers/FillAssistPolicyEventHandler.cs index dda43d325018..8ee203047fe0 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/Policies/PolicyEventHandlers/FillAssistPolicyEventHandler.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/Policies/PolicyEventHandlers/FillAssistPolicyEventHandler.cs @@ -8,9 +8,10 @@ namespace Bit.Core.AdminConsole.OrganizationFeatures.Policies.PolicyEventHandlers; -public class FillAssistPolicyEventHandler : IPolicyValidationEvent +public class FillAssistPolicyEventHandler : IPolicyValidationEvent, IEnforceDependentPoliciesEvent { public PolicyType Type => PolicyType.FillAssist; + public IEnumerable RequiredPolicies => [PolicyType.SingleOrg]; public Task ValidateAsync(SavePolicyModel policyRequest, Policy? currentPolicy) { From 4848bcc3d4a16b849b2fd1349eaa92e6fc41a831 Mon Sep 17 00:00:00 2001 From: Ben Brooks Date: Thu, 27 Aug 2026 08:35:24 -0700 Subject: [PATCH 2/3] [PM-42584] Enable SingleOrg in FillAssist Success integration test Signed-off-by: Ben Brooks --- .../AdminConsole/Controllers/PoliciesControllerTests.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/Api.IntegrationTest/AdminConsole/Controllers/PoliciesControllerTests.cs b/test/Api.IntegrationTest/AdminConsole/Controllers/PoliciesControllerTests.cs index 4b850a535baa..f21a66f0646c 100644 --- a/test/Api.IntegrationTest/AdminConsole/Controllers/PoliciesControllerTests.cs +++ b/test/Api.IntegrationTest/AdminConsole/Controllers/PoliciesControllerTests.cs @@ -500,6 +500,11 @@ await OrganizationTestHelpers.CreateUserAsync(_factory, orgB.Id, public async Task Put_FillAssistPolicy_Success() { // Arrange + // FillAssist requires SingleOrg to be enabled first (IEnforceDependentPoliciesEvent). + await _client.PutAsync( + $"/organizations/{_organization.Id}/policies/{PolicyType.SingleOrg}", + JsonContent.Create(new SavePolicyRequest { Policy = new PolicyRequestModel { Enabled = true } })); + var policyType = PolicyType.FillAssist; const string rulesUrl = "https://github.com/bitwarden/map-the-web/releases/latest/download"; var request = new SavePolicyRequest From f3b89c9cae7f374a40631fc3e0ca4b96914310d8 Mon Sep 17 00:00:00 2001 From: Ben Brooks Date: Thu, 27 Aug 2026 08:48:53 -0700 Subject: [PATCH 3/3] [PM-42584] Match error text to admin console label Signed-off-by: Ben Brooks --- src/Core/AdminConsole/Enums/PolicyType.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/AdminConsole/Enums/PolicyType.cs b/src/Core/AdminConsole/Enums/PolicyType.cs index 98721877fbc6..6f9222073736 100644 --- a/src/Core/AdminConsole/Enums/PolicyType.cs +++ b/src/Core/AdminConsole/Enums/PolicyType.cs @@ -66,7 +66,7 @@ public static string GetName(this PolicyType type) PolicyType.BlockClaimedDomainAccountCreation => "Block account creation for claimed domains", PolicyType.OrganizationUserNotification => "Vault banner message", PolicyType.SendControls => "Send controls", - PolicyType.FillAssist => "Fill assist", + PolicyType.FillAssist => "Activate fill assist", }; } }