Merge pull request #1 from Walid-Abdulrazik/Walid-Abdulrazik-patch-1

Update AccountController.cs

Author: Walid-Abdulrazik

src/Skoruba.IdentityServer4.STS.Identity/Controllers/AccountController.cs

@@ -596,7 +596,7 @@ public IActionResult Register(string returnUrl = null)
         [HttpPost]
         [AllowAnonymous]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = null)
+        public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = null, bool IsCalledFromRegisterWithoutUsername = false)
         {
             returnUrl = returnUrl ?? Url.Content("~/");
 
@@ -633,7 +633,21 @@ public async Task<IActionResult> Register(RegisterViewModel model, string return
             AddErrors(result);
 
             // If we got this far, something failed, redisplay form
-            return View(model);
+            if (IsCalledFromRegisterWithoutUsername)
+            {
+                var registerWithoutUsernameModel = new RegisterWithoutUsernameViewModel
+                {
+                    Email = model.Email,
+                    Password = model.Password,
+                    ConfirmPassword = model.ConfirmPassword
+                };
+
+                return View("RegisterWithoutUsername", registerWithoutUsernameModel);
+            }
+            else
+            {
+                return View(model);
+            }
         }
 
         [HttpPost]
@@ -649,10 +663,9 @@ public async Task<IActionResult> RegisterWithoutUsername(RegisterWithoutUsername
                 ConfirmPassword = model.ConfirmPassword
             };
 
-            return await Register(registerModel, returnUrl);
+            return await Register(registerModel, returnUrl, true);
         }
 
-
         /*****************************************/
         /* helper APIs for the AccountController */
         /*****************************************/
@@ -798,4 +811,4 @@ private async Task<LoggedOutViewModel> BuildLoggedOutViewModelAsync(string logou
             return vm;
         }
     }
-}
+}