Merge pull request #688 from DuendeSoftware/brock/ui_fixes

Cleanup on the UI quickstart code based on template feedback
DuendeSoftware · Jan 25, 2022 · fa10b2f · fa10b2f
2 parents f1d2be7 + 645b46d
commit fa10b2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/hosts/AspNetIdentity/Pages/Account/Login/Index.cshtml.cs b/hosts/AspNetIdentity/Pages/Account/Login/Index.cshtml.cs
@@ -56,7 +56,7 @@ public async Task<IActionResult> OnGet(string returnUrl)
         if (View.IsExternalLoginOnly)
         {
             // we only have one option for logging in and it's an external provider
-            return RedirectToPage("/ExternalLogin/Challenge/Index", new { scheme = View.ExternalLoginScheme, returnUrl });
+            return RedirectToPage("/ExternalLogin/Challenge", new { scheme = View.ExternalLoginScheme, returnUrl });
         }
 
         return Page();
@@ -164,6 +164,8 @@ private async Task BuildModelAsync(string returnUrl)
             {
                 View.ExternalProviders = new[] { new ViewModel.ExternalProvider { AuthenticationScheme = context.IdP } };
             }
+
+            return;
         }
 
         var schemes = await _schemeProvider.GetAllSchemesAsync();

diff --git a/hosts/EntityFramework/Pages/Account/Login/Index.cshtml.cs b/hosts/EntityFramework/Pages/Account/Login/Index.cshtml.cs
@@ -56,7 +56,7 @@ public async Task<IActionResult> OnGet(string returnUrl)
         if (View.IsExternalLoginOnly)
         {
             // we only have one option for logging in and it's an external provider
-            return RedirectToPage("/ExternalLogin/Challenge/Index", new { scheme = View.ExternalLoginScheme, returnUrl });
+            return RedirectToPage("/ExternalLogin/Challenge", new { scheme = View.ExternalLoginScheme, returnUrl });
         }
 
         return Page();
@@ -184,6 +184,8 @@ private async Task BuildModelAsync(string returnUrl)
             {
                 View.ExternalProviders = new[] { new ViewModel.ExternalProvider { AuthenticationScheme = context.IdP } };
             }
+
+            return;
         }
 
         var schemes = await _schemeProvider.GetAllSchemesAsync();

diff --git a/hosts/main/Pages/Account/Login/Index.cshtml.cs b/hosts/main/Pages/Account/Login/Index.cshtml.cs
@@ -56,7 +56,7 @@ public async Task<IActionResult> OnGet(string returnUrl)
         if (View.IsExternalLoginOnly)
         {
             // we only have one option for logging in and it's an external provider
-            return RedirectToPage("/ExternalLogin/Challenge/Index", new { scheme = View.ExternalLoginScheme, returnUrl });
+            return RedirectToPage("/ExternalLogin/Challenge", new { scheme = View.ExternalLoginScheme, returnUrl });
         }
 
         return Page();
@@ -184,6 +184,8 @@ private async Task BuildModelAsync(string returnUrl)
             {
                 View.ExternalProviders = new[] { new ViewModel.ExternalProvider { AuthenticationScheme = context.IdP } };
             }
+
+            return;
         }
 
         var schemes = await _schemeProvider.GetAllSchemesAsync();