Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Dynamic User Roles

Browse Source
This commit is contained in:
Shaun Walker
2019-08-20 16:43:35 -04:00
parent de4fa48a29
commit 42c6efbfdb
51 changed files with 942 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Oqtane.Server/Controllers/AliasController.cs
View File

@ -8,25 +8,25 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class AliasController : Controller
{
private readonly IAliasRepository aliases;
private readonly IAliasRepository Aliases;
public AliasController(IAliasRepository Aliases)
{
aliases = Aliases;
this.Aliases = Aliases;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<Alias> Get()
{
return aliases.GetAliases();
return Aliases.GetAliases();
}
// GET api/<controller>/5
[HttpGet("{id}")]
public Alias Get(int id)
{
return aliases.GetAlias(id);
return Aliases.GetAlias(id);
}
// POST api/<controller>
@ -35,7 +35,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Alias = aliases.AddAlias(Alias);
Alias = Aliases.AddAlias(Alias);
}
return Alias;
}
@ -46,7 +46,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Alias = aliases.UpdateAlias(Alias);
Alias = Aliases.UpdateAlias(Alias);
}
return Alias;
}
@ -55,7 +55,7 @@ namespace Oqtane.Controllers
[HttpDelete("{id}")]
public void Delete(int id)
{
aliases.DeleteAlias(id);
Aliases.DeleteAlias(id);
}
}
}

10
Oqtane.Server/Controllers/InstallationController.cs
View File

@ -18,11 +18,11 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class InstallationController : Controller
{
private readonly IConfigurationRoot _config;
private readonly IConfigurationRoot Config;
public InstallationController(IConfigurationRoot config)
public InstallationController(IConfigurationRoot Config)
{
_config = config;
this.Config = Config;
}
// POST api/<controller>
@ -139,7 +139,7 @@ namespace Oqtane.Controllers
{
writer.WriteLine(config);
}
_config.Reload();
Config.Reload();
response.Success = true;
}
}
@ -160,7 +160,7 @@ namespace Oqtane.Controllers
var response = new GenericResponse { Success = false, Message = "" };
string datadirectory = AppDomain.CurrentDomain.GetData("DataDirectory").ToString();
string connectionString = _config.GetConnectionString("DefaultConnection");
string connectionString = Config.GetConnectionString("DefaultConnection");
connectionString = connectionString.Replace("|DataDirectory|", datadirectory);
SqlConnection connection = new SqlConnection(connectionString);

20
Oqtane.Server/Controllers/ModuleController.cs
View File

@ -8,13 +8,13 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class ModuleController : Controller
{
private readonly IModuleRepository modules;
private readonly IPageModuleRepository pagemodules;
private readonly IModuleRepository Modules;
private readonly IPageModuleRepository PageModules;
public ModuleController(IModuleRepository Modules, IPageModuleRepository PageModules)
{
modules = Modules;
pagemodules = PageModules;
this.Modules = Modules;
this.PageModules = PageModules;
}
// GET: api/<controller>?pageid=x
@ -25,7 +25,7 @@ namespace Oqtane.Controllers
if (!string.IsNullOrEmpty(pageid))
{
List<Module> modulelist = new List<Module>();
foreach (PageModule pagemodule in pagemodules.GetPageModules(int.Parse(pageid)))
foreach (PageModule pagemodule in PageModules.GetPageModules(int.Parse(pageid)))
{
Module module = pagemodule.Module;
module.PageModuleId = pagemodule.PageModuleId;
@ -40,7 +40,7 @@ namespace Oqtane.Controllers
}
else
{
return modules.GetModules(int.Parse(siteid), moduledefinitionname);
return Modules.GetModules(int.Parse(siteid), moduledefinitionname);
}
}
@ -48,7 +48,7 @@ namespace Oqtane.Controllers
[HttpGet("{id}")]
public Module Get(int id)
{
return modules.GetModule(id);
return Modules.GetModule(id);
}
// POST api/<controller>
@ -57,7 +57,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Module = modules.AddModule(Module);
Module = Modules.AddModule(Module);
}
return Module;
}
@ -68,7 +68,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Module = modules.UpdateModule(Module);
Module = Modules.UpdateModule(Module);
}
return Module;
}
@ -77,7 +77,7 @@ namespace Oqtane.Controllers
[HttpDelete("{id}")]
public void Delete(int id)
{
modules.DeleteModule(id);
Modules.DeleteModule(id);
}
}
}

6
Oqtane.Server/Controllers/ModuleDefinitionController.cs
View File

@ -8,18 +8,18 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class ModuleDefinitionController : Controller
{
private readonly IModuleDefinitionRepository moduledefinitions;
private readonly IModuleDefinitionRepository ModuleDefinitions;
public ModuleDefinitionController(IModuleDefinitionRepository ModuleDefinitions)
{
moduledefinitions = ModuleDefinitions;
this.ModuleDefinitions = ModuleDefinitions;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<ModuleDefinition> Get()
{
return moduledefinitions.GetModuleDefinitions();
return ModuleDefinitions.GetModuleDefinitions();
}
}
}

16
Oqtane.Server/Controllers/PageController.cs
View File

@ -8,11 +8,11 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class PageController : Controller
{
private readonly IPageRepository pages;
private readonly IPageRepository Pages;
public PageController(IPageRepository Pages)
{
pages = Pages;
this.Pages = Pages;
}
// GET: api/<controller>?siteid=x
@ -21,11 +21,11 @@ namespace Oqtane.Controllers
{
if (siteid == "")
{
return pages.GetPages();
return Pages.GetPages();
}
else
{
return pages.GetPages(int.Parse(siteid));
return Pages.GetPages(int.Parse(siteid));
}
}
@ -33,7 +33,7 @@ namespace Oqtane.Controllers
[HttpGet("{id}")]
public Page Get(int id)
{
return pages.GetPage(id);
return Pages.GetPage(id);
}
// POST api/<controller>
@ -42,7 +42,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Page = pages.AddPage(Page);
Page = Pages.AddPage(Page);
}
return Page;
}
@ -53,7 +53,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Page = pages.UpdatePage(Page);
Page = Pages.UpdatePage(Page);
}
return Page;
}
@ -62,7 +62,7 @@ namespace Oqtane.Controllers
[HttpDelete("{id}")]
public void Delete(int id)
{
pages.DeletePage(id);
Pages.DeletePage(id);
}
}
}

14
Oqtane.Server/Controllers/PageModuleController.cs
View File

@ -8,25 +8,25 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class PageModuleController : Controller
{
private readonly IPageModuleRepository pagemodules;
private readonly IPageModuleRepository PageModules;
public PageModuleController(IPageModuleRepository PageModules)
{
pagemodules = PageModules;
this.PageModules = PageModules;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<PageModule> Get()
{
return pagemodules.GetPageModules();
return PageModules.GetPageModules();
}
// GET api/<controller>/5
[HttpGet("{id}")]
public PageModule Get(int id)
{
return pagemodules.GetPageModule(id);
return PageModules.GetPageModule(id);
}
// POST api/<controller>
@ -35,7 +35,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
PageModule = pagemodules.AddPageModule(PageModule);
PageModule = PageModules.AddPageModule(PageModule);
}
return PageModule;
}
@ -46,7 +46,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
PageModule = pagemodules.UpdatePageModule(PageModule);
PageModule = PageModules.UpdatePageModule(PageModule);
}
return PageModule;
}
@ -55,7 +55,7 @@ namespace Oqtane.Controllers
[HttpDelete("{id}")]
public void Delete(int id)
{
pagemodules.DeletePageModule(id);
PageModules.DeletePageModule(id);
}
}
}

68
Oqtane.Server/Controllers/RoleController.cs Normal file
View File

@ -0,0 +1,68 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Repository;
using Oqtane.Models;
namespace Oqtane.Controllers
{
[Route("{site}/api/[controller]")]
public class RoleController : Controller
{
private readonly IRoleRepository Roles;
public RoleController(IRoleRepository Roles)
{
this.Roles = Roles;
}
// GET: api/<controller>?siteid=x
[HttpGet]
public IEnumerable<Role> Get(string siteid)
{
if (siteid == "")
{
return Roles.GetRoles();
}
else
{
return Roles.GetRoles(int.Parse(siteid));
}
}
// GET api/<controller>/5
[HttpGet("{id}")]
public Role Get(int id)
{
return Roles.GetRole(id);
}
// POST api/<controller>
[HttpPost]
public Role Post([FromBody] Role Role)
{
if (ModelState.IsValid)
{
Role = Roles.AddRole(Role);
}
return Role;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public Role Put(int id, [FromBody] Role Role)
{
if (ModelState.IsValid)
{
Role = Roles.UpdateRole(Role);
}
return Role;
}
// DELETE api/<controller>/5
[HttpDelete("{id}")]
public void Delete(int id)
{
Roles.DeleteRole(id);
}
}
}

14
Oqtane.Server/Controllers/SiteController.cs
View File

@ -8,25 +8,25 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class SiteController : Controller
{
private readonly ISiteRepository sites;
private readonly ISiteRepository Sites;
public SiteController(ISiteRepository Sites)
{
sites = Sites;
this.Sites = Sites;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<Site> Get()
{
return sites.GetSites();
return Sites.GetSites();
}
// GET api/<controller>/5
[HttpGet("{id}")]
public Site Get(int id)
{
return sites.GetSite(id);
return Sites.GetSite(id);
}
// POST api/<controller>
@ -35,7 +35,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Site = sites.AddSite(Site);
Site = Sites.AddSite(Site);
}
return Site;
}
@ -46,7 +46,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Site = sites.UpdateSite(Site);
Site = Sites.UpdateSite(Site);
}
return Site;
}
@ -55,7 +55,7 @@ namespace Oqtane.Controllers
[HttpDelete("{id}")]
public void Delete(int id)
{
sites.DeleteSite(id);
Sites.DeleteSite(id);
}
}
}

14
Oqtane.Server/Controllers/TenantController.cs
View File

@ -8,25 +8,25 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class TenantController : Controller
{
private readonly ITenantRepository tenants;
private readonly ITenantRepository Tenants;
public TenantController(ITenantRepository Tenants)
{
tenants = Tenants;
this.Tenants = Tenants;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<Tenant> Get()
{
return tenants.GetTenants();
return Tenants.GetTenants();
}
// GET api/<controller>/5
[HttpGet("{id}")]
public Tenant Get(int id)
{
return tenants.GetTenant(id);
return Tenants.GetTenant(id);
}
// POST api/<controller>
@ -35,7 +35,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Tenant = tenants.AddTenant(Tenant);
Tenant = Tenants.AddTenant(Tenant);
}
return Tenant;
}
@ -46,7 +46,7 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
Tenant = tenants.UpdateTenant(Tenant);
Tenant = Tenants.UpdateTenant(Tenant);
}
return Tenant;
}
@ -55,7 +55,7 @@ namespace Oqtane.Controllers
[HttpDelete("{id}")]
public void Delete(int id)
{
tenants.DeleteTenant(id);
Tenants.DeleteTenant(id);
}
}
}

6
Oqtane.Server/Controllers/ThemeController.cs
View File

@ -8,18 +8,18 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class ThemeController : Controller
{
private readonly IThemeRepository themes;
private readonly IThemeRepository Themes;
public ThemeController(IThemeRepository Themes)
{
themes = Themes;
this.Themes = Themes;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<Theme> Get()
{
return themes.GetThemes();
return Themes.GetThemes();
}
}
}

189
Oqtane.Server/Controllers/UserController.cs
View File

@ -11,33 +11,82 @@ namespace Oqtane.Controllers
[Route("{site}/api/[controller]")]
public class UserController : Controller
{
private readonly IUserRepository users;
private readonly ISiteUserRepository siteusers;
private readonly UserManager<IdentityUser> identityUserManager;
private readonly SignInManager<IdentityUser> identitySignInManager;
private readonly IUserRepository Users;
private readonly ISiteUserRepository SiteUsers;
private readonly IRoleRepository Roles;
private readonly IUserRoleRepository UserRoles;
private readonly UserManager<IdentityUser> IdentityUserManager;
private readonly SignInManager<IdentityUser> IdentitySignInManager;
public UserController(IUserRepository Users, ISiteUserRepository SiteUsers, UserManager<IdentityUser> IdentityUserManager, SignInManager<IdentityUser> IdentitySignInManager)
public UserController(IUserRepository Users, ISiteUserRepository SiteUsers, IRoleRepository Roles, IUserRoleRepository UserRoles, UserManager<IdentityUser> IdentityUserManager, SignInManager<IdentityUser> IdentitySignInManager)
{
users = Users;
siteusers = SiteUsers;
identityUserManager = IdentityUserManager;
identitySignInManager = IdentitySignInManager;
this.Users = Users;
this.SiteUsers = SiteUsers;
this.Roles = Roles;
this.UserRoles = UserRoles;
this.IdentityUserManager = IdentityUserManager;
this.IdentitySignInManager = IdentitySignInManager;
}
// GET: api/<controller>
// GET: api/<controller>?siteid=x
[HttpGet]
public IEnumerable<User> Get()
public IEnumerable<User> Get(string siteid)
{
return users.GetUsers();
List<User> users = new List<User>();
IEnumerable<SiteUser> siteusers = SiteUsers.GetSiteUsers(int.Parse(siteid));
foreach (SiteUser siteuser in siteusers)
{
User user = siteuser.User;
user.SiteId = siteuser.SiteId;
users.Add(user);
}
return users;
}
// GET api/<controller>/5
// GET api/<controller>/5?siteid=x
[HttpGet("{id}")]
public User Get(int id)
public User Get(int id, string siteid)
{
return users.GetUser(id);
User user = Users.GetUser(id);
if (user != null)
{
user.SiteId = int.Parse(siteid);
if (!user.IsSuperUser) // super users are part of every site by default
{
SiteUser siteuser = SiteUsers.GetSiteUser(user.SiteId, id);
if (siteuser != null)
{
user.Roles = GetUserRoles(user.UserId, user.SiteId);
}
}
}
return user;
}
// GET api/<controller>/name/x?siteid=x
[HttpGet("name/{name}")]
public User Get(string name, string siteid)
{
User user = Users.GetUser(name);
if (user != null)
{
user.SiteId = int.Parse(siteid);
if (!user.IsSuperUser) // super users are part of every site by default
{
SiteUser siteuser = SiteUsers.GetSiteUser(user.SiteId, user.UserId);
if (siteuser != null)
{
user.Roles = GetUserRoles(user.UserId, user.SiteId);
}
else
{
user = null;
}
}
}
return user;
}
// POST api/<controller>
[HttpPost]
public async Task<User> Post([FromBody] User User)
@ -46,21 +95,55 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
IdentityUser identityuser = await identityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
if (identityuser == null)
{
identityuser = new IdentityUser();
identityuser.UserName = User.Username;
identityuser.Email = User.Username;
var result = await identityUserManager.CreateAsync(identityuser, User.Password);
var result = await IdentityUserManager.CreateAsync(identityuser, User.Password);
if (result.Succeeded)
{
user = users.AddUser(User);
SiteUser SiteUser = new SiteUser();
SiteUser.SiteId = User.SiteId;
SiteUser.UserId = user.UserId;
SiteUser.IsAuthorized = true;
siteusers.AddSiteUser(SiteUser);
user = Users.AddUser(User);
SiteUser siteuser = new SiteUser();
siteuser.SiteId = User.SiteId;
siteuser.UserId = user.UserId;
SiteUsers.AddSiteUser(siteuser);
List<Role> roles = Roles.GetRoles(user.SiteId).Where(item => item.IsAutoAssigned == true).ToList();
foreach (Role role in roles)
{
UserRole userrole = new UserRole();
userrole.UserId = user.UserId;
userrole.RoleId = role.RoleId;
userrole.EffectiveDate = null;
userrole.ExpiryDate = null;
UserRoles.AddUserRole(userrole);
}
}
}
else
{
user = Users.GetUser(User.Username);
SiteUser siteuser = SiteUsers.GetSiteUser(User.SiteId, user.UserId);
if (siteuser == null)
{
siteuser = new SiteUser();
siteuser.SiteId = User.SiteId;
siteuser.UserId = user.UserId;
SiteUsers.AddSiteUser(siteuser);
List<Role> roles = Roles.GetRoles(User.SiteId).Where(item => item.IsAutoAssigned == true).ToList();
foreach (Role role in roles)
{
UserRole userrole = new UserRole();
userrole.UserId = user.UserId;
userrole.RoleId = role.RoleId;
userrole.EffectiveDate = null;
userrole.ExpiryDate = null;
UserRoles.AddUserRole(userrole);
}
}
}
}
@ -74,23 +157,20 @@ namespace Oqtane.Controllers
{
if (ModelState.IsValid)
{
User = users.UpdateUser(User);
User = Users.UpdateUser(User);
}
return User;
}
// DELETE api/<controller>/5
// DELETE api/<controller>/5?siteid=x
[HttpDelete("{id}")]
public void Delete(int id)
public void Delete(int id, string siteid)
{
users.DeleteUser(id);
}
// GET api/<controller>/name/x
[HttpGet("name/{name}")]
public User GetByName(string name)
{
return users.GetUser(name);
SiteUser siteuser = SiteUsers.GetSiteUser(id, int.Parse(siteid));
if (siteuser != null)
{
SiteUsers.DeleteSiteUser(siteuser.SiteUserId);
}
}
// POST api/<controller>/login
@ -101,21 +181,31 @@ namespace Oqtane.Controllers
if (ModelState.IsValid)
{
IdentityUser identityuser = await identityUserManager.FindByNameAsync(User.Username);
IdentityUser identityuser = await IdentityUserManager.FindByNameAsync(User.Username);
if (identityuser != null)
{
var result = await identitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
var result = await IdentitySignInManager.CheckPasswordSignInAsync(identityuser, User.Password, false);
if (result.Succeeded)
{
user = users.GetUser(identityuser.UserName);
user = Users.GetUser(identityuser.UserName);
if (user != null)
{
SiteUser siteuser = siteusers.GetSiteUsers(User.SiteId, user.UserId).FirstOrDefault();
if (siteuser.IsAuthorized)
if (!user.IsSuperUser) // super users are part of every site by default
{
SiteUser siteuser = SiteUsers.GetSiteUser(User.SiteId, user.UserId);
if (siteuser != null)
{
user.IsAuthenticated = true;
}
}
else
{
await identitySignInManager.SignInAsync(identityuser, User.IsPersistent);
user.IsAuthenticated = true;
}
if (user.IsAuthenticated)
{
await IdentitySignInManager.SignInAsync(identityuser, User.IsPersistent);
}
}
}
}
@ -128,7 +218,7 @@ namespace Oqtane.Controllers
[HttpPost("logout")]
public async Task Logout([FromBody] User User)
{
await identitySignInManager.SignOutAsync();
await IdentitySignInManager.SignOutAsync();
}
// GET api/<controller>/current
@ -137,5 +227,20 @@ namespace Oqtane.Controllers
{
return new User { Username = User.Identity.Name, IsAuthenticated = User.Identity.IsAuthenticated };
}
private string GetUserRoles(int UserId, int SiteId)
{
string roles = "";
IEnumerable<UserRole> userroles = UserRoles.GetUserRoles(UserId);
foreach (UserRole userrole in userroles)
{
if (userrole.Role.SiteId == SiteId)
{
roles += userrole.Role.Name + ";";
}
}
if (roles != "") roles = ";" + roles;
return roles;
}
}
}

68
Oqtane.Server/Controllers/UserRoleController.cs Normal file
View File

@ -0,0 +1,68 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Repository;
using Oqtane.Models;
namespace Oqtane.Controllers
{
[Route("{site}/api/[controller]")]
public class UserRoleController : Controller
{
private readonly IUserRoleRepository UserRoles;
public UserRoleController(IUserRoleRepository UserRoles)
{
this.UserRoles = UserRoles;
}
// GET: api/<controller>?userid=x
[HttpGet]
public IEnumerable<UserRole> Get(string userid)
{
if (userid == "")
{
return UserRoles.GetUserRoles();
}
else
{
return UserRoles.GetUserRoles(int.Parse(userid));
}
}
// GET api/<controller>/5
[HttpGet("{id}")]
public UserRole Get(int id)
{
return UserRoles.GetUserRole(id);
}
// POST api/<controller>
[HttpPost]
public UserRole Post([FromBody] UserRole UserRole)
{
if (ModelState.IsValid)
{
UserRole = UserRoles.AddUserRole(UserRole);
}
return UserRole;
}
// PUT api/<controller>/5
[HttpPut("{id}")]
public UserRole Put(int id, [FromBody] UserRole UserRole)
{
if (ModelState.IsValid)
{
UserRole = UserRoles.UpdateUserRole(UserRole);
}
return UserRole;
}
// DELETE api/<controller>/5
[HttpDelete("{id}")]
public void Delete(int id)
{
UserRoles.DeleteUserRole(id);
}
}
}