[PM-11405] Account Management: Prevent a verified user from changing their email address #19
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
…rifiedUserEmailDomainAsync and refactor to return a list. Remove ManagedByOrganizationId from ProfileResponseMode. Add ManagesActiveUser to ProfileOrganizationResponseModel
…ing their email address
…sManagedByAnyOrganizationAsync to not return nullable objects. Update ProfileOrganizationResponseModel.UserIsManagedByOrganization to not be nullable
…vault' into ac/pm-11405/prevent-a-verified-user-from-changing-their-email-address
…vault' into ac/pm-11405/prevent-a-verified-user-from-changing-their-email-address
…nging-their-email-address
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
There was a problem hiding this comment.
2 file(s) reviewed, 6 comment(s)
Edit PR Review Bot Settings | Greptile
Comment on lines
+151
to
+156
| // If Account Deprovisioning is enabled, we need to check if the user is managed by any organization. | ||
| if (_featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning) | ||
| && await _userService.IsManagedByAnyOrganizationAsync(user.Id)) | ||
| { | ||
| throw new BadRequestException("Cannot change emails for accounts owned by an organization. Contact your organization administrator for additional details."); | ||
| } |
There was a problem hiding this comment.
style: Consider extracting this check into a separate method for reusability and improved readability
Comment on lines
+175
to
+180
| // If Account Deprovisioning is enabled, we need to check if the user is managed by any organization. | ||
| if (_featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning) | ||
| && await _userService.IsManagedByAnyOrganizationAsync(user.Id)) | ||
| { | ||
| throw new BadRequestException("Cannot change emails for accounts owned by an organization. Contact your organization administrator for additional details."); | ||
| } |
There was a problem hiding this comment.
style: This block is identical to the one in PostEmailToken. Consider refactoring to avoid duplication
| var user = GenerateExampleUser(); | ||
| ConfigureUserServiceToReturnValidPrincipalFor(user); | ||
| ConfigureUserServiceToAcceptPasswordFor(user); | ||
| _featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); |
There was a problem hiding this comment.
style: Consider using a constant for the feature flag key instead of a string literal
| var user = GenerateExampleUser(); | ||
| ConfigureUserServiceToReturnValidPrincipalFor(user); | ||
| ConfigureUserServiceToAcceptPasswordFor(user); | ||
| _featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); |
There was a problem hiding this comment.
style: Consider using a constant for the feature flag key instead of a string literal
| ConfigureUserServiceToReturnValidPrincipalFor(user); | ||
| _userService.ChangeEmailAsync(user, default, default, default, default, default) | ||
| .Returns(Task.FromResult(IdentityResult.Success)); | ||
| _featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); |
There was a problem hiding this comment.
style: Consider using a constant for the feature flag key instead of a string literal
| { | ||
| var user = GenerateExampleUser(); | ||
| ConfigureUserServiceToReturnValidPrincipalFor(user); | ||
| _featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning).Returns(true); |
There was a problem hiding this comment.
style: Consider using a constant for the feature flag key instead of a string literal
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-11405
📔 Objective
If the Account Deprovisioning feature flag is enabled and the user is managed by an organization then block the Change Email endpoints.
Clients PR: bitwarden/clients#11486
⏰ 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 changesGreptile Summary
This pull request implements a feature to prevent verified users from changing their email addresses when managed by an organization and the Account Deprovisioning feature flag is enabled.
AccountsController.PostEmailTokenandPostEmailmethods to enforce email change restrictions_featureServiceto check if Account Deprovisioning feature is enabled_userService.IsManagedByAnyOrganizationAsyncto determine if user is managed by an organizationAccountsControllerTestswith new test cases for Account Deprovisioning scenarios