huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UserName and minor fixups for ChatSample

This commit is contained in:
BrennanConroy 2016-11-08 16:29:09 -08:00 committed by BrennanConroy
parent 48b869f026
commit cb0aa63a43
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/ChatSample/Controllers/AccountController.cs
View File

@ -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)
{

3
samples/ChatSample/Models/AccountViewModels/LoginViewModel.cs
View File

@ -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)]

4
samples/ChatSample/Models/AccountViewModels/RegisterViewModel.cs
View File

@ -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")]

6
samples/ChatSample/Views/Account/Login.cshtml
View File

@ -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">

7
samples/ChatSample/Views/Account/Register.cshtml
View File

@ -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">