Some of the identity classes changed name. Fixing the same in Music store to fix a build break.
This commit is contained in:
parent
aaae435cc3
commit
1b62b248e4
|
|
@ -46,7 +46,7 @@ namespace MusicStore.Controllers
|
||||||
{
|
{
|
||||||
if (ModelState.IsValid == true)
|
if (ModelState.IsValid == true)
|
||||||
{
|
{
|
||||||
var user = await UserManager.FindByUserNamePassword(model.UserName, model.Password);
|
var user = await UserManager.FindByUserNamePasswordAsync(model.UserName, model.Password);
|
||||||
if (user != null)
|
if (user != null)
|
||||||
{
|
{
|
||||||
await SignIn(user, model.RememberMe);
|
await SignIn(user, model.RememberMe);
|
||||||
|
|
@ -106,7 +106,7 @@ namespace MusicStore.Controllers
|
||||||
|
|
||||||
ManageMessageId? message = null;
|
ManageMessageId? message = null;
|
||||||
var user = new ApplicationUser() { UserName = this.Context.User.Identity.GetUserId() };
|
var user = new ApplicationUser() { UserName = this.Context.User.Identity.GetUserId() };
|
||||||
IdentityResult result = await UserManager.RemoveLogin(user, new UserLoginInfo(loginProvider, providerKey));
|
IdentityResult result = await UserManager.RemoveLoginAsync(user, new UserLoginInfo(loginProvider, providerKey));
|
||||||
if (result.Succeeded)
|
if (result.Succeeded)
|
||||||
{
|
{
|
||||||
message = ManageMessageId.RemoveLoginSuccess;
|
message = ManageMessageId.RemoveLoginSuccess;
|
||||||
|
|
@ -259,7 +259,7 @@ namespace MusicStore.Controllers
|
||||||
return View();
|
return View();
|
||||||
}
|
}
|
||||||
var user = new ApplicationUser() { UserName = this.Context.User.Identity.GetUserId()};
|
var user = new ApplicationUser() { UserName = this.Context.User.Identity.GetUserId()};
|
||||||
var result = await UserManager.AddLogin(user, loginInfo.Login);
|
var result = await UserManager.AddLoginAsync(user, loginInfo.Login);
|
||||||
if (result.Succeeded)
|
if (result.Succeeded)
|
||||||
{
|
{
|
||||||
//Bug: No helper method
|
//Bug: No helper method
|
||||||
|
|
@ -298,7 +298,7 @@ namespace MusicStore.Controllers
|
||||||
var result = await UserManager.CreateAsync(user);
|
var result = await UserManager.CreateAsync(user);
|
||||||
if (result.Succeeded)
|
if (result.Succeeded)
|
||||||
{
|
{
|
||||||
result = await UserManager.AddLogin(user, info.Login);
|
result = await UserManager.AddLoginAsync(user, info.Login);
|
||||||
if (result.Succeeded)
|
if (result.Succeeded)
|
||||||
{
|
{
|
||||||
await SignIn(user, isPersistent: false);
|
await SignIn(user, isPersistent: false);
|
||||||
|
|
@ -337,7 +337,7 @@ namespace MusicStore.Controllers
|
||||||
public async Task<IActionResult> RemoveAccountList()
|
public async Task<IActionResult> RemoveAccountList()
|
||||||
{
|
{
|
||||||
var user = new ApplicationUser() { UserName = this.Context.User.Identity.GetUserId() };
|
var user = new ApplicationUser() { UserName = this.Context.User.Identity.GetUserId() };
|
||||||
var linkedAccounts = await UserManager.GetLogins(user);
|
var linkedAccounts = await UserManager.GetLoginsAsync(user);
|
||||||
ViewBag.ShowRemoveButton = await HasPassword() || linkedAccounts.Count > 1;
|
ViewBag.ShowRemoveButton = await HasPassword() || linkedAccounts.Count > 1;
|
||||||
//Bug: We dont have partial views yet
|
//Bug: We dont have partial views yet
|
||||||
//return (IActionResult)PartialView("_RemoveAccountPartial", linkedAccounts);
|
//return (IActionResult)PartialView("_RemoveAccountPartial", linkedAccounts);
|
||||||
|
|
@ -363,7 +363,7 @@ namespace MusicStore.Controllers
|
||||||
private async Task SignIn(ApplicationUser user, bool isPersistent)
|
private async Task SignIn(ApplicationUser user, bool isPersistent)
|
||||||
{
|
{
|
||||||
this.Context.Response.SignOut(DefaultAuthenticationTypes.ExternalCookie);
|
this.Context.Response.SignOut(DefaultAuthenticationTypes.ExternalCookie);
|
||||||
var identity = await UserManager.CreateIdentity(user, DefaultAuthenticationTypes.ApplicationCookie);
|
var identity = await UserManager.CreateIdentityAsync(user, DefaultAuthenticationTypes.ApplicationCookie);
|
||||||
this.Context.Response.SignIn(identity, new AuthenticationProperties() { IsPersistent = isPersistent });
|
this.Context.Response.SignIn(identity, new AuthenticationProperties() { IsPersistent = isPersistent });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
using Microsoft.AspNet.Identity.InMemory;
|
using Microsoft.AspNet.Identity;
|
||||||
|
|
||||||
namespace MusicStore.Models
|
namespace MusicStore.Models
|
||||||
{
|
{
|
||||||
public class ApplicationUser : InMemoryUser
|
public class ApplicationUser : IdentityUser
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,9 @@ public class Startup
|
||||||
string _role = "Administrator";
|
string _role = "Administrator";
|
||||||
|
|
||||||
var userManager = new UserManager<ApplicationUser>(new InMemoryUserStore<ApplicationUser>());
|
var userManager = new UserManager<ApplicationUser>(new InMemoryUserStore<ApplicationUser>());
|
||||||
var roleManager = new RoleManager<InMemoryRole>(new InMemoryRoleStore<InMemoryRole>());
|
var roleManager = new RoleManager<IdentityRole>(new InMemoryRoleStore<IdentityRole>());
|
||||||
|
|
||||||
var role = new InMemoryRole(_role);
|
var role = new IdentityRole(_role);
|
||||||
var result = await roleManager.RoleExistsAsync(_role);
|
var result = await roleManager.RoleExistsAsync(_role);
|
||||||
if (result == false)
|
if (result == false)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue