diff --git a/src/MusicStore.Spa/Apis/AlbumsApiController.cs b/src/MusicStore.Spa/Apis/AlbumsApiController.cs index e0f2f76444..68b2f04f80 100644 --- a/src/MusicStore.Spa/Apis/AlbumsApiController.cs +++ b/src/MusicStore.Spa/Apis/AlbumsApiController.cs @@ -1,8 +1,7 @@ -using System.ComponentModel.DataAnnotations; -using System.Linq; +using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Security; using MusicStore.Infrastructure; using MusicStore.Models; using MusicStore.Spa.Infrastructure; diff --git a/src/MusicStore.Spa/Controllers/AccountController.cs b/src/MusicStore.Spa/Controllers/AccountController.cs index 51d5881092..4587d30ac0 100644 --- a/src/MusicStore.Spa/Controllers/AccountController.cs +++ b/src/MusicStore.Spa/Controllers/AccountController.cs @@ -1,9 +1,8 @@ using System.Security.Principal; using System.Threading.Tasks; +using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Security; using MusicStore.Models; namespace MusicStore.Controllers diff --git a/src/MusicStore.Spa/Controllers/PageController.cs b/src/MusicStore.Spa/Controllers/PageController.cs index 8d3a88c15e..e4a12d0303 100644 --- a/src/MusicStore.Spa/Controllers/PageController.cs +++ b/src/MusicStore.Spa/Controllers/PageController.cs @@ -1,6 +1,5 @@ -using System.Security.Claims; +using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Security; namespace MusicStore.Spa.Controllers { diff --git a/src/MusicStore.Spa/Startup.cs b/src/MusicStore.Spa/Startup.cs index 0da40c460a..45340a1edd 100644 --- a/src/MusicStore.Spa/Startup.cs +++ b/src/MusicStore.Spa/Startup.cs @@ -1,7 +1,7 @@ -using Microsoft.AspNet.Builder; +using Microsoft.AspNet.Authorization; +using Microsoft.AspNet.Builder; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Security; using Microsoft.Data.Entity; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; @@ -58,7 +58,7 @@ namespace MusicStore.Spa // Configure Auth services.Configure(options => { - options.AddPolicy("app-ManageStore", new AuthorizationPolicyBuilder().RequiresClaim("app-ManageStore", "Allowed").Build()); + options.AddPolicy("app-ManageStore", new AuthorizationPolicyBuilder().RequireClaim("app-ManageStore", "Allowed").Build()); }); } diff --git a/src/MusicStore.Spa/Views/Shared/_LoginPartial.cshtml b/src/MusicStore.Spa/Views/Shared/_LoginPartial.cshtml index a25dfd3ee1..08100e9570 100644 --- a/src/MusicStore.Spa/Views/Shared/_LoginPartial.cshtml +++ b/src/MusicStore.Spa/Views/Shared/_LoginPartial.cshtml @@ -6,7 +6,7 @@ //Func js = input => Html.Raw(HttpUtility.JavaScriptStringEncode(input, false)); } -@if (User.Identity.IsAuthenticated) +@if (User.IsSignedIn()) { using (Html.BeginForm("LogOff", "Account", FormMethod.Post, new { id = "logoutForm", @class = "navbar-right" })) { diff --git a/src/MusicStore.Spa/project.json b/src/MusicStore.Spa/project.json index 408962790a..a25c23025d 100644 --- a/src/MusicStore.Spa/project.json +++ b/src/MusicStore.Spa/project.json @@ -31,7 +31,7 @@ "Microsoft.AspNet.StaticFiles": "1.0.0-*", "EntityFramework.InMemory": "7.0.0-*", "EntityFramework.SqlServer": "7.0.0-*", - "Microsoft.AspNet.Security.Cookies": "1.0.0-*", + "Microsoft.AspNet.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*", "Microsoft.Framework.ConfigurationModel": "1.0.0-*", "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*" diff --git a/src/MusicStore/Views/Account/_ExternalLoginsListPartial.cshtml b/src/MusicStore/Views/Account/_ExternalLoginsListPartial.cshtml index 6daeb0dd76..476ca4d1eb 100644 --- a/src/MusicStore/Views/Account/_ExternalLoginsListPartial.cshtml +++ b/src/MusicStore/Views/Account/_ExternalLoginsListPartial.cshtml @@ -1,5 +1,5 @@ @using MusicStore.Models; -@using Microsoft.AspNet.Http.Security; +@using Microsoft.AspNet.Http.Authentication; @using Microsoft.AspNet.Identity; @model ExternalLoginListViewModel @inject SignInManager SignInManager