Merge branch 'CI' of https://github.com/TechnologyEnhancedLearning/LearningHub.Nhs.UserApi into CI

Author: Swapnamol

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

@@ -45,6 +45,7 @@ public class AccountController : IdentityServerController
         private readonly IAuthenticationSchemeProvider schemeProvider;
         private readonly LearningHubAuthConfig authConfig;
         private readonly WebSettings webSettings;
+        private readonly ILogger logger;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AccountController"/> class.
@@ -55,6 +56,7 @@ public class AccountController : IdentityServerController
         /// <param name="events">events parameter.</param>
         /// <param name="userService">userService parameter.</param>
         /// <param name="webSettings">webSettings parameter.</param>
+        /// <param name="logger">ILogger instance.</param>
         /// <param name="authConfig">Auth service config.</param>
         /// <param name="cacheService">Cacje service config.</param>
         public AccountController(
@@ -64,6 +66,7 @@ public AccountController(
             IEventService events,
             IUserService userService,
             WebSettings webSettings,
+            ILogger<AccountController> logger,
             IOptions<LearningHubAuthConfig> authConfig,
             ICacheService cacheService)
             : base(userService, events, clientStore, webSettings, cacheService)
@@ -72,6 +75,7 @@ public AccountController(
             this.schemeProvider = schemeProvider;
             this.authConfig = authConfig?.Value;
             this.webSettings = webSettings;
+            this.logger = logger;
     }
 
         /// <summary>
@@ -145,6 +149,12 @@ await this.interaction.GrantConsentAsync(
                 }
             }
 
+            if (context == null)
+            {
+                this.ModelState.AddModelError(string.Empty, "Invalid request");
+                goto showFormWithError;
+            }
+
             if (this.ModelState.IsValid)
             {
                 // validate username/password
@@ -208,6 +218,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"))
@@ -328,7 +340,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
         {
             var context = await this.interaction.GetAuthorizationContextAsync(returnUrl);
             LoginClientTemplate loginClientTemplate = null;
-            if (context?.Client.ClientId != null && this.authConfig.IdsClients.ContainsKey(context.Client.ClientId))
+            if (context?.Client?.ClientId != null && this.authConfig.IdsClients.ContainsKey(context.Client.ClientId))
             {
                 loginClientTemplate = this.authConfig.IdsClients[context.Client.ClientId];
 
@@ -375,7 +387,7 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
 
             var allowLocal = true;
 
-            if (context?.Client.ClientId != null)
+            if (context?.Client?.ClientId != null)
             {
                 var client = await this.ClientStore.FindEnabledClientByIdAsync(context.Client.ClientId);
                 if (client != null)
@@ -388,6 +400,12 @@ private async Task<LoginViewModel> BuildLoginViewModelAsync(string returnUrl)
                 }
             }
 
+            if (context == null || loginClientTemplate == null)
+            {
+                string message = context == null ? "context" : loginClientTemplate == null ? "clientTemplate" : string.Empty;
+                this.logger.LogWarning($"return url has no {message} : {returnUrl}");
+            }
+
             return new LoginViewModel
             {
                 AllowRememberLogin = loginClientTemplate?.AllowRememberLogin ?? AccountOptions.AllowRememberLogin,
@@ -396,7 +414,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,
             };
         }