Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-25 12:45:18 +01:00
Code Issues Projects Releases Wiki Activity

chore: remove AllowAdminAccessToAllCollectionItems ref along with feature service call, refs AC-2683 (#4535)

Browse Source
This commit is contained in:
Vincent Salucci 2024-08-05 13:56:46 -05:00 committed by GitHub
parent 2157df9ac8
commit 4d3c1c5a5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Admin/AdminConsole/Controllers/ProvidersController.cs
View File

@ -310,8 +310,7 @@ public class ProvidersController : Controller
return RedirectToAction("Index"); return RedirectToAction("Index");
} }
var flexibleCollectionsV1Enabled = _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsV1); var organization = model.CreateOrganization(provider);
var organization = model.CreateOrganization(provider, flexibleCollectionsV1Enabled);
await _organizationService.CreatePendingOrganization(organization, model.Owners, User, _userService, model.SalesAssistedTrialStarted); await _organizationService.CreatePendingOrganization(organization, model.Owners, User, _userService, model.SalesAssistedTrialStarted);
await _providerService.AddOrganization(providerId, organization.Id, null); await _providerService.AddOrganization(providerId, organization.Id, null);

11
src/Admin/AdminConsole/Models/OrganizationEditModel.cs
View File

@ -244,17 +244,10 @@ public class OrganizationEditModel : OrganizationViewModel
return plan; return plan;
}); });
public Organization CreateOrganization(Provider provider, bool flexibleCollectionsV1Enabled) public Organization CreateOrganization(Provider provider)
{ {
BillingEmail = provider.BillingEmail; BillingEmail = provider.BillingEmail;
return ToOrganization(new Organization());
var newOrg = new Organization
{
// This is a transitional setting that defaults to ON until Flexible Collections v1 is released
// (to preserve existing behavior) and defaults to OFF after release (enabling new behavior)
AllowAdminAccessToAllCollectionItems = !flexibleCollectionsV1Enabled
};
return ToOrganization(newOrg);
} }
public Organization ToOrganization(Organization existingOrganization) public Organization ToOrganization(Organization existingOrganization)