Skip to content

[PM-42584] Require single organization to enable fill assist policy #8266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bensbits91 merged 4 commits into from
Aug 27, 2026
+8 −2
Merged

[PM-42584] Require single organization to enable fill assist policy #8266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bc7498
[PM-42584] Require single organization to enable Fill assist policy
bensbits91 Aug 27, 2026
4848bcc
[PM-42584] Enable SingleOrg in FillAssist Success integration test
bensbits91 Aug 27, 2026
f3b89c9
[PM-42584] Match error text to admin console label
bensbits91 Aug 27, 2026
2ce483c
Merge 'main' into pm-42584-fill-assist-single-org-prereq
bensbits91 Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Core/AdminConsole/Enums/PolicyType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",

@bensbits91 bensbits91 Aug 27, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: Changing this to be sentence case, and also so the text in the error toast (in clients) matches the policy name.

};
}
}
3 changes: 2 additions & 1 deletion ...Console/OrganizationFeatures/Policies/PolicyEventHandlers/FillAssistPolicyEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<PolicyType> RequiredPolicies => [PolicyType.SingleOrg];
Comment thread
bensbits91 marked this conversation as resolved.

public Task<string> ValidateAsync(SavePolicyModel policyRequest, Policy? currentPolicy)
{
Expand Down
5 changes: 5 additions & 0 deletions test/Api.IntegrationTest/AdminConsole/Controllers/PoliciesControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading