React to MVC/Auth changes

aspnet · Jan 16, 2015 · ef22f9f · Praburaj · Jan 16, 2015 · HaoK
1 parent ad5cfb9
commit ef22f9f
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 5 deletions.
diff --git a/src/MusicStore.Spa/Apis/AlbumsApiController.cs b/src/MusicStore.Spa/Apis/AlbumsApiController.cs
@@ -88,7 +88,7 @@ public async Task<ActionResult> Details(int albumId)
         }
 
         [HttpPost]
-        [Authorize("app-ManageStore", "Allowed")]
+        [Authorize("app-ManageStore")]
         public async Task<ActionResult> CreateAlbum([FromBody]AlbumChangeDto album)
         {
             if (!ModelState.IsValid)
@@ -112,7 +112,7 @@ public async Task<ActionResult> CreateAlbum([FromBody]AlbumChangeDto album)
         }
 
         [HttpPut("{albumId:int}/update")]
-        [Authorize("app-ManageStore", "Allowed")]
+        [Authorize("app-ManageStore")]
         public async Task<ActionResult> UpdateAlbum(int albumId, [FromBody]AlbumChangeDto album)
         {
             if (!ModelState.IsValid)
@@ -145,7 +145,7 @@ public async Task<ActionResult> UpdateAlbum(int albumId, [FromBody]AlbumChangeDt
         }
 
         [HttpDelete("{albumId:int}")]
-        [Authorize("app-ManageStore", "Allowed")]
+        [Authorize("app-ManageStore")]
         public async Task<ActionResult> 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
@@ -13,7 +13,7 @@ public IActionResult Home()
         }
 
         [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
@@ -7,6 +7,7 @@
 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 @@ public void ConfigureServices(IServiceCollection services)
 
             // Add application services to the service container
             //services.AddTransient<IModelMetadataProvider, BuddyModelMetadataProvider>();
+
+            // Configure Auth
+            services.Configure<AuthorizationOptions>(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
@@ -14,7 +14,7 @@
 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
@@ -4,6 +4,7 @@
 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 @@ public void ConfigureServices(IServiceCollection services)
 
             //Add InMemoryCache
             services.AddSingleton<IMemoryCache, MemoryCache>();
+
+            // Configure Auth
+            services.Configure<AuthorizationOptions>(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
@@ -5,6 +5,7 @@
 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 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
 
                 //Add InMemoryCache
                 services.AddSingleton<IMemoryCache, MemoryCache>();
+
+                // Configure Auth
+                services.Configure<AuthorizationOptions>(options =>
+                {
+                    options.AddPolicy("ManageStore", new AuthorizationPolicyBuilder().RequiresClaim("Allowed").Build());
+                });
             });
 
             //Configure SignalR

diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs
@@ -4,6 +4,7 @@
 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 @@ public void ConfigureServices(IServiceCollection services)
 
             //Add InMemoryCache
             services.AddSingleton<IMemoryCache, MemoryCache>();
+
+            // Configure Auth
+            services.Configure<AuthorizationOptions>(options =>
+            {
+                options.AddPolicy("ManageStore", new AuthorizationPolicyBuilder().RequiresClaim("Allowed").Build());
+            });
         }
 
         //This method is invoked when ASPNET_ENV is 'Development' or is not defined