From ef22f9fb306104ba30f7e8a53dfc2e081bca8978 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 15 Jan 2015 23:52:52 -0800 Subject: [PATCH] React to MVC/Auth changes --- src/MusicStore.Spa/Apis/AlbumsApiController.cs | 6 +++--- src/MusicStore.Spa/Controllers/PageController.cs | 2 +- src/MusicStore.Spa/Startup.cs | 8 ++++++++ .../Areas/Admin/Controllers/StoreManagerController.cs | 2 +- src/MusicStore/Startup.cs | 7 +++++++ src/MusicStore/StartupNtlmAuthentication.cs | 7 +++++++ src/MusicStore/StartupOpenIdConnect.cs | 7 +++++++ 7 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/MusicStore.Spa/Apis/AlbumsApiController.cs b/src/MusicStore.Spa/Apis/AlbumsApiController.cs index 5e800e2155..6e464ac2a5 100644 --- a/src/MusicStore.Spa/Apis/AlbumsApiController.cs +++ b/src/MusicStore.Spa/Apis/AlbumsApiController.cs @@ -88,7 +88,7 @@ namespace MusicStore.Apis } [HttpPost] - [Authorize("app-ManageStore", "Allowed")] + [Authorize("app-ManageStore")] public async Task CreateAlbum([FromBody]AlbumChangeDto album) { if (!ModelState.IsValid) @@ -112,7 +112,7 @@ namespace MusicStore.Apis } [HttpPut("{albumId:int}/update")] - [Authorize("app-ManageStore", "Allowed")] + [Authorize("app-ManageStore")] public async Task UpdateAlbum(int albumId, [FromBody]AlbumChangeDto album) { if (!ModelState.IsValid) @@ -145,7 +145,7 @@ namespace MusicStore.Apis } [HttpDelete("{albumId:int}")] - [Authorize("app-ManageStore", "Allowed")] + [Authorize("app-ManageStore")] public async Task DeleteAlbum(int albumId) { var album = await _storeContext.Albums.SingleOrDefaultAsync(a => a.AlbumId == albumId); diff --git a/src/MusicStore.Spa/Controllers/PageController.cs b/src/MusicStore.Spa/Controllers/PageController.cs index 8e795e43a4..478515e596 100644 --- a/src/MusicStore.Spa/Controllers/PageController.cs +++ b/src/MusicStore.Spa/Controllers/PageController.cs @@ -13,7 +13,7 @@ namespace MusicStore.Spa.Controllers } [HttpGet("admin")] - [Authorize("app-ManageStore", "Allowed")] + [Authorize("app-ManageStore")] public IActionResult Admin() { return View("/Pages/Admin.cshtml"); diff --git a/src/MusicStore.Spa/Startup.cs b/src/MusicStore.Spa/Startup.cs index b7aec360b8..b838f6ecf9 100644 --- a/src/MusicStore.Spa/Startup.cs +++ b/src/MusicStore.Spa/Startup.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.Security; using Microsoft.AspNet.Security.Cookies; using Microsoft.AspNet.StaticFiles; using Microsoft.Data.Entity; @@ -61,6 +62,13 @@ namespace MusicStore.Spa // Add application services to the service container //services.AddTransient(); + + // Configure Auth + services.Configure(options => + { + options.AddPolicy("app-ManageStore", new AuthorizationPolicyBuilder().RequiresClaim("Allowed").Build()); + }); + } public void Configure(IApplicationBuilder app) diff --git a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs index f2b8220b35..cc23ce47e9 100644 --- a/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs +++ b/src/MusicStore/Areas/Admin/Controllers/StoreManagerController.cs @@ -14,7 +14,7 @@ using MusicStore.ViewModels; namespace MusicStore.Areas.Admin.Controllers { [Area("Admin")] - [Microsoft.AspNet.Mvc.Authorize("ManageStore", "Allowed")] + [Microsoft.AspNet.Mvc.Authorize("ManageStore")] public class StoreManagerController : Controller { private readonly MusicStoreContext _dbContext; diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index d0e2dcf1e8..51d1092fba 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -4,6 +4,7 @@ using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.Security; using Microsoft.Framework.Cache.Memory; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; @@ -85,6 +86,12 @@ namespace MusicStore //Add InMemoryCache services.AddSingleton(); + + // Configure Auth + services.Configure(options => + { + options.AddPolicy("ManageStore", new AuthorizationPolicyBuilder().RequiresClaim("Allowed").Build()); + }); } //This method is invoked when ASPNET_ENV is 'Development' or is not defined diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs index 049ba79ee4..2a8c594598 100644 --- a/src/MusicStore/StartupNtlmAuthentication.cs +++ b/src/MusicStore/StartupNtlmAuthentication.cs @@ -5,6 +5,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.Security; using Microsoft.AspNet.Server.WebListener; using Microsoft.Framework.Cache.Memory; using Microsoft.Framework.ConfigurationModel; @@ -88,6 +89,12 @@ namespace MusicStore //Add InMemoryCache services.AddSingleton(); + + // Configure Auth + services.Configure(options => + { + options.AddPolicy("ManageStore", new AuthorizationPolicyBuilder().RequiresClaim("Allowed").Build()); + }); }); //Configure SignalR diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index 1a365edfc6..0028520f98 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -4,6 +4,7 @@ using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Diagnostics.Entity; using Microsoft.AspNet.Identity; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.Security; using Microsoft.Framework.Cache.Memory; using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; @@ -73,6 +74,12 @@ namespace MusicStore //Add InMemoryCache services.AddSingleton(); + + // Configure Auth + services.Configure(options => + { + options.AddPolicy("ManageStore", new AuthorizationPolicyBuilder().RequiresClaim("Allowed").Build()); + }); } //This method is invoked when ASPNET_ENV is 'Development' or is not defined