From 1a56c359fac13469841a2217fd0b878be64f1c45 Mon Sep 17 00:00:00 2001 From: Rui Tome Date: Mon, 30 Oct 2023 12:38:18 +0000 Subject: [PATCH] [AC-1139] Renamed FlexibleCollectionsIsEnabled properties to UseFlexibleCollections --- .../Controllers/GroupsController.cs | 4 +-- .../OrganizationUsersController.cs | 4 +-- src/Api/Controllers/CollectionsController.cs | 26 +++++++++---------- .../BulkCollectionAuthorizationHandler.cs | 4 +-- .../CollectionAuthorizationHandler.cs | 4 +-- .../Groups/GroupAuthorizationHandler.cs | 4 +-- .../OrganizationUserAuthorizationHandler.cs | 4 +-- src/Core/Context/CurrentContext.cs | 8 +++--- .../Implementations/OrganizationService.cs | 8 +++--- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/Api/AdminConsole/Controllers/GroupsController.cs b/src/Api/AdminConsole/Controllers/GroupsController.cs index 45dc47ac10..8e5ea18da4 100644 --- a/src/Api/AdminConsole/Controllers/GroupsController.cs +++ b/src/Api/AdminConsole/Controllers/GroupsController.cs @@ -29,7 +29,7 @@ public class GroupsController : Controller private readonly IFeatureService _featureService; private readonly IAuthorizationService _authorizationService; - private bool FlexibleCollectionsIsEnabled => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); public GroupsController( IGroupRepository groupRepository, @@ -80,7 +80,7 @@ public class GroupsController : Controller [HttpGet("")] public async Task> Get(Guid orgId) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic return await Get_FC(orgId); diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs index c437dee7bb..83395b9902 100644 --- a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs @@ -38,7 +38,7 @@ public class OrganizationUsersController : Controller private readonly IFeatureService _featureService; private readonly IAuthorizationService _authorizationService; - private bool FlexibleCollectionsIsEnabled => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); public OrganizationUsersController( IOrganizationRepository organizationRepository, @@ -92,7 +92,7 @@ public class OrganizationUsersController : Controller [HttpGet("")] public async Task> Get(Guid orgId, bool includeGroups = false, bool includeCollections = false) { - var authorized = FlexibleCollectionsIsEnabled + var authorized = UseFlexibleCollections ? (await _authorizationService.AuthorizeAsync(User, null, OrganizationUserOperations.ReadAll(orgId))).Succeeded : await _currentContext.ViewAllCollections(orgId) || await _currentContext.ViewAssignedCollections(orgId) || diff --git a/src/Api/Controllers/CollectionsController.cs b/src/Api/Controllers/CollectionsController.cs index 5942ab03f0..6a880d782b 100644 --- a/src/Api/Controllers/CollectionsController.cs +++ b/src/Api/Controllers/CollectionsController.cs @@ -50,12 +50,12 @@ public class CollectionsController : Controller _featureService = featureService; } - private bool FlexibleCollectionsIsEnabled => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); [HttpGet("{id}")] public async Task Get(Guid orgId, Guid id) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic return await Get_FC(id); @@ -75,7 +75,7 @@ public class CollectionsController : Controller [HttpGet("{id}/details")] public async Task GetDetails(Guid orgId, Guid id) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic return await GetDetails_FC(id); @@ -113,7 +113,7 @@ public class CollectionsController : Controller [HttpGet("details")] public async Task> GetManyWithDetails(Guid orgId) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic return await GetManyWithDetails_FC(orgId); @@ -153,7 +153,7 @@ public class CollectionsController : Controller [HttpGet("")] public async Task> Get(Guid orgId) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic return await GetByOrgId_FC(orgId); @@ -177,7 +177,7 @@ public class CollectionsController : Controller [HttpGet("{id}/users")] public async Task> GetUsers(Guid orgId, Guid id) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic return await GetUsers_FC(id); @@ -195,7 +195,7 @@ public class CollectionsController : Controller { var collection = model.ToCollection(orgId); - var authorized = FlexibleCollectionsIsEnabled + var authorized = UseFlexibleCollections ? (await _authorizationService.AuthorizeAsync(User, collection, CollectionOperations.Create)).Succeeded : await CanCreateCollection(orgId, collection.Id) || await CanEditCollectionAsync(orgId, collection.Id); if (!authorized) @@ -214,7 +214,7 @@ public class CollectionsController : Controller [HttpPost("{id}")] public async Task Put(Guid orgId, Guid id, [FromBody] CollectionRequestModel model) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic return await Put_FC(id, model); @@ -236,7 +236,7 @@ public class CollectionsController : Controller [HttpPut("{id}/users")] public async Task PutUsers(Guid orgId, Guid id, [FromBody] IEnumerable model) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic await PutUsers_FC(id, model); @@ -283,7 +283,7 @@ public class CollectionsController : Controller [HttpPost("{id}/delete")] public async Task Delete(Guid orgId, Guid id) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic await Delete_FC(id); @@ -303,7 +303,7 @@ public class CollectionsController : Controller [HttpPost("delete")] public async Task DeleteMany(Guid orgId, [FromBody] CollectionBulkDeleteRequestModel model) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic var collections = await _collectionRepository.GetManyByManyIdsAsync(model.Ids); @@ -339,7 +339,7 @@ public class CollectionsController : Controller [HttpPost("{id}/delete-user/{orgUserId}")] public async Task Delete(Guid orgId, Guid id, Guid orgUserId) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { // New flexible collections logic await DeleteUser_FC(id, orgUserId); @@ -352,7 +352,7 @@ public class CollectionsController : Controller private void DeprecatedPermissionsGuard() { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { throw new FeatureUnavailableException("Flexible Collections is ON when it should be OFF."); } diff --git a/src/Api/Vault/AuthorizationHandlers/Collections/BulkCollectionAuthorizationHandler.cs b/src/Api/Vault/AuthorizationHandlers/Collections/BulkCollectionAuthorizationHandler.cs index 73e3e19619..60cb8170bd 100644 --- a/src/Api/Vault/AuthorizationHandlers/Collections/BulkCollectionAuthorizationHandler.cs +++ b/src/Api/Vault/AuthorizationHandlers/Collections/BulkCollectionAuthorizationHandler.cs @@ -20,7 +20,7 @@ public class BulkCollectionAuthorizationHandler : BulkAuthorizationHandler _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); public BulkCollectionAuthorizationHandler( ICurrentContext currentContext, @@ -35,7 +35,7 @@ public class BulkCollectionAuthorizationHandler : BulkAuthorizationHandler resources) { - if (!FlexibleCollectionsIsEnabled) + if (!UseFlexibleCollections) { // Flexible collections is OFF, should not be using this handler throw new FeatureUnavailableException("Flexible collections is OFF when it should be ON."); diff --git a/src/Api/Vault/AuthorizationHandlers/Collections/CollectionAuthorizationHandler.cs b/src/Api/Vault/AuthorizationHandlers/Collections/CollectionAuthorizationHandler.cs index 5cde10d0c1..1f35954a56 100644 --- a/src/Api/Vault/AuthorizationHandlers/Collections/CollectionAuthorizationHandler.cs +++ b/src/Api/Vault/AuthorizationHandlers/Collections/CollectionAuthorizationHandler.cs @@ -16,7 +16,7 @@ public class CollectionAuthorizationHandler : AuthorizationHandler _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); public CollectionAuthorizationHandler( ICurrentContext currentContext, @@ -29,7 +29,7 @@ public class CollectionAuthorizationHandler : AuthorizationHandler _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); public GroupAuthorizationHandler( ICurrentContext currentContext, @@ -29,7 +29,7 @@ public class GroupAuthorizationHandler : AuthorizationHandler _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); public OrganizationUserAuthorizationHandler( ICurrentContext currentContext, @@ -29,7 +29,7 @@ public class OrganizationUserAuthorizationHandler : AuthorizationHandler _providerOrganizationProviderDetails; private IEnumerable _providerUserOrganizations; - private bool FlexibleCollectionsIsEnabled => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, this); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, this); public virtual HttpContext HttpContext { get; set; } public virtual Guid? UserId { get; set; } @@ -345,7 +345,7 @@ public class CurrentContext : ICurrentContext public async Task EditAssignedCollections(Guid orgId) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { throw new FeatureUnavailableException("Flexible Collections is ON when it should be OFF."); } @@ -356,7 +356,7 @@ public class CurrentContext : ICurrentContext public async Task DeleteAssignedCollections(Guid orgId) { - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { throw new FeatureUnavailableException("Flexible Collections is ON when it should be OFF."); } @@ -373,7 +373,7 @@ public class CurrentContext : ICurrentContext * This entire method will be moved to the CollectionAuthorizationHandler in the future */ - if (FlexibleCollectionsIsEnabled) + if (UseFlexibleCollections) { throw new FeatureUnavailableException("Flexible Collections is ON when it should be OFF."); } diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs index d18e8fe963..0796286fca 100644 --- a/src/Core/Services/Implementations/OrganizationService.cs +++ b/src/Core/Services/Implementations/OrganizationService.cs @@ -59,7 +59,7 @@ public class OrganizationService : IOrganizationService private readonly IUpdateSecretsManagerSubscriptionCommand _updateSecretsManagerSubscriptionCommand; private readonly IFeatureService _featureService; - private bool FlexibleCollectionsIsEnabled => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); + private bool UseFlexibleCollections => _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); public OrganizationService( IOrganizationRepository organizationRepository, @@ -430,7 +430,7 @@ public class OrganizationService : IOrganizationService await ValidateSignUpPoliciesAsync(signup.Owner.Id); } - var flexibleCollectionsIsEnabled = + var useFlexibleCollections = _featureService.IsEnabled(FeatureFlagKeys.FlexibleCollections, _currentContext); var organization = new Organization @@ -470,7 +470,7 @@ public class OrganizationService : IOrganizationService Status = OrganizationStatusType.Created, UsePasswordManager = true, UseSecretsManager = signup.UseSecretsManager, - LimitCollectionCreationDeletion = !flexibleCollectionsIsEnabled + LimitCollectionCreationDeletion = !useFlexibleCollections }; if (signup.UseSecretsManager) @@ -2562,7 +2562,7 @@ public class OrganizationService : IOrganizationService private IEnumerable ApplyManageCollectionPermissions(OrganizationUser orgUser, IEnumerable collections) { - if (!FlexibleCollectionsIsEnabled && (orgUser.GetPermissions()?.EditAssignedCollections ?? false)) + if (!UseFlexibleCollections && (orgUser.GetPermissions()?.EditAssignedCollections ?? false)) { return collections.Select(c => {