[AC-2086] Update CanDelete to handle V1 flag logic #3979
Merged
+243
−29
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3979 +/- ##
=======================================
Coverage 38.33% 38.33%
=======================================
Files 1209 1209
Lines 58686 58688 +2
Branches 5589 5591 +2
=======================================
+ Hits 22495 22498 +3
+ Misses 35147 35146 -1
Partials 1044 1044 ☔ View full report in Codecov by Sentry. |
|
New Issues
Fixed Issues
|
vincentsalucci
changed the title
vincentsalucci
requested review from
LRNcardozoWDF,
addisonbeck,
eliykat,
Jingo88 and
shane-melton
eliykat
requested changes
May 2, 2024
Comment on lines
246
to
262
| // LimitCollectionCreationDeletion is false, AllowAdminAccessToAllCollectionItems setting is irrelevant. | ||
| // Ensure acting user has manage permissions for all collections being deleted | ||
| if (organizationAbility is { LimitCollectionCreationDeletion: false }) | ||
| { | ||
| var canManageCollections = await CanManageCollectionsAsync(resources); | ||
| if (canManageCollections) | ||
| { | ||
| return true; | ||
| } | ||
| } | ||
| else | ||
| // LimitCollectionCreationDeletion is true, only Owners and Admins can delete collections they manage | ||
| { | ||
| if (org is { Type: OrganizationUserType.Owner or OrganizationUserType.Admin } && canManageCollections) | ||
| { | ||
| return true; | ||
| } | ||
| } |
There was a problem hiding this comment.
How you've written this works and I think this has turned out pretty well after much discussion about the business logic side of things.
One suggestion, I think this could be expressed more succinctly:
var canDeleteManagedCollections = organizationAbility is { LimitCollectionCreationDeletion: false } ||
org is { Type: OrganizationUserType.Owner or OrganizationUserType.Admin };
if (canDeleteManagedCollections && await canManageCollections(resources))
{
return true;
}
Comment on lines
237
to
239
| if ((organizationAbility is { AllowAdminAccessToAllCollectionItems: true } || | ||
| !_featureService.IsEnabled(FeatureFlagKeys.FlexibleCollectionsV1)) && | ||
| org is { Type: OrganizationUserType.Owner or OrganizationUserType.Admin }) |
There was a problem hiding this comment.
I ended up separating these lines to make the logic a little clearer - see CanUpdateCollectionAsync.
There was a problem hiding this comment.
Please add a test case for:
- owner/admin
- deleting a collection they don't manage
- admins can manage all collections and items is set to false
- expect: not authorized
or if it's here and I'm missing it, just point me to it 😁
There was a problem hiding this comment.
I believe I've added the test you're looking for!
|
Also just confirming that we need the same changes in |
…ion, refs AC-2086
…ut can manage, refs AC-2086
Jingo88
previously approved these changes
May 6, 2024
Jingo88
approved these changes
May 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change
Objective
Code changes
CanDeleteAsyncmethod to take into account logic changes from theAllowAdminAccessToAllCollectionItemssettingBefore you submit
dotnet format --verify-no-changes) (required)