diff --git a/README.md b/README.md index 6ac0f05..d99e49f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # eShopOnWeb -Sample ASP.NET Core reference application, powered by Microsoft, demonstrating a monolithic application architecture and deployment model. This reference application is meant to support the [Architecting and Developing Modern Web Applications with ASP.NET Core and Azure eBook] +Sample ASP.NET Core reference application, powered by Microsoft, demonstrating a monolithic application architecture and deployment model. This reference application is meant to support the [Architecting and Developing Modern Web Applications with ASP.NET Core and Azure eBook](https://aka.ms/webappebook) -The **eShopOnWeb** is related to the eShopOnContainers sample application which, in that case, focuses on a microservices/containers based application architecture. However, **eShopOnWeb** is much simpler in regards its current functionality and focuses on traditional Web Application Development with a single monolithic deployment, no microservices/containers related. +The **eShopOnWeb** is related to the [eShopOnContainers](https://github.com/dotnet/eShopOnContainers) sample application which, in that case, focuses on a microservices/containers based application architecture. However, **eShopOnWeb** is much simpler in regards its current functionality and focuses on traditional Web Application Development with a single monolithic deployment, no microservices/containers related. > ### DISCLAIMER > **IMPORTANT:** The current state of this sample application is **ALPHA**, consider it a 0.1 foundational version. Therefore areas will change significantly while refactoring current code and implementing new features. **Feedback with improvements and pull requests from the community are highly appreciated and accepted.** diff --git a/src/Infrastructure/Identity/AppIdentityDbContext.cs b/src/Infrastructure/Identity/AppIdentityDbContext.cs new file mode 100644 index 0000000..22e6ed9 --- /dev/null +++ b/src/Infrastructure/Identity/AppIdentityDbContext.cs @@ -0,0 +1,27 @@ +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; + + +namespace Infrastructure.Identity +{ + public class AppIdentityDbContext : IdentityDbContext + { + public AppIdentityDbContext(DbContextOptions options) + : base(options) + { + } + + protected override void OnModelCreating(ModelBuilder builder) + { + base.OnModelCreating(builder); + // Customize the ASP.NET Identity model and override the defaults if needed. + // For example, you can rename the ASP.NET Identity table names and more. + // Add your customizations after calling base.OnModelCreating(builder); + } + } + + public class ApplicationUser : IdentityUser + { + } + +} diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj index 9eca547..b377567 100644 --- a/src/Infrastructure/Infrastructure.csproj +++ b/src/Infrastructure/Infrastructure.csproj @@ -3,5 +3,16 @@ netstandard1.4 + + + + + + + + + + + \ No newline at end of file diff --git a/src/Web/Controllers/AccountController.cs b/src/Web/Controllers/AccountController.cs new file mode 100644 index 0000000..7a9c891 --- /dev/null +++ b/src/Web/Controllers/AccountController.cs @@ -0,0 +1,98 @@ +using Microsoft.eShopWeb.Services; +using Microsoft.eShopWeb.ViewModels; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Options; +using Infrastructure.Identity; + +namespace Microsoft.eShopWeb.Controllers +{ + public class AccountController : Controller + { + private readonly UserManager _userManager; + private readonly SignInManager _signInManager; + private readonly string _externalCookieScheme; + + + public AccountController( + UserManager userManager, + SignInManager signInManager, + IOptions identityCookieOptions + +) + { + _userManager = userManager; + _signInManager = signInManager; + _externalCookieScheme = identityCookieOptions.Value.ExternalCookieAuthenticationScheme; + + } + + // + // GET: /Account/SignIn + [HttpGet] + [AllowAnonymous] + public async Task SignIn(string returnUrl = null) + { + // Clear the existing external cookie to ensure a clean login process + await HttpContext.Authentication.SignOutAsync(_externalCookieScheme); + + ViewData["ReturnUrl"] = returnUrl; + return View(); + } + + // + // POST: /Account/SignIn + [HttpPost] + [AllowAnonymous] + [ValidateAntiForgeryToken] + public async Task SignIn(LoginViewModel model, string returnUrl = null) + { + ViewData["ReturnUrl"] = returnUrl; + if (ModelState.IsValid) + { + // 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); + if (result.Succeeded) + { + //_logger.LogInformation(1, "User logged in."); + return RedirectToLocal(returnUrl); + } + //if (result.RequiresTwoFactor) + //{ + // return RedirectToAction(nameof(SendCode), new { ReturnUrl = returnUrl, RememberMe = model.RememberMe }); + //} + if (result.IsLockedOut) + { + //_logger.LogWarning(2, "User account locked out."); + return View("Lockout"); + } + else + { + ModelState.AddModelError(string.Empty, "Invalid login attempt."); + return View(model); + } + } + + // If we got this far, something failed, redisplay form + return View(model); + } + + private IActionResult RedirectToLocal(string returnUrl) + { + if (Url.IsLocalUrl(returnUrl)) + { + return Redirect(returnUrl); + } + else + { + return RedirectToAction(nameof(CatalogController.Index), "Home"); + } + } + + + } +} diff --git a/src/Web/Infrastructure/CatalogContext.cs b/src/Web/Infrastructure/CatalogContext.cs index e2439fd..576a9c2 100644 --- a/src/Web/Infrastructure/CatalogContext.cs +++ b/src/Web/Infrastructure/CatalogContext.cs @@ -6,7 +6,7 @@ namespace Microsoft.eShopWeb.Infrastructure public class CatalogContext : DbContext { - public CatalogContext(DbContextOptions options) : base(options) + public CatalogContext(DbContextOptions options) : base(options) { } public DbSet CatalogItems { get; set; } diff --git a/src/Web/Startup.cs b/src/Web/Startup.cs index 08c3149..24d7dd2 100644 --- a/src/Web/Startup.cs +++ b/src/Web/Startup.cs @@ -7,6 +7,8 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Infrastructure.Identity; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; namespace Microsoft.eShopWeb { @@ -33,7 +35,7 @@ namespace Microsoft.eShopWeb { try { - c.UseSqlServer(Configuration["ConnectionString"]); + c.UseSqlServer(Configuration.GetConnectionString("CatalogConnection")); c.ConfigureWarnings(wb => { //By default, in this application, we don't want to have client evaluations @@ -46,6 +48,15 @@ namespace Microsoft.eShopWeb } }); + // Add Identity DbContext + services.AddDbContext(options => + options.UseSqlServer(Configuration.GetConnectionString("IdentityConnection"))); + + services.AddIdentity() + .AddEntityFrameworkStores() + .AddDefaultTokenProviders(); + + services.AddTransient(); services.Configure(Configuration); services.AddMvc(); @@ -69,6 +80,8 @@ namespace Microsoft.eShopWeb app.UseStaticFiles(); + app.UseIdentity(); + app.UseMvc(routes => { routes.MapRoute( diff --git a/src/Web/ViewModels/LoginViewModel.cs b/src/Web/ViewModels/LoginViewModel.cs new file mode 100644 index 0000000..26e2f65 --- /dev/null +++ b/src/Web/ViewModels/LoginViewModel.cs @@ -0,0 +1,22 @@ +using Microsoft.eShopWeb.ApplicationCore.Entities; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; + +namespace Microsoft.eShopWeb.ViewModels +{ + + public class LoginViewModel + { + [Required] + [EmailAddress] + public string Email { get; set; } + + [Required] + [DataType(DataType.Password)] + public string Password { get; set; } + + [Display(Name = "Remember me?")] + public bool RememberMe { get; set; } + } + +} diff --git a/src/Web/Views/Account/Signin.cshtml b/src/Web/Views/Account/Signin.cshtml new file mode 100644 index 0000000..09f8aee --- /dev/null +++ b/src/Web/Views/Account/Signin.cshtml @@ -0,0 +1,62 @@ +@using System.Collections.Generic +@using Microsoft.AspNetCore.Http +@using Microsoft.AspNetCore.Http.Authentication +@model LoginViewModel +@{ + ViewData["Title"] = "Log in"; +} +
+ +
+ + + @section Scripts { + @{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); } + } diff --git a/src/Web/Views/Shared/_Layout.cshtml b/src/Web/Views/Shared/_Layout.cshtml index 7eb654a..cb6a1ad 100644 --- a/src/Web/Views/Shared/_Layout.cshtml +++ b/src/Web/Views/Shared/_Layout.cshtml @@ -29,7 +29,8 @@ - + @await Html.PartialAsync("_LoginPartial") + diff --git a/src/Web/Views/Shared/_LoginPartial.cshtml b/src/Web/Views/Shared/_LoginPartial.cshtml new file mode 100644 index 0000000..eae827a --- /dev/null +++ b/src/Web/Views/Shared/_LoginPartial.cshtml @@ -0,0 +1,57 @@ +@using Microsoft.AspNetCore.Identity +@*@inject IIdentityParser UserManager*@ + + @if (Context.User.Identity.IsAuthenticated) +{ +
+
+ +
+
+ +
+ @*@await Component.InvokeAsync("Cart", new { user = UserManager.Parse(User) })*@ +
+ +} +else +{ +
+
+
+
+ + + Login + +
+
+
+
+ +
+} diff --git a/src/Web/Views/_ViewImports.cshtml b/src/Web/Views/_ViewImports.cshtml index b4d7baf..f3e172c 100644 --- a/src/Web/Views/_ViewImports.cshtml +++ b/src/Web/Views/_ViewImports.cshtml @@ -1,2 +1,3 @@ @using Microsoft.eShopWeb +@using Microsoft.eShopWeb.ViewModels @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj index 564c309..22a20b3 100644 --- a/src/Web/Web.csproj +++ b/src/Web/Web.csproj @@ -30,11 +30,13 @@ + + diff --git a/src/Web/appsettings.json b/src/Web/appsettings.json index 6f5c42c..c3ebcd8 100644 --- a/src/Web/appsettings.json +++ b/src/Web/appsettings.json @@ -1,5 +1,8 @@ { - "ConnectionString": "Server=(localdb)\\ProjectsV13;Integrated Security=true;Initial Catalog=Microsoft.eShopOnContainers.Services.CatalogDb;", + "ConnectionStrings": { + "CatalogConnection": "Server=(localdb)\\ProjectsV13;Integrated Security=true;Initial Catalog=Microsoft.eShopOnWeb.CatalogDb;", + "IdentityConnection": "Server=(localdb)\\ProjectsV13;Integrated Security=true;Initial Catalog=Microsoft.eShopOnWeb.Identity;" + }, "CatalogBaseUrl": "http://localhost:5106", "Logging": { "IncludeScopes": false,