Add sample for .NET Core 3.x.

Author: mo-esmp

DynamicRoleBasedAuthorization.sln

@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{BAAF
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore3.x", "netcore3.x", "{5FEB9007-1EFA-4814-BC15-DB0370B84E22}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleMvcWebApp", "samples\netcore3.x\SampleMvcWebApp\SampleMvcWebApp.csproj", "{0833E296-398F-42A4-9531-D125483AB019}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvcWebApp", "samples\netcore3.x\SampleMvcWebApp\SampleMvcWebApp.csproj", "{0833E296-398F-42A4-9531-D125483AB019}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

samples/netcore3.x/SampleMvcWebApp/Areas/Access/Controllers/RoleController.cs

@@ -78,7 +78,7 @@ public async Task<ActionResult> Create(RoleViewModel viewModel)
 
                 var roleAccess = new RoleAccess
                 {
-                    Controllers = viewModel.SelectedControllers,
+                    Controllers = viewModel.SelectedControllers.ToList(),
                     RoleId = role.Id
                 };
                 await _roleAccessStore.AddRoleAccessAsync(roleAccess);
@@ -150,7 +150,7 @@ public async Task<ActionResult> Edit(string id, RoleViewModel viewModel)
 
             var roleAccess = new RoleAccess
             {
-                Controllers = viewModel.SelectedControllers,
+                Controllers = viewModel.SelectedControllers?.ToList(),
                 RoleId = role.Id
             };
             await _roleAccessStore.EditRoleAccessAsync(roleAccess);

samples/netcore3.x/SampleMvcWebApp/Areas/Access/Controllers/UserRoleController.cs

@@ -0,0 +1,109 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using SampleMvcWebApp.Areas.Access.Models;
+using SampleMvcWebApp.Data;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace SampleMvcWebApp.Areas.Access.Controllers
+{
+    [Area("Access"), Authorize]
+    [DisplayName("User Role Management")]
+    public class UserRoleController : Controller
+    {
+        private readonly ApplicationDbContext _dbContext;
+        private readonly RoleManager<IdentityRole> _roleManager;
+        private readonly UserManager<IdentityUser> _userManager;
+
+        public UserRoleController(
+            ApplicationDbContext dbContext,
+            RoleManager<IdentityRole> roleManager,
+            UserManager<IdentityUser> userManager
+            )
+        {
+            _roleManager = roleManager;
+            _userManager = userManager;
+            _dbContext = dbContext;
+        }
+
+        // GET: Access
+        [DisplayName("User List")]
+        public async Task<ActionResult> Index()
+        {
+            var query = await (
+                    from user in _dbContext.Users
+                    join ur in _dbContext.UserRoles on user.Id equals ur.UserId into userRoles
+                    from userRole in userRoles.DefaultIfEmpty()
+                    join rle in _dbContext.Roles on userRole.RoleId equals rle.Id into roles
+                    from role in roles.DefaultIfEmpty()
+                    select new { user, userRole, role }
+                ).ToListAsync();
+
+            var userList = new List<UserRoleViewModel>();
+            foreach (var grp in query.GroupBy(q => q.user.Id))
+            {
+                var first = grp.First();
+                userList.Add(new UserRoleViewModel
+                {
+                    UserId = first.user.Id,
+                    UserName = first.user.UserName,
+                    Roles = first.role != null ? grp.Select(g => g.role).Select(r => r.Name) : new List<string>()
+                });
+            }
+
+            return View(userList);
+        }
+
+        // GET: Access/Edit
+        [DisplayName("Edit User Roles")]
+        public async Task<ActionResult> Edit(string id)
+        {
+            var user = await _userManager.FindByIdAsync(id);
+            if (user == null)
+                return NotFound();
+
+            var userRoles = await _userManager.GetRolesAsync(user);
+            var userViewModel = new UserRoleViewModel
+            {
+                UserId = user.Id,
+                UserName = user.UserName,
+                Roles = userRoles
+            };
+
+            var roles = await _roleManager.Roles.ToListAsync();
+            ViewData["Roles"] = roles;
+
+            return View(userViewModel);
+        }
+
+        // POST: Access/Edit
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<ActionResult> Edit(UserRoleViewModel viewModel)
+        {
+            if (!ModelState.IsValid)
+            {
+                ViewData["Roles"] = await _roleManager.Roles.ToListAsync();
+                return View(viewModel);
+            }
+
+            var user = _dbContext.Users.Find(viewModel.UserId);
+            if (user == null)
+            {
+                ModelState.AddModelError("", "User not found");
+                ViewData["Roles"] = await _roleManager.Roles.ToListAsync();
+                return View();
+            }
+
+            var userRoles = await _userManager.GetRolesAsync(user);
+            await _userManager.RemoveFromRolesAsync(user, userRoles);
+            await _userManager.AddToRolesAsync(user, viewModel.Roles);
+
+            return RedirectToAction("Index");
+        }
+    }
+}

samples/netcore3.x/SampleMvcWebApp/Areas/Access/Models/UserRoleViewModel.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace SampleMvcWebApp.Areas.Access.Models
+{
+    public class UserRoleViewModel
+    {
+        [Required]
+        public string UserId { get; set; }
+
+        public string UserName { get; set; }
+
+        public IEnumerable<string> Roles { get; set; }
+    }
+}

samples/netcore3.x/SampleMvcWebApp/Areas/Access/Views/UserRole/Edit.cshtml

@@ -0,0 +1,53 @@
+@model UserRoleViewModel
+@{
+    ViewData["Title"] = "Edit User Access";
+    var roles = (IEnumerable<IdentityRole>)ViewData["Roles"];
+}
+
+@*@section header{
+        <style>
+            .form-horizontal .control-label {
+                padding-top: 0;
+            }
+        </style>
+    }*@
+
+<h2>Edit User Access</h2>
+
+<hr />
+<div class="row">
+    <div class="col-md-6">
+        <form asp-action="Edit">
+            <div asp-validation-summary="All" class="text-danger"></div>
+            <input type="hidden" asp-for="UserId" />
+            <input type="hidden" asp-for="UserName" />
+
+            <div class="form-group row">
+                <label asp-for="UserName" class="col-md-2 col-form-label"></label>
+                <div class="col-md-10">
+                    <span class="form-control">@Html.DisplayFor(m => m.UserName)</span>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label class="col-md-2 control-label">Roles</label>
+                <div class="col-md-10">
+                    @foreach (var role in roles)
+                    {
+                        <label>
+                            <input type="checkbox" name="Roles[]" value="@role.Name"
+                                   @if (Model?.Roles != null && Model.Roles.Contains(role.Name)) { <text> checked="checked" </text> } />
+                            &nbsp;@role.Name&nbsp;&nbsp;
+                        </label>
+                    }
+                </div>
+            </div>
+
+            <div class="form-group row">
+                <div class="col-md-10">
+                    <input type="submit" class="btn btn-primary" value="Edit" />
+                </div>
+            </div>
+        </form>
+    </div>
+</div>

samples/netcore3.x/SampleMvcWebApp/Areas/Access/Views/UserRole/Index.cshtml

@@ -0,0 +1,38 @@
+@model IEnumerable<UserRoleViewModel>
+@{
+    ViewData["Title"] = "User Role List";
+}
+
+<h2>Access List</h2>
+
+<div class="row">
+    <div class="col-md-10">
+
+        <table class="table table-bordered">
+            <thead>
+                <tr>
+                    <th scope="col"> @Html.DisplayNameFor(m => m.UserName) </th>
+                    <th scope="col"> @Html.DisplayNameFor(m => m.Roles) </th>
+                    <th> </th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var user in Model)
+                {
+                    <tr>
+                        <td>@Html.DisplayFor(m => user.UserName)</td>
+                        <td>
+                            @foreach (var role in user.Roles)
+                            {
+                                <span>@Html.DisplayFor(m => role) | </span>
+                            }
+                        </td>
+                        <td>
+                            <a asp-action="Edit" asp-route-id="@user.UserId">Edit</a>
+                        </td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    </div>
+</div>

samples/netcore3.x/SampleMvcWebApp/Controllers/ProtectedOneController.cs

@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.ComponentModel;
+
+namespace SampleMvcWebApp.Controllers
+{
+    [Authorize]
+    [DisplayName("Protected section 1")]
+    public class ProtectedOneController : Controller
+    {
+        [DisplayName("List")]
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        [DisplayName("Detail")]
+        public IActionResult Detail()
+        {
+            return View();
+        }
+    }
+}

samples/netcore3.x/SampleMvcWebApp/Controllers/ProtectedTwoController.cs

@@ -0,0 +1,23 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.ComponentModel;
+
+namespace SampleMvcWebApp.Controllers
+{
+    [Authorize]
+    [DisplayName("Protected section 2")]
+    public class ProtectedTwoController : Controller
+    {
+        [DisplayName("List")]
+        public IActionResult Index()
+        {
+            return View();
+        }
+
+        [DisplayName("Detail")]
+        public IActionResult Detail()
+        {
+            return View();
+        }
+    }
+}

samples/netcore3.x/SampleMvcWebApp/RoleAccess.json

@@ -28,9 +28,10 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddIdentity<IdentityUser, IdentityRole>(options => options.SignIn.RequireConfirmedAccount = false)
                 .AddEntityFrameworkStores<ApplicationDbContext>()
+                .AddDefaultTokenProviders()
                 .AddDefaultUI();
 
-            services.AddDynamicAuthorization(options => options.DefaultAdminUser = "[email protected]")
+            services.AddDynamicAuthorization<ApplicationDbContext>(options => options.DefaultAdminUser = "[email protected]")
                 .AddJsonStore(options => options.FilePath =
                     @"D:\Workspace\Github\DynamicRoleBasedAuthorizationNETCore\samples\netcore3.x\SampleMvcWebApp\bin\Debug\netcoreapp3.1\RoleAccess.json");