Skip to content

Commit d583b19

Browse files
committed
TD-3841 null check on when client context is not found
1 parent 19180e4 commit d583b19

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
336336
{
337337
var context = await this.interaction.GetAuthorizationContextAsync(returnUrl);
338338
LoginClientTemplate loginClientTemplate = null;
339-
if (context?.Client.ClientId != null && this.authConfig.IdsClients.ContainsKey(context.Client.ClientId))
339+
if (context?.Client?.ClientId != null && this.authConfig.IdsClients.ContainsKey(context.Client.ClientId))
340340
{
341341
loginClientTemplate = this.authConfig.IdsClients[context.Client.ClientId];
342342

@@ -383,7 +383,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
383383

384384
var allowLocal = true;
385385

386-
if (context?.Client.ClientId != null)
386+
if (context?.Client?.ClientId != null)
387387
{
388388
var client = await this.ClientStore.FindEnabledClientByIdAsync(context.Client.ClientId);
389389
if (client != null)
@@ -404,7 +404,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
404404
Username = context?.LoginHint,
405405
ExternalProviders = providers.ToArray(),
406406
LoginClientTemplate = loginClientTemplate ?? new LoginClientTemplate(),
407-
ClientId = context?.Client.ClientId,
407+
ClientId = context?.Client?.ClientId,
408408
};
409409
}
410410

0 commit comments

Comments
 (0)