HEEDLS-350 Validate password if not null before ModelState validation #469
Conversation
This file contains hidden or 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
DanBloxham-sw
approved these changes
Jul 6, 2021
stellake
reviewed
Jul 7, 2021
|
|
||
| // When | ||
| var result = await authenticatedController.Index(new ChangePasswordViewModel()); | ||
| var result = await authenticatedController.Index(new ChangePasswordViewModel{CurrentPassword = "test"}); |
There was a problem hiding this comment.
Minor, but could we run the formatter?
| } | ||
| userService.UpdateUserAccountDetails(accountDetailsData, centreAnswersData); | ||
|
|
||
| return RedirectToAction("Index"); |
There was a problem hiding this comment.
Is it worth writing tests for the functionality change?
| return View(model); | ||
| } | ||
|
|
||
| var verifiedLinkedUsersAccounts = |
There was a problem hiding this comment.
Given that we need the verifiedLinkedUserAccounts anyway, could we do something like:
var verifiedLinkedUsersAccounts = string.IsNullOrEmpty(model.CurrentPassword)
? new UserAccountSet()
: userService.GetVerifiedLinkedUsersAccounts(adminId, delegateId, model.CurrentPassword!);
if (verifiedLinkedUsersAccounts.Any()) {
// Add errors
}
Then we can continue without having to make 2x calls to getting linked accounts. Will probably be more work than worth to avoid double calls on the MyAccountController though.
stellake
reviewed
Jul 7, 2021
| if (model.CurrentPassword != null && !userService.IsPasswordValid(adminId, delegateId, model.CurrentPassword)) | ||
|
|
||
| var verifiedLinkedUsersAccounts = string.IsNullOrEmpty(model.CurrentPassword) | ||
| ? new UserAccountSet(null, null) |
There was a problem hiding this comment.
Super minor, but is it worth adding an empty constructor to UserAccountSet?
stellake
approved these changes
Jul 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Moved the validation of the password if it isn't null before the ModelState.IsValid check for both the ChangePassword and MyAccount EditDetails so that the user is shown the invalid current password error even if they also have other validation errors.