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

Move Identity to an Area for 2.1

This commit is contained in:
Javier Calvarro Nelson 2017-10-11 18:03:59 -07:00
parent 38be05d442
commit a80061f42b
62 changed files with 644 additions and 592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/.template.config/template.json
View File

@ -38,26 +38,7 @@
{
"condition": "(!IndividualLocalAuth)",
"exclude": [
"Controllers/ManageController.cs",
"Views/Account/ConfirmEmail.cshtml",
"Views/Account/ExternalLogin.cshtml",
"Views/Account/ForgotPassword.cshtml",
"Views/Account/ForgotPasswordConfirmation.cshtml",
"Views/Account/Lockout.cshtml",
"Views/Account/Login.cshtml",
"Views/Account/LoginWith2fa.cshtml",
"Views/Account/LoginWithRecoveryCode.cshtml",
"Views/Account/Register.cshtml",
"Views/Account/ResetPassword.cshtml",
"Views/Account/ResetPasswordConfirmation.cshtml",
"Views/Manage/**",
"Services/**",
"Data/**",
"Models/AccountViewModels/**",
"Models/ManageViewModels/**",
"Models/ApplicationUser.cs",
"Extensions/EmailSenderExtensions.cs",
"Extensions/UrlHelperExtensions.cs"
"Areas/Identity/**"
]
},
{

465
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Controllers/AccountController.cs Normal file
View File

@ -0,0 +1,465 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Company.WebApplication1.Controllers;
using Company.WebApplication1.Identity.Models;
using Company.WebApplication1.Identity.Models.AccountViewModels;
using Company.WebApplication1.Identity.Services;
namespace Company.WebApplication1.Identity.Controllers
{
[Authorize]
[Area("Identity")]
[Route("tfp/[area]/[controller]/[action]")]
public class AccountController : Controller
{
private readonly UserManager<ApplicationUser> _userManager;
private readonly SignInManager<ApplicationUser> _signInManager;
private readonly IEmailSender _emailSender;
private readonly ILogger _logger;
public AccountController(
UserManager<ApplicationUser> userManager,
SignInManager<ApplicationUser> signInManager,
IEmailSender emailSender,
ILogger<AccountController> logger)
{
_userManager = userManager;
_signInManager = signInManager;
_emailSender = emailSender;
_logger = logger;
}
[TempData]
public string ErrorMessage { get; set; }
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> Login(string returnUrl = null)
{
// Clear the existing external cookie to ensure a clean login process
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
ViewData["ReturnUrl"] = returnUrl;
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Login(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("User logged in.");
return RedirectToLocal(returnUrl);
}
if (result.RequiresTwoFactor)
{
return RedirectToAction(nameof(LoginWith2fa), new { returnUrl, model.RememberMe });
}
if (result.IsLockedOut)
{
_logger.LogWarning("User account locked out.");
return RedirectToAction(nameof(Lockout));
}
else
{
ModelState.AddModelError(string.Empty, "Invalid login attempt.");
return View(model);
}
}
// If we got this far, something failed, redisplay form
return View(model);
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> LoginWith2fa(bool rememberMe, string returnUrl = null)
{
// Ensure the user has gone through the username & password screen first
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load two-factor authentication user.");
}
var model = new LoginWith2faViewModel { RememberMe = rememberMe };
ViewData["ReturnUrl"] = returnUrl;
return View(model);
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> LoginWith2fa(LoginWith2faViewModel model, bool rememberMe, string returnUrl = null)
{
if (!ModelState.IsValid)
{
return View(model);
}
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
}
var authenticatorCode = model.TwoFactorCode.Replace(" ", string.Empty).Replace("-", string.Empty);
var result = await _signInManager.TwoFactorAuthenticatorSignInAsync(authenticatorCode, rememberMe, model.RememberMachine);
if (result.Succeeded)
{
_logger.LogInformation("User with ID {UserId} logged in with 2fa.", user.Id);
return RedirectToLocal(returnUrl);
}
else if (result.IsLockedOut)
{
_logger.LogWarning("User with ID {UserId} account locked out.", user.Id);
return RedirectToAction(nameof(Lockout));
}
else
{
_logger.LogWarning("Invalid authenticator code entered for user with ID {UserId}.", user.Id);
ModelState.AddModelError(string.Empty, "Invalid authenticator code.");
return View();
}
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> LoginWithRecoveryCode(string returnUrl = null)
{
// Ensure the user has gone through the username & password screen first
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load two-factor authentication user.");
}
ViewData["ReturnUrl"] = returnUrl;
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> LoginWithRecoveryCode(LoginWithRecoveryCodeViewModel model, string returnUrl = null)
{
if (!ModelState.IsValid)
{
return View(model);
}
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load two-factor authentication user.");
}
var recoveryCode = model.RecoveryCode.Replace(" ", string.Empty);
var result = await _signInManager.TwoFactorRecoveryCodeSignInAsync(recoveryCode);
if (result.Succeeded)
{
_logger.LogInformation("User with ID {UserId} logged in with a recovery code.", user.Id);
return RedirectToLocal(returnUrl);
}
if (result.IsLockedOut)
{
_logger.LogWarning("User with ID {UserId} account locked out.", user.Id);
return RedirectToAction(nameof(Lockout));
}
else
{
_logger.LogWarning("Invalid recovery code entered for user with ID {UserId}", user.Id);
ModelState.AddModelError(string.Empty, "Invalid recovery code entered.");
return View();
}
}
[HttpGet]
[AllowAnonymous]
public IActionResult Lockout()
{
return View();
}
[HttpGet]
[AllowAnonymous]
public IActionResult Register(string returnUrl = null)
{
ViewData["ReturnUrl"] = returnUrl;
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
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 result = await _userManager.CreateAsync(user, model.Password);
if (result.Succeeded)
{
_logger.LogInformation("User created a new account with password.");
var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
await _emailSender.SendEmailConfirmationAsync(model.Email, callbackUrl);
await _signInManager.SignInAsync(user, isPersistent: false);
_logger.LogInformation("User created a new account with password.");
return RedirectToLocal(returnUrl);
}
AddErrors(result);
}
// If we got this far, something failed, redisplay form
return View(model);
}
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Logout()
{
await _signInManager.SignOutAsync();
_logger.LogInformation("User logged out.");
return RedirectToAction(nameof(HomeController.Index), "Home");
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public IActionResult ExternalLogin(string provider, string returnUrl = null)
{
// Request a redirect to the external login provider.
var redirectUrl = Url.Action(nameof(ExternalLoginCallback), "Account", new { returnUrl });
var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
return Challenge(properties, provider);
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> ExternalLoginCallback(string returnUrl = null, string remoteError = null)
{
if (remoteError != null)
{
ErrorMessage = $"Error from external provider: {remoteError}";
return RedirectToAction(nameof(Login));
}
var info = await _signInManager.GetExternalLoginInfoAsync();
if (info == null)
{
return RedirectToAction(nameof(Login));
}
// Sign in the user with this external login provider if the user already has a login.
var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false, bypassTwoFactor: true);
if (result.Succeeded)
{
_logger.LogInformation("User logged in with {Name} provider.", info.LoginProvider);
return RedirectToLocal(returnUrl);
}
if (result.IsLockedOut)
{
return RedirectToAction(nameof(Lockout));
}
else
{
// If the user does not have an account, then ask the user to create an account.
ViewData["ReturnUrl"] = returnUrl;
ViewData["LoginProvider"] = info.LoginProvider;
var email = info.Principal.FindFirstValue(ClaimTypes.Email);
return View("ExternalLogin", new ExternalLoginViewModel { Email = email });
}
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ExternalLoginConfirmation(ExternalLoginViewModel model, string returnUrl = null)
{
if (ModelState.IsValid)
{
// Get the information about the user from the external login provider
var info = await _signInManager.GetExternalLoginInfoAsync();
if (info == null)
{
throw new ApplicationException("Error loading external login information during confirmation.");
}
var user = new ApplicationUser { UserName = model.Email, Email = model.Email };
var result = await _userManager.CreateAsync(user);
if (result.Succeeded)
{
result = await _userManager.AddLoginAsync(user, info);
if (result.Succeeded)
{
await _signInManager.SignInAsync(user, isPersistent: false);
_logger.LogInformation("User created an account using {Name} provider.", info.LoginProvider);
return RedirectToLocal(returnUrl);
}
}
AddErrors(result);
}
ViewData["ReturnUrl"] = returnUrl;
return View(nameof(ExternalLogin), model);
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> ConfirmEmail(string userId, string code)
{
if (userId == null || code == null)
{
return RedirectToAction(nameof(HomeController.Index), "Home");
}
var user = await _userManager.FindByIdAsync(userId);
if (user == null)
{
throw new ApplicationException($"Unable to load user with ID '{userId}'.");
}
var result = await _userManager.ConfirmEmailAsync(user, code);
return View(result.Succeeded ? "ConfirmEmail" : "Error");
}
[HttpGet]
[AllowAnonymous]
public IActionResult ForgotPassword()
{
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ForgotPassword(ForgotPasswordViewModel model)
{
if (ModelState.IsValid)
{
var user = await _userManager.FindByEmailAsync(model.Email);
if (user == null || !(await _userManager.IsEmailConfirmedAsync(user)))
{
// Don't reveal that the user does not exist or is not confirmed
return RedirectToAction(nameof(ForgotPasswordConfirmation));
}
// For more information on how to enable account confirmation and password reset please
// visit https://go.microsoft.com/fwlink/?LinkID=532713
var code = await _userManager.GeneratePasswordResetTokenAsync(user);
var callbackUrl = Url.ResetPasswordCallbackLink(user.Id, code, Request.Scheme);
await _emailSender.SendEmailAsync(model.Email, "Reset Password",
$"Please reset your password by clicking here: <a href='{callbackUrl}'>link</a>");
return RedirectToAction(nameof(ForgotPasswordConfirmation));
}
// If we got this far, something failed, redisplay form
return View(model);
}
[HttpGet]
[AllowAnonymous]
public IActionResult ForgotPasswordConfirmation()
{
return View();
}
[HttpGet]
[AllowAnonymous]
public IActionResult ResetPassword(string code = null)
{
if (code == null)
{
throw new ApplicationException("A code must be supplied for password reset.");
}
var model = new ResetPasswordViewModel { Code = code };
return View(model);
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ResetPassword(ResetPasswordViewModel model)
{
if (!ModelState.IsValid)
{
return View(model);
}
var user = await _userManager.FindByEmailAsync(model.Email);
if (user == null)
{
// Don't reveal that the user does not exist
return RedirectToAction(nameof(ResetPasswordConfirmation));
}
var result = await _userManager.ResetPasswordAsync(user, model.Code, model.Password);
if (result.Succeeded)
{
return RedirectToAction(nameof(ResetPasswordConfirmation));
}
AddErrors(result);
return View();
}
[HttpGet]
[AllowAnonymous]
public IActionResult ResetPasswordConfirmation()
{
return View();
}
[HttpGet]
public IActionResult AccessDenied()
{
return View();
}
#region Helpers
private void AddErrors(IdentityResult result)
{
foreach (var error in result.Errors)
{
ModelState.AddModelError(string.Empty, error.Description);
}
}
private IActionResult RedirectToLocal(string returnUrl)
{
if (Url.IsLocalUrl(returnUrl))
{
return Redirect(returnUrl);
}
else
{
return RedirectToAction(nameof(HomeController.Index), "Home");
}
}
#endregion
}
}

11
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Controllers/ManageController.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Controllers/ManageController.cs
View File

@ -10,14 +10,15 @@ using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Company.WebApplication1.Models;
using Company.WebApplication1.Models.ManageViewModels;
using Company.WebApplication1.Services;
using Company.WebApplication1.Identity.Models;
using Company.WebApplication1.Identity.Models.ManageViewModels;
using Company.WebApplication1.Identity.Services;
namespace Company.WebApplication1.Controllers
namespace Company.WebApplication1.Identity.Controllers
{
[Authorize]
[Route("[controller]/[action]")]
[Area("Identity")]
[Route("tfp/[area]/[controller]/[action]")]
public class ManageController : Controller
{
private readonly UserManager<ApplicationUser> _userManager;

4
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Data/ApplicationDbContext.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Data/ApplicationDbContext.cs
View File

@ -4,9 +4,9 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Company.WebApplication1.Models;
using Company.WebApplication1.Identity.Models;
namespace Company.WebApplication1.Data
namespace Company.WebApplication1.Identity.Data
{
public class ApplicationDbContext : IdentityDbContext<ApplicationUser>
{

163
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs generated
View File

@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Company.WebApplication1.Data.Migrations
namespace Company.WebApplication1.Identity.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("00000000000000_CreateIdentitySchema")]
@ -17,17 +17,85 @@ namespace Company.WebApplication1.Data.Migrations
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
#if (UseLocalDB)
.HasAnnotation("ProductVersion", "1.0.0-rc3")
.HasAnnotation("ProductVersion", "2.0.0-rtm-26452")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
#else
.HasAnnotation("ProductVersion", "1.0.2");
.HasAnnotation("ProductVersion", "2.0.0-rtm-26452");
#endif
modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b =>
{
b.Property<string>("Id")
.ValueGeneratedOnAdd();
b.Property<int>("AccessFailedCount");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken();
b.Property<string>("Email")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.Property<bool>("EmailConfirmed");
b.Property<bool>("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd");
b.Property<string>("NormalizedEmail")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.Property<string>("NormalizedUserName")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.Property<string>("PasswordHash");
b.Property<string>("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed");
b.Property<string>("SecurityStamp");
b.Property<bool>("TwoFactorEnabled");
b.Property<string>("UserName")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasName("UserNameIndex");
b.ToTable("AspNetUsers");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id");
b.Property<string>("Id")
.ValueGeneratedOnAdd();
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken();
@ -49,6 +117,7 @@ namespace Company.WebApplication1.Data.Migrations
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasName("RoleNameIndex");
b.ToTable("AspNetRoles");
@ -120,8 +189,6 @@ namespace Company.WebApplication1.Data.Migrations
b.HasIndex("RoleId");
b.HasIndex("UserId");
b.ToTable("AspNetUserRoles");
});
@ -140,75 +207,10 @@ namespace Company.WebApplication1.Data.Migrations
b.ToTable("AspNetUserTokens");
});
modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b =>
{
b.Property<string>("Id");
b.Property<int>("AccessFailedCount");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken();
b.Property<string>("Email")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.Property<bool>("EmailConfirmed");
b.Property<bool>("LockoutEnabled");
b.Property<DateTimeOffset?>("LockoutEnd");
b.Property<string>("NormalizedEmail")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.Property<string>("NormalizedUserName")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.Property<string>("PasswordHash");
b.Property<string>("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed");
b.Property<string>("SecurityStamp");
b.Property<bool>("TwoFactorEnabled");
b.Property<string>("UserName")
#if (UseLocalDB)
.HasAnnotation("MaxLength", 256);
#else
.HasMaxLength(256);
#endif
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasName("UserNameIndex");
b.ToTable("AspNetUsers");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
.WithMany("Claims")
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade);
});
@ -216,7 +218,7 @@ namespace Company.WebApplication1.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("Company.WebApplication1.Models.ApplicationUser")
.WithMany("Claims")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
});
@ -224,7 +226,7 @@ namespace Company.WebApplication1.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("Company.WebApplication1.Models.ApplicationUser")
.WithMany("Logins")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
});
@ -232,15 +234,24 @@ namespace Company.WebApplication1.Data.Migrations
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole")
.WithMany("Users")
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade);
b.HasOne("Company.WebApplication1.Models.ApplicationUser")
.WithMany("Roles")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("Company.WebApplication1.Models.ApplicationUser")
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade);
});
#pragma warning restore 612, 618
}
}
}

16
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Data/Migrations/00000000000000_CreateIdentitySchema.cs
View File

@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Metadata;
#endif
using Microsoft.EntityFrameworkCore.Migrations;
namespace Company.WebApplication1.Data.Migrations
namespace Company.WebApplication1.Identity.Data.Migrations
{
public partial class CreateIdentitySchema : Migration
{
@ -39,6 +39,12 @@ namespace Company.WebApplication1.Data.Migrations
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
table.ForeignKey(
name: "FK_AspNetUserTokens_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
@ -163,7 +169,8 @@ namespace Company.WebApplication1.Data.Migrations
migrationBuilder.CreateIndex(
name: "RoleNameIndex",
table: "AspNetRoles",
column: "NormalizedName");
column: "NormalizedName",
unique: true);
migrationBuilder.CreateIndex(
name: "IX_AspNetRoleClaims_RoleId",
@ -185,11 +192,6 @@ namespace Company.WebApplication1.Data.Migrations
table: "AspNetUserRoles",
column: "RoleId");
migrationBuilder.CreateIndex(
name: "IX_AspNetUserRoles_UserId",
table: "AspNetUserRoles",
column: "UserId");
migrationBuilder.CreateIndex(
name: "EmailIndex",
table: "AspNetUsers",

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Data/Migrations/ApplicationDbContextModelSnapshot.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Data/Migrations/ApplicationDbContextModelSnapshot.cs
View File

@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Company.WebApplication1.Data.Migrations
namespace Company.WebApplication1.Identity.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
partial class ApplicationDbContextModelSnapshot : ModelSnapshot

4
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Extensions/EmailSenderExtensions.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Extensions/EmailSenderExtensions.cs
View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using Company.WebApplication1.Services;
using Company.WebApplication1.Identity.Services;
namespace Company.WebApplication1.Services
namespace Company.WebApplication1.Identity.Services
{
public static class EmailSenderExtensions
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Extensions/UrlHelperExtensions.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Extensions/UrlHelperExtensions.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Company.WebApplication1.Controllers;
using Company.WebApplication1.Identity.Controllers;
namespace Microsoft.AspNetCore.Mvc
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/AccountViewModels/ExternalLoginViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/AccountViewModels/ExternalLoginViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.AccountViewModels
namespace Company.WebApplication1.Identity.Models.AccountViewModels
{
public class ExternalLoginViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/AccountViewModels/ForgotPasswordViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/AccountViewModels/ForgotPasswordViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.AccountViewModels
namespace Company.WebApplication1.Identity.Models.AccountViewModels
{
public class ForgotPasswordViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/AccountViewModels/LoginViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/AccountViewModels/LoginViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.AccountViewModels
namespace Company.WebApplication1.Identity.Models.AccountViewModels
{
public class LoginViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/AccountViewModels/LoginWith2faViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/AccountViewModels/LoginWith2faViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.AccountViewModels
namespace Company.WebApplication1.Identity.Models.AccountViewModels
{
public class LoginWith2faViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/AccountViewModels/LoginWithRecoveryCodeViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/AccountViewModels/LoginWithRecoveryCodeViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.AccountViewModels
namespace Company.WebApplication1.Identity.Models.AccountViewModels
{
public class LoginWithRecoveryCodeViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/AccountViewModels/RegisterViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/AccountViewModels/RegisterViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.AccountViewModels
namespace Company.WebApplication1.Identity.Models.AccountViewModels
{
public class RegisterViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/AccountViewModels/ResetPasswordViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/AccountViewModels/ResetPasswordViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.AccountViewModels
namespace Company.WebApplication1.Identity.Models.AccountViewModels
{
public class ResetPasswordViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ApplicationUser.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ApplicationUser.cs
View File

@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity;
namespace Company.WebApplication1.Models
namespace Company.WebApplication1.Identity.Models
{
// Add profile data for application users by adding properties to the ApplicationUser class
public class ApplicationUser : IdentityUser

11
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ErrorViewModel.cs Normal file
View File

@ -0,0 +1,11 @@
using System;
namespace Company.WebApplication1.Identity.Models
{
public class ErrorViewModel
{
public string RequestId { get; set; }
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
}
}

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/ChangePasswordViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/ChangePasswordViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class ChangePasswordViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/EnableAuthenticatorViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/EnableAuthenticatorViewModel.cs
View File

@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class EnableAuthenticatorViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/ExternalLoginsViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/ExternalLoginsViewModel.cs
View File

@ -5,7 +5,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Identity;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class ExternalLoginsViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/GenerateRecoveryCodesViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/GenerateRecoveryCodesViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class GenerateRecoveryCodesViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/IndexViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/IndexViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class IndexViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/RemoveLoginViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/RemoveLoginViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class RemoveLoginViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/SetPasswordViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/SetPasswordViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class SetPasswordViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Models/ManageViewModels/TwoFactorAuthenticationViewModel.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Models/ManageViewModels/TwoFactorAuthenticationViewModel.cs
View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Models.ManageViewModels
namespace Company.WebApplication1.Identity.Models.ManageViewModels
{
public class TwoFactorAuthenticationViewModel
{

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Services/EmailSender.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Services/EmailSender.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Services
namespace Company.WebApplication1.Identity.Services
{
// This class is used by the application to send email for account confirmation and password reset.
// For more details see https://go.microsoft.com/fwlink/?LinkID=532713

2
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Services/IEmailSender.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Services/IEmailSender.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Company.WebApplication1.Services
namespace Company.WebApplication1.Identity.Services
{
public interface IEmailSender
{

8
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/AccessDenied.cshtml Normal file
View File

@ -0,0 +1,8 @@
@{
ViewData["Title"] = "Access denied";
}
<header>
<h2 class="text-danger">ViewData["Title"]</h2>
<p class="text-danger">You do not have access to this resource.</p>
</header>

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/ConfirmEmail.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/ConfirmEmail.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/ExternalLogin.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/ExternalLogin.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/ForgotPassword.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/ForgotPassword.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/ForgotPasswordConfirmation.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/ForgotPasswordConfirmation.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/Lockout.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/Lockout.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/Login.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/Login.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/LoginWith2fa.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/LoginWith2fa.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/LoginWithRecoveryCode.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/LoginWithRecoveryCode.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/Register.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/Register.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/ResetPassword.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/ResetPassword.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Account/ResetPasswordConfirmation.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/ResetPasswordConfirmation.cshtml
View File

8
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Account/SignedOut.cshtml Normal file
View File

@ -0,0 +1,8 @@
@{
ViewData["Title"] = "Signed out";
}
<h2>@ViewData["Title"]</h2>
<p>
You have successfully signed out.
</p>

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/ChangePassword.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/ChangePassword.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/Disable2fa.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/Disable2fa.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/EnableAuthenticator.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/EnableAuthenticator.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/ExternalLogins.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/ExternalLogins.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/GenerateRecoveryCodes.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/GenerateRecoveryCodes.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/Index.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/Index.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/ManageNavPages.cs → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/ManageNavPages.cs
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/ResetAuthenticator.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/ResetAuthenticator.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/SetPassword.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/SetPassword.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/TwoFactorAuthentication.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/TwoFactorAuthentication.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/_Layout.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/_Layout.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/_ManageNav.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/_ManageNav.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/_StatusMessage.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/_StatusMessage.cshtml
View File

0
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Manage/_ViewImports.cshtml → src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/Manage/_ViewImports.cshtml
View File

6
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/_ViewImports.cshtml Normal file
View File

@ -0,0 +1,6 @@
@using Microsoft.AspNetCore.Identity
@using Company.WebApplication1.Identity
@using Company.WebApplication1.Identity.Models
@using Company.WebApplication1.Identity.Models.AccountViewModels
@using Company.WebApplication1.Identity.Models.ManageViewModels
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

3
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Areas/Identity/Views/_ViewStart.cshtml Normal file
View File

@ -0,0 +1,3 @@
@{
Layout = "_Layout";
}

443
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Controllers/AccountController.cs
View File

@ -15,9 +15,6 @@ using Microsoft.AspNetCore.Authentication.OpenIdConnect;
#if (IndividualAuth)
using Microsoft.AspNetCore.Authorization;
#endif
#if (IndividualLocalAuth)
using Microsoft.AspNetCore.Identity;
#endif
using Microsoft.AspNetCore.Mvc;
#if (IndividualAuth)
using Microsoft.AspNetCore.Mvc.Rendering;
@ -26,8 +23,6 @@ using Microsoft.Extensions.Options;
#endif
#if (IndividualLocalAuth)
using Company.WebApplication1.Models;
using Company.WebApplication1.Models.AccountViewModels;
using Company.WebApplication1.Services;
#endif
namespace Company.WebApplication1.Controllers
@ -70,418 +65,6 @@ namespace Company.WebApplication1.Controllers
return View();
}
#endif
#if (IndividualLocalAuth)
private readonly UserManager<ApplicationUser> _userManager;
private readonly SignInManager<ApplicationUser> _signInManager;
private readonly IEmailSender _emailSender;
private readonly ILogger _logger;
public AccountController(
UserManager<ApplicationUser> userManager,
SignInManager<ApplicationUser> signInManager,
IEmailSender emailSender,
ILogger<AccountController> logger)
{
_userManager = userManager;
_signInManager = signInManager;
_emailSender = emailSender;
_logger = logger;
}
[TempData]
public string ErrorMessage { get; set; }
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> Login(string returnUrl = null)
{
// Clear the existing external cookie to ensure a clean login process
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
ViewData["ReturnUrl"] = returnUrl;
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Login(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("User logged in.");
return RedirectToLocal(returnUrl);
}
if (result.RequiresTwoFactor)
{
return RedirectToAction(nameof(LoginWith2fa), new { returnUrl, model.RememberMe });
}
if (result.IsLockedOut)
{
_logger.LogWarning("User account locked out.");
return RedirectToAction(nameof(Lockout));
}
else
{
ModelState.AddModelError(string.Empty, "Invalid login attempt.");
return View(model);
}
}
// If we got this far, something failed, redisplay form
return View(model);
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> LoginWith2fa(bool rememberMe, string returnUrl = null)
{
// Ensure the user has gone through the username & password screen first
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load two-factor authentication user.");
}
var model = new LoginWith2faViewModel { RememberMe = rememberMe };
ViewData["ReturnUrl"] = returnUrl;
return View(model);
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> LoginWith2fa(LoginWith2faViewModel model, bool rememberMe, string returnUrl = null)
{
if (!ModelState.IsValid)
{
return View(model);
}
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
}
var authenticatorCode = model.TwoFactorCode.Replace(" ", string.Empty).Replace("-", string.Empty);
var result = await _signInManager.TwoFactorAuthenticatorSignInAsync(authenticatorCode, rememberMe, model.RememberMachine);
if (result.Succeeded)
{
_logger.LogInformation("User with ID {UserId} logged in with 2fa.", user.Id);
return RedirectToLocal(returnUrl);
}
else if (result.IsLockedOut)
{
_logger.LogWarning("User with ID {UserId} account locked out.", user.Id);
return RedirectToAction(nameof(Lockout));
}
else
{
_logger.LogWarning("Invalid authenticator code entered for user with ID {UserId}.", user.Id);
ModelState.AddModelError(string.Empty, "Invalid authenticator code.");
return View();
}
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> LoginWithRecoveryCode(string returnUrl = null)
{
// Ensure the user has gone through the username & password screen first
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load two-factor authentication user.");
}
ViewData["ReturnUrl"] = returnUrl;
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> LoginWithRecoveryCode(LoginWithRecoveryCodeViewModel model, string returnUrl = null)
{
if (!ModelState.IsValid)
{
return View(model);
}
var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if (user == null)
{
throw new ApplicationException($"Unable to load two-factor authentication user.");
}
var recoveryCode = model.RecoveryCode.Replace(" ", string.Empty);
var result = await _signInManager.TwoFactorRecoveryCodeSignInAsync(recoveryCode);
if (result.Succeeded)
{
_logger.LogInformation("User with ID {UserId} logged in with a recovery code.", user.Id);
return RedirectToLocal(returnUrl);
}
if (result.IsLockedOut)
{
_logger.LogWarning("User with ID {UserId} account locked out.", user.Id);
return RedirectToAction(nameof(Lockout));
}
else
{
_logger.LogWarning("Invalid recovery code entered for user with ID {UserId}", user.Id);
ModelState.AddModelError(string.Empty, "Invalid recovery code entered.");
return View();
}
}
[HttpGet]
[AllowAnonymous]
public IActionResult Lockout()
{
return View();
}
[HttpGet]
[AllowAnonymous]
public IActionResult Register(string returnUrl = null)
{
ViewData["ReturnUrl"] = returnUrl;
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
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 result = await _userManager.CreateAsync(user, model.Password);
if (result.Succeeded)
{
_logger.LogInformation("User created a new account with password.");
var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
await _emailSender.SendEmailConfirmationAsync(model.Email, callbackUrl);
await _signInManager.SignInAsync(user, isPersistent: false);
_logger.LogInformation("User created a new account with password.");
return RedirectToLocal(returnUrl);
}
AddErrors(result);
}
// If we got this far, something failed, redisplay form
return View(model);
}
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Logout()
{
await _signInManager.SignOutAsync();
_logger.LogInformation("User logged out.");
return RedirectToAction(nameof(HomeController.Index), "Home");
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public IActionResult ExternalLogin(string provider, string returnUrl = null)
{
// Request a redirect to the external login provider.
var redirectUrl = Url.Action(nameof(ExternalLoginCallback), "Account", new { returnUrl });
var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
return Challenge(properties, provider);
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> ExternalLoginCallback(string returnUrl = null, string remoteError = null)
{
if (remoteError != null)
{
ErrorMessage = $"Error from external provider: {remoteError}";
return RedirectToAction(nameof(Login));
}
var info = await _signInManager.GetExternalLoginInfoAsync();
if (info == null)
{
return RedirectToAction(nameof(Login));
}
// Sign in the user with this external login provider if the user already has a login.
var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false, bypassTwoFactor: true);
if (result.Succeeded)
{
_logger.LogInformation("User logged in with {Name} provider.", info.LoginProvider);
return RedirectToLocal(returnUrl);
}
if (result.IsLockedOut)
{
return RedirectToAction(nameof(Lockout));
}
else
{
// If the user does not have an account, then ask the user to create an account.
ViewData["ReturnUrl"] = returnUrl;
ViewData["LoginProvider"] = info.LoginProvider;
var email = info.Principal.FindFirstValue(ClaimTypes.Email);
return View("ExternalLogin", new ExternalLoginViewModel { Email = email });
}
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ExternalLoginConfirmation(ExternalLoginViewModel model, string returnUrl = null)
{
if (ModelState.IsValid)
{
// Get the information about the user from the external login provider
var info = await _signInManager.GetExternalLoginInfoAsync();
if (info == null)
{
throw new ApplicationException("Error loading external login information during confirmation.");
}
var user = new ApplicationUser { UserName = model.Email, Email = model.Email };
var result = await _userManager.CreateAsync(user);
if (result.Succeeded)
{
result = await _userManager.AddLoginAsync(user, info);
if (result.Succeeded)
{
await _signInManager.SignInAsync(user, isPersistent: false);
_logger.LogInformation("User created an account using {Name} provider.", info.LoginProvider);
return RedirectToLocal(returnUrl);
}
}
AddErrors(result);
}
ViewData["ReturnUrl"] = returnUrl;
return View(nameof(ExternalLogin), model);
}
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> ConfirmEmail(string userId, string code)
{
if (userId == null || code == null)
{
return RedirectToAction(nameof(HomeController.Index), "Home");
}
var user = await _userManager.FindByIdAsync(userId);
if (user == null)
{
throw new ApplicationException($"Unable to load user with ID '{userId}'.");
}
var result = await _userManager.ConfirmEmailAsync(user, code);
return View(result.Succeeded ? "ConfirmEmail" : "Error");
}
[HttpGet]
[AllowAnonymous]
public IActionResult ForgotPassword()
{
return View();
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ForgotPassword(ForgotPasswordViewModel model)
{
if (ModelState.IsValid)
{
var user = await _userManager.FindByEmailAsync(model.Email);
if (user == null || !(await _userManager.IsEmailConfirmedAsync(user)))
{
// Don't reveal that the user does not exist or is not confirmed
return RedirectToAction(nameof(ForgotPasswordConfirmation));
}
// For more information on how to enable account confirmation and password reset please
// visit https://go.microsoft.com/fwlink/?LinkID=532713
var code = await _userManager.GeneratePasswordResetTokenAsync(user);
var callbackUrl = Url.ResetPasswordCallbackLink(user.Id, code, Request.Scheme);
await _emailSender.SendEmailAsync(model.Email, "Reset Password",
$"Please reset your password by clicking here: <a href='{callbackUrl}'>link</a>");
return RedirectToAction(nameof(ForgotPasswordConfirmation));
}
// If we got this far, something failed, redisplay form
return View(model);
}
[HttpGet]
[AllowAnonymous]
public IActionResult ForgotPasswordConfirmation()
{
return View();
}
[HttpGet]
[AllowAnonymous]
public IActionResult ResetPassword(string code = null)
{
if (code == null)
{
throw new ApplicationException("A code must be supplied for password reset.");
}
var model = new ResetPasswordViewModel { Code = code };
return View(model);
}
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ResetPassword(ResetPasswordViewModel model)
{
if (!ModelState.IsValid)
{
return View(model);
}
var user = await _userManager.FindByEmailAsync(model.Email);
if (user == null)
{
// Don't reveal that the user does not exist
return RedirectToAction(nameof(ResetPasswordConfirmation));
}
var result = await _userManager.ResetPasswordAsync(user, model.Code, model.Password);
if (result.Succeeded)
{
return RedirectToAction(nameof(ResetPasswordConfirmation));
}
AddErrors(result);
return View();
}
[HttpGet]
[AllowAnonymous]
public IActionResult ResetPasswordConfirmation()
{
return View();
}
#endif
#if (IndividualB2CAuth)
private readonly AzureAdB2COptions _options;
@ -543,31 +126,5 @@ namespace Company.WebApplication1.Controllers
{
return View();
}
#if (IndividualLocalAuth)
#region Helpers
private void AddErrors(IdentityResult result)
{
foreach (var error in result.Errors)
{
ModelState.AddModelError(string.Empty, error.Description);
}
}
private IActionResult RedirectToLocal(string returnUrl)
{
if (Url.IsLocalUrl(returnUrl))
{
return Redirect(returnUrl);
}
else
{
return RedirectToAction(nameof(HomeController.Index), "Home");
}
}
#endregion
#endif
}
}

12
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Startup.cs
View File

@ -22,9 +22,9 @@ using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using Microsoft.IdentityModel.Tokens;
#endif
#if (IndividualLocalAuth)
using Company.WebApplication1.Data;
using Company.WebApplication1.Models;
using Company.WebApplication1.Services;
using Company.WebApplication1.Identity.Data;
using Company.WebApplication1.Identity.Models;
using Company.WebApplication1.Identity.Services;
#endif
namespace Company.WebApplication1
@ -53,6 +53,12 @@ namespace Company.WebApplication1
.AddEntityFrameworkStores<ApplicationDbContext>()
.AddDefaultTokenProviders();
services.ConfigureApplicationCookie(options => {
options.LoginPath = "/tfp/Identity/Account/Login";
options.LogoutPath = "/tfp/Identity/Account/Logout";
options.AccessDeniedPath = "/tfp/Identity/Account/AccessDenied";
});
// Add application services.
services.AddTransient<IEmailSender, EmailSender>();

10
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/Shared/_LoginPartial.cshtml
View File

@ -9,7 +9,7 @@
#endif *@
@*#if (IndividualLocalAuth) *@
@using Microsoft.AspNetCore.Identity
@using Company.WebApplication1.Models
@using Company.WebApplication1.Identity.Models
@*#else
@using System.Security.Principal
#endif *@
@ -26,10 +26,10 @@
#endif *@
{
@*#if (IndividualLocalAuth) *@
<form asp-area="" asp-controller="Account" asp-action="Logout" method="post" id="logoutForm" class="navbar-right">
<form asp-area="Identity" asp-controller="Account" asp-action="Logout" method="post" id="logoutForm" class="navbar-right">
<ul class="nav navbar-nav navbar-right">
<li>
<a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
<a asp-area="Identity" asp-controller="Manage" asp-action="Index" title="Manage">Hello @UserManager.GetUserName(User)!</a>
</li>
<li>
<button type="submit" class="btn btn-link navbar-btn navbar-link">Log out</button>
@ -59,8 +59,8 @@ else
{
<ul class="nav navbar-nav navbar-right">
@*#if (IndividualLocalAuth) *@
<li><a asp-area="" asp-controller="Account" asp-action="Register">Register</a></li>
<li><a asp-area="" asp-controller="Account" asp-action="Login">Log in</a></li>
<li><a asp-area="Identity" asp-controller="Account" asp-action="Register">Register</a></li>
<li><a asp-area="Identity" asp-controller="Account" asp-action="Login">Log in</a></li>
@*#else
<li><a asp-area="" asp-controller="Account" asp-action="Signin">Sign in</a></li>
#endif *@

9
src/Microsoft.DotNet.Web.ProjectTemplates.2.1/content/StarterWeb-CSharp/Views/_ViewImports.cshtml
View File

@ -1,10 +1,3 @@
@*#if (IndividualLocalAuth)
@using Microsoft.AspNetCore.Identity
#endif*@
@using Company.WebApplication1
@using Company.WebApplication1
@using Company.WebApplication1.Models
@*#if (IndividualLocalAuth)
@using Company.WebApplication1.Models.AccountViewModels
@using Company.WebApplication1.Models.ManageViewModels
#endif*@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

2
test/Templates.Test/MvcTemplateTest.cs
View File

@ -49,7 +49,7 @@ namespace Templates.Test
{
RunDotNetNew("mvc", targetFrameworkOverride, auth: "Individual");
AssertDirectoryExists("Extensions", true);
AssertDirectoryExists("Extensions", false);
AssertFileExists("urlRewrite.config", false);
AssertFileExists("Controllers/AccountController.cs", true);