Skip to content

Develop/fixes/td 549 incorrect password showing on change your password page #1446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 3, 2022
Merged

Develop/fixes/td 549 incorrect password showing on change your password page #1446

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48432c5
Model State Checked earlier in the request.
OluwatobiAwe Oct 28, 2022
f996c3d
update
OluwatobiAwe Oct 28, 2022
a3ebe1c
format doc
OluwatobiAwe Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions DigitalLearningSolutions.Web/Controllers/ChangePasswordController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,27 @@ public async Task<IActionResult> Index(ChangePasswordFormData formData, DlsSubAp
var adminId = User.GetAdminId();
var delegateId = User.GetCandidateId();



var verifiedLinkedUsersAccounts = string.IsNullOrEmpty(formData.CurrentPassword)
? new UserAccountSet()
: userService.GetVerifiedLinkedUsersAccounts(adminId, delegateId, formData.CurrentPassword!);

if (!ModelState.IsValid)
{
var model = new ChangePasswordViewModel(formData, dlsSubApplication);
return View(model);
}

if (!verifiedLinkedUsersAccounts.Any())
{
ModelState.AddModelError(
nameof(ChangePasswordFormData.CurrentPassword),
CommonValidationErrorMessages.IncorrectPassword
);
return View(new ChangePasswordViewModel(formData, dlsSubApplication));
}

if (!ModelState.IsValid)
{
var model = new ChangePasswordViewModel(formData, dlsSubApplication);
return View(model);
}

var newPassword = formData.Password!;

Expand Down