Skip to content

Merge LH puppis Changes to Master #18

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 2 commits into from
Mar 6, 2024
Merged

Merge LH puppis Changes to Master #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19180e4
TD-3841 context null check
OluwatobiAwe Feb 29, 2024
e722bba
Merge pull request #17 from TechnologyEnhancedLearning/Develop/Fixes/…
OluwatobiAwe Feb 29, 2024
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
10 changes: 9 additions & 1 deletion Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@ await this.interaction.GrantConsentAsync(
}
}

if (context == null)
{
this.ModelState.AddModelError(string.Empty, "Invalid request");
goto showFormWithError;
}

if (this.ModelState.IsValid)
{
// validate username/password
Expand Down Expand Up @@ -208,6 +214,8 @@ await this.UserService.AddLogonToUserHistory(
this.ModelState.AddModelError(string.Empty, loginResult.ErrorMessage);
}

showFormWithError:

// something went wrong, show form with error
var vm = await this.BuildLoginViewModelAsync(model);
if ((vm.ClientId == "learninghubwebclient") || (vm.ClientId == "learninghubadmin"))
Expand Down Expand Up @@ -396,7 +404,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
Username = context?.LoginHint,
ExternalProviders = providers.ToArray(),
LoginClientTemplate = loginClientTemplate ?? new LoginClientTemplate(),
ClientId = context.Client.ClientId,
ClientId = context?.Client.ClientId,
};
}

Expand Down