From cb0aa63a43e4d1d34e8d09b9856cbc4cf512099d Mon Sep 17 00:00:00 2001
From: BrennanConroy <zillow@Brennans-MacBook-Air.local>
Date: Tue, 8 Nov 2016 16:29:09 -0800
Subject: [PATCH] UserName and minor fixups for ChatSample

---
 samples/ChatSample/Controllers/AccountController.cs        | 6 +++---
 .../ChatSample/Models/AccountViewModels/LoginViewModel.cs  | 3 +--
 .../Models/AccountViewModels/RegisterViewModel.cs          | 4 ++++
 samples/ChatSample/Views/Account/Login.cshtml              | 6 +++---
 samples/ChatSample/Views/Account/Register.cshtml           | 7 +++++++
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/samples/ChatSample/Controllers/AccountController.cs b/samples/ChatSample/Controllers/AccountController.cs
index d816834c25..1dc9cd4c44 100644
--- a/samples/ChatSample/Controllers/AccountController.cs
+++ b/samples/ChatSample/Controllers/AccountController.cs
@@ -62,7 +62,7 @@ namespace ChatSample.Controllers
             {
                 // This doesn't count login failures towards account lockout
                 // To enable password failures to trigger account lockout, set lockoutOnFailure: true
-                var result = await _signInManager.PasswordSignInAsync(model.Email, model.Password, model.RememberMe, lockoutOnFailure: false);
+                var result = await _signInManager.PasswordSignInAsync(model.UserName, model.Password, model.RememberMe, lockoutOnFailure: false);
                 if (result.Succeeded)
                 {
                     _logger.LogInformation(1, "User logged in.");
@@ -103,12 +103,12 @@ namespace ChatSample.Controllers
         [HttpPost]
         [AllowAnonymous]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = "/hubs")
+        public async Task<IActionResult> Register(RegisterViewModel model, string returnUrl = null)
         {
             ViewData["ReturnUrl"] = returnUrl;
             if (ModelState.IsValid)
             {
-                var user = new ApplicationUser { UserName = model.Email, Email = model.Email };
+                var user = new ApplicationUser { UserName = model.UserName, Email = model.Email };
                 var result = await _userManager.CreateAsync(user, model.Password);
                 if (result.Succeeded)
                 {
diff --git a/samples/ChatSample/Models/AccountViewModels/LoginViewModel.cs b/samples/ChatSample/Models/AccountViewModels/LoginViewModel.cs
index d1e5836ad3..7232615167 100644
--- a/samples/ChatSample/Models/AccountViewModels/LoginViewModel.cs
+++ b/samples/ChatSample/Models/AccountViewModels/LoginViewModel.cs
@@ -12,8 +12,7 @@ namespace ChatSample.Models.AccountViewModels
     public class LoginViewModel
     {
         [Required]
-        [EmailAddress]
-        public string Email { get; set; }
+        public string UserName { get; set; }
 
         [Required]
         [DataType(DataType.Password)]
diff --git a/samples/ChatSample/Models/AccountViewModels/RegisterViewModel.cs b/samples/ChatSample/Models/AccountViewModels/RegisterViewModel.cs
index c82134fbf5..acf6b780ac 100644
--- a/samples/ChatSample/Models/AccountViewModels/RegisterViewModel.cs
+++ b/samples/ChatSample/Models/AccountViewModels/RegisterViewModel.cs
@@ -11,6 +11,10 @@ namespace ChatSample.Models.AccountViewModels
 {
     public class RegisterViewModel
     {
+        [Required]
+        [Display(Name = "UserName")]
+        public string UserName { get; set; }
+
         [Required]
         [EmailAddress]
         [Display(Name = "Email")]
diff --git a/samples/ChatSample/Views/Account/Login.cshtml b/samples/ChatSample/Views/Account/Login.cshtml
index d80381934f..cc4e1f300f 100644
--- a/samples/ChatSample/Views/Account/Login.cshtml
+++ b/samples/ChatSample/Views/Account/Login.cshtml
@@ -17,10 +17,10 @@
                 <hr />
                 <div asp-validation-summary="All" class="text-danger"></div>
                 <div class="form-group">
-                    <label asp-for="Email" class="col-md-2 control-label"></label>
+                    <label asp-for="UserName" class="col-md-2 control-label"></label>
                     <div class="col-md-10">
-                        <input asp-for="Email" class="form-control" />
-                        <span asp-validation-for="Email" class="text-danger"></span>
+                        <input asp-for="UserName" class="form-control" />
+                        <span asp-validation-for="UserName" class="text-danger"></span>
                     </div>
                 </div>
                 <div class="form-group">
diff --git a/samples/ChatSample/Views/Account/Register.cshtml b/samples/ChatSample/Views/Account/Register.cshtml
index dad5ea2fb6..80af08d16d 100644
--- a/samples/ChatSample/Views/Account/Register.cshtml
+++ b/samples/ChatSample/Views/Account/Register.cshtml
@@ -9,6 +9,13 @@
     <h4>Create a new account.</h4>
     <hr />
     <div asp-validation-summary="All" class="text-danger"></div>
+    <div class="form-group">
+        <label asp-for="UserName" class="col-md-2 control-label"></label>
+        <div class="col-md-10">
+            <input asp-for="UserName" class="form-control" />
+            <span asp-validation-for="UserName" class="text-danger"></span>
+        </div>
+    </div>
     <div class="form-group">
         <label asp-for="Email" class="col-md-2 control-label"></label>
         <div class="col-md-10">