[PM-13026] Refactor remove and bulkremove methods to throw error if user is managed by an organization #5034
+638
−173
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
… when account deprovisioning is enabled
…ate related logic.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #5034 +/- ##
==========================================
+ Coverage 43.09% 43.13% +0.03%
==========================================
Files 1414 1414
Lines 64808 64851 +43
Branches 5925 5930 +5
==========================================
+ Hits 27929 27973 +44
Misses 35645 35645
+ Partials 1234 1233 -1 ☔ View full report in Codecov by Sentry. 🚨 Try these New Features:
|
|
New Issues
Fixed Issues
|
… remove unused logging method
eliykat
requested changes
Nov 18, 2024
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RemoveOrganizationUserCommand.cs
Outdated
Show resolved
Hide resolved
Comment on lines
117
to
120
| if (managementStatus.TryGetValue(orgUser.Id, out var isManaged) && isManaged) | ||
| { | ||
| throw new BadRequestException("Managed members cannot be simply removed, their entire individual account must be deleted."); | ||
| } |
There was a problem hiding this comment.
This command is also used by SCIM which can continue to remove managed users (integrations are excluded from the delete behavior until we figure out how to do it safely). So there needs to be some conditionality here. Maybe stealing actingUser from Jared's PR would be useful so it can encapsulate deletingUserId or the SystemUser (and in that case you can exempt SCIM from this check).
I don't love it but I think my problem is with the diverging business logic. Handling it in the command like this seems reasonable.
There was a problem hiding this comment.
I have refactored this so that we don't check managed users when an EventSystemUser is passed.
…r-if-user-is-managed
…date retrieval and update unit tests accordingly
…r-if-user-is-managed
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.
🎟️ Tracking
https://bitwarden.atlassian.net/browse/PM-13026
📔 Objective
⏰ Reminders before review
🦮 Reviewer guidelines
:+1:) or similar for great changes:memo:) or ℹ️ (:information_source:) for notes or general info:question:) for questions:thinking:) or 💭 (:thought_balloon:) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion:art:) for suggestions / improvements:x:) or:warning:) for more significant problems or concerns needing attention:seedling:) or ♻️ (:recycle:) for future improvements or indications of technical debt:pick:) for minor or nitpick changes