Merge pull request #222 from SychevIgor/IdentityInMVCFix
Identity in mvc fix
This commit is contained in:
commit
4876dd562d
@ -1,8 +1,6 @@
|
||||
using System.Security.Claims;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.eShopOnContainers.WebMVC.ViewModels;
|
||||
using Microsoft.eShopOnContainers.WebMVC.Services;
|
||||
using Microsoft.AspNetCore.Http.Authentication;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Authentication;
|
||||
@ -11,13 +9,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
|
||||
{
|
||||
[Authorize]
|
||||
public class AccountController : Controller
|
||||
{
|
||||
private readonly IIdentityParser<ApplicationUser> _identityParser;
|
||||
public AccountController(IIdentityParser<ApplicationUser> identityParser) =>
|
||||
_identityParser = identityParser;
|
||||
|
||||
public ActionResult Index() => View();
|
||||
|
||||
{
|
||||
[Authorize]
|
||||
public async Task<IActionResult> SignIn(string returnUrl)
|
||||
{
|
||||
|
@ -1,64 +0,0 @@
|
||||
@using System.Collections.Generic
|
||||
@using Microsoft.AspNetCore.Http
|
||||
@using Microsoft.AspNetCore.Http.Authentication
|
||||
@model LoginViewModel
|
||||
@inject SignInManager<ApplicationUser> SignInManager
|
||||
|
||||
@{
|
||||
ViewData["Title"] = "Log in";
|
||||
}
|
||||
<div class="brand-header-block">
|
||||
<ul class="container">
|
||||
<li><a asp-area="" asp-controller="Account" asp-action="Register">REGISTER</a></li>
|
||||
<li class="active" style="margin-right: 65px;">LOGIN</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="container account-login-container">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<section>
|
||||
<form asp-controller="Account" asp-action="Login" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
|
||||
<h4>ARE YOU REGISTERED?</h4>
|
||||
<div asp-validation-summary="All" class="text-danger"></div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Email" class="control-label form-label"></label>
|
||||
<input asp-for="Email" class="form-control form-input form-input-center" />
|
||||
<span asp-validation-for="Email" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="Password" class="control-label form-label"></label>
|
||||
<input asp-for="Password" class="form-control form-input form-input-center" />
|
||||
<span asp-validation-for="Password" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="checkbox">
|
||||
<label asp-for="RememberMe">
|
||||
<input asp-for="RememberMe" />
|
||||
@Html.DisplayNameFor(m => m.RememberMe)
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button type="submit" class="btn btn-default btn-brand btn-brand-big"> LOG IN </button>
|
||||
</div>
|
||||
<p>
|
||||
<a asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" class="text">Register as a new user?</a>
|
||||
</p>
|
||||
<p>
|
||||
Note that for demo purposes you don't need to register and can login with these credentials:
|
||||
</p>
|
||||
<p>
|
||||
User: <b>demouser@microsoft.com</b>
|
||||
</p>
|
||||
<p>
|
||||
Password: <b>Pass@word1</b>
|
||||
</p>
|
||||
</form>
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@section Scripts {
|
||||
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
|
||||
}
|
@ -1,106 +0,0 @@
|
||||
@model RegisterViewModel
|
||||
@{
|
||||
ViewData["Title"] = "Register";
|
||||
}
|
||||
<div class="brand-header-block">
|
||||
<ul class="container">
|
||||
<li class="active">REGISTER</li>
|
||||
<li style="margin-right: 65px;"><a asp-area="" asp-controller="Account" asp-action="Login">LOGIN</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="container register-container">
|
||||
<form asp-controller="Account" asp-action="Register" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
|
||||
<h4 class="order-create-section-title">CREATE NEW ACCOUNT</h4>
|
||||
<div asp-validation-summary="All" class="text-danger"></div>
|
||||
<div class="row">
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.Name" class="control-label form-label">NAME</label>
|
||||
<input asp-for="User.Name" class="form-control form-input" />
|
||||
<span asp-validation-for="User.Name" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.LastName" class="control-label form-label">LAST NAME</label>
|
||||
<input asp-for="User.LastName" class="form-control form-input" />
|
||||
<span asp-validation-for="User.LastName" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.Street" class="control-label form-label">ADDRESS</label>
|
||||
<input asp-for="User.Street" class="form-control form-input" />
|
||||
<span asp-validation-for="User.Street" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.City" class="control-label form-label"></label>
|
||||
<input asp-for="User.City" class="form-control form-input" />
|
||||
<span asp-validation-for="User.City" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.State" class="control-label form-label"></label>
|
||||
<input asp-for="User.State" class="form-control form-input" />
|
||||
<span asp-validation-for="User.State" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.Country" class="control-label form-label"></label>
|
||||
<input asp-for="User.Country" class="form-control form-input" />
|
||||
<span asp-validation-for="User.Country" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.ZipCode" class="control-label form-label">POSTCODE</label>
|
||||
<input asp-for="User.ZipCode" class="form-control form-input" />
|
||||
<span asp-validation-for="User.ZipCode" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.PhoneNumber" class="control-label form-label">PHONE NUMBER</label>
|
||||
<input asp-for="User.PhoneNumber" class="form-control form-input" />
|
||||
<span asp-validation-for="User.PhoneNumber" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.CardNumber" class="control-label form-label">Card Number</label>
|
||||
<input asp-for="User.CardNumber" class="form-control form-input" />
|
||||
<span asp-validation-for="User.CardNumber" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="User.CardHolderName" class="control-label form-label">Cardholder Name</label>
|
||||
<input asp-for="User.CardHolderName" class="form-control form-input" />
|
||||
<span asp-validation-for="User.CardHolderName" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label asp-for="User.Expiration" class="control-label form-label">Expiration Date</label>
|
||||
<input asp-for="User.Expiration" placeholder="MM/YY" class="form-control form-input form-input-small" />
|
||||
<span asp-validation-for="User.Expiration" class="text-danger" />
|
||||
</div>
|
||||
<div class="form-group col-sm-3">
|
||||
<label asp-for="User.SecurityNumber" class="control-label form-label">Security Code</label>
|
||||
<input asp-for="User.SecurityNumber" class="form-control form-input form-input-small" />
|
||||
<span asp-validation-for="User.SecurityNumber" class="text-danger" />
|
||||
</div>
|
||||
</div>
|
||||
<br /><br />
|
||||
<div class="row">
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="Email" class="control-label form-label"></label>
|
||||
<input asp-for="Email" class="form-control form-input" />
|
||||
<span asp-validation-for="Email" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group col-sm-offset-6"></div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="Password" class="control-label form-label"></label>
|
||||
<input asp-for="Password" class="form-control form-input" />
|
||||
<span asp-validation-for="Password" class="text-danger"></span>
|
||||
</div>
|
||||
<div class="form-group col-sm-6">
|
||||
<label asp-for="ConfirmPassword" class="control-label form-label"></label>
|
||||
<input asp-for="ConfirmPassword" class="form-control form-input" />
|
||||
<span asp-validation-for="ConfirmPassword" class="text-danger"></span>
|
||||
</div>
|
||||
</div>
|
||||
<br /><br />
|
||||
<div class="form-group">
|
||||
<button type="submit" class="btn btn-default btn-brand"> Register </button>
|
||||
</div>
|
||||
<br /><br />
|
||||
</form>
|
||||
</div>
|
||||
@section Scripts {
|
||||
@{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user