kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Factored out Contants.*** Role into RoleNames.***

Browse Source 
Renamed 'AllUsers' to 'Everyone'
This commit is contained in:
Tony Valenti 2020-10-16 06:22:52 -05:00
parent 81475fd835
commit 955e7a3856
47 changed files with 298 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Error/Index.razor
View File

@ -8,7 +8,7 @@
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId); Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
if (UserSecurity.IsAuthorized(PageState.User, Constants.HostRole)) if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{ {
string message = "A Problem Was Encountered Loading Module " + module.ModuleDefinitionName; string message = "A Problem Was Encountered Loading Module " + module.ModuleDefinitionName;
AddModuleMessage(message, MessageType.Error); AddModuleMessage(message, MessageType.Error);

2
Oqtane.Client/Modules/Admin/Roles/Users.razor
View File

@ -88,7 +88,7 @@ else
Role role = await RoleService.GetRoleAsync(roleid); Role role = await RoleService.GetRoleAsync(roleid);
name = role.Name; name = role.Name;
users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId); users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
users = users.Where(item => item.Role.Name == Constants.RegisteredRole).ToList(); users = users.Where(item => item.Role.Name == RoleNames.Registered).ToList();
await GetUserRoles(); await GetUserRoles();
} }
catch (Exception ex) catch (Exception ex)

4
Oqtane.Client/Modules/Admin/UserProfile/Index.razor
View File

@ -79,7 +79,7 @@ else
@foreach (Profile profile in profiles) @foreach (Profile profile in profiles)
{ {
var p = profile; var p = profile;
if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole)) if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{ {
if (p.Category != category) if (p.Category != category)
{ {
@ -299,7 +299,7 @@ else
{ {
settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue); settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
} }
if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole)) if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{ {
if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty))) if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
{ {

4
Oqtane.Client/Modules/Admin/Users/Index.razor
View File

@ -58,10 +58,10 @@ else
{ {
if (string.IsNullOrEmpty(_search)) if (string.IsNullOrEmpty(_search))
{ {
return allroles.Where(item => item.Role.Name == Constants.RegisteredRole).ToList(); return allroles.Where(item => item.Role.Name == RoleNames.Registered).ToList();
} }
return allroles return allroles
.Where(item => item.Role.Name == Constants.RegisteredRole && .Where(item => item.Role.Name == RoleNames.Registered &&
( (
item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) || item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) || item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||

2
Oqtane.Client/Modules/Admin/Users/Roles.razor
View File

@ -63,7 +63,7 @@ else
<Row> <Row>
<td>@context.Role.Name</td> <td>@context.Role.Name</td>
<td> <td>
@if (context.Role.Name != Constants.RegisteredRole) @if (context.Role.Name != RoleNames.Registered)
{ {
<button type="button" class="btn btn-danger" @onclick=@(async () => await DeleteUserRole(context.UserRoleId))>Delete</button> <button type="button" class="btn btn-danger" @onclick=@(async () => await DeleteUserRole(context.UserRoleId))>Delete</button>
} }

4
Oqtane.Client/Modules/Controls/ActionDialog.razor
View File

@ -134,10 +134,10 @@
authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions); authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions);
break; break;
case SecurityAccessLevel.Admin: case SecurityAccessLevel.Admin:
authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole); authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
break; break;
case SecurityAccessLevel.Host: case SecurityAccessLevel.Host:
authorized = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole); authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
break; break;
} }
} }

4
Oqtane.Client/Modules/Controls/ActionLink.razor
View File

@ -135,10 +135,10 @@
authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions); authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions);
break; break;
case SecurityAccessLevel.Admin: case SecurityAccessLevel.Admin:
authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole); authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
break; break;
case SecurityAccessLevel.Host: case SecurityAccessLevel.Host:
authorized = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole); authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
break; break;
} }
} }

2
Oqtane.Client/Modules/Controls/FileManager.razor
View File

@ -173,7 +173,7 @@
_haseditpermission = false; _haseditpermission = false;
if (!string.IsNullOrEmpty(Folder)) if (!string.IsNullOrEmpty(Folder))
{ {
_haseditpermission = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole); _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
_files = await FileService.GetFilesAsync(Folder); _files = await FileService.GetFilesAsync(Folder);
} }
else else

2
Oqtane.Client/Modules/Controls/ModuleMessage.razor
View File

@ -6,7 +6,7 @@
{ {
<div class="@_classname" role="alert"> <div class="@_classname" role="alert">
@_message @_message
@if (Type == MessageType.Error && UserSecurity.IsAuthorized(PageState.User, Constants.HostRole)) @if (Type == MessageType.Error && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{ {
@((MarkupString)"&nbsp;&nbsp;")<NavLink href="@NavigateUrl("admin/log")">View Details</NavLink> @((MarkupString)"&nbsp;&nbsp;")<NavLink href="@NavigateUrl("admin/log")">View Details</NavLink>
} }

10
Oqtane.Client/Modules/Controls/PermissionGrid.razor
View File

@ -103,14 +103,14 @@
} }
_roles = await RoleService.GetRolesAsync(ModuleState.SiteId); _roles = await RoleService.GetRolesAsync(ModuleState.SiteId);
_roles.Insert(0, new Role { Name = Constants.AllUsersRole }); _roles.Insert(0, new Role { Name = RoleNames.Everyone });
_permissions = new List<PermissionString>(); _permissions = new List<PermissionString>();
foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
{ {
// initialize with admin role // initialize with admin role
_permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = Constants.AdminRole }); _permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
} }
if (!string.IsNullOrEmpty(Permissions)) if (!string.IsNullOrEmpty(Permissions))
@ -161,7 +161,7 @@
} }
private bool GetPermissionDisabled(string roleName) private bool GetPermissionDisabled(string roleName)
=> roleName == Constants.AdminRole => roleName == RoleNames.Admin
? true ? true
: false; : false;
@ -226,8 +226,8 @@
{ {
permission = _permissions[i]; permission = _permissions[i];
List<string> ids = permission.Permissions.Split(';').ToList(); List<string> ids = permission.Permissions.Split(';').ToList();
ids.Remove("!" + Constants.AllUsersRole); // remove deny all users ids.Remove("!" + RoleNames.Everyone); // remove deny all users
ids.Remove("!" + Constants.RegisteredRole); // remove deny registered users ids.Remove("!" + RoleNames.Registered); // remove deny registered users
permission.Permissions = string.Join(";", ids.ToArray()); permission.Permissions = string.Join(";", ids.ToArray());
_permissions[i] = permission; _permissions[i] = permission;
} }

16
Oqtane.Client/Themes/Controls/ControlPanel.razor
View File

@ -23,7 +23,7 @@
</div> </div>
<div class="@BodyClass"> <div class="@BodyClass">
@if (UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole)) @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{ {
<div class="row"> <div class="row">
<div class="col"> <div class="col">
@ -51,7 +51,7 @@
</div> </div>
<br /> <br />
<div class="row"> <div class="row">
@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(Constants.AllUsersRole)) @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
{ {
<div class="col"> <div class="col">
<button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("unpublish"))>Unpublish Page</button> <button type="button" class="btn btn-primary btn-block mx-auto" @onclick=@(async () => Publish("unpublish"))>Unpublish Page</button>
@ -510,8 +510,8 @@
if (permissionstring.PermissionName == PermissionNames.View) if (permissionstring.PermissionName == PermissionNames.View)
{ {
List<string> ids = permissionstring.Permissions.Split(';').ToList(); List<string> ids = permissionstring.Permissions.Split(';').ToList();
if (!ids.Contains(Constants.AllUsersRole)) ids.Add(Constants.AllUsersRole); if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
if (!ids.Contains(Constants.RegisteredRole)) ids.Add(Constants.RegisteredRole); if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
permissionstring.Permissions = string.Join(";", ids.ToArray()); permissionstring.Permissions = string.Join(";", ids.ToArray());
} }
} }
@ -531,12 +531,12 @@
switch (action) switch (action)
{ {
case "publish": case "publish":
if (!ids.Contains(Constants.AllUsersRole)) ids.Add(Constants.AllUsersRole); if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
if (!ids.Contains(Constants.RegisteredRole)) ids.Add(Constants.RegisteredRole); if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
break; break;
case "unpublish": case "unpublish":
ids.Remove(Constants.AllUsersRole); ids.Remove(RoleNames.Everyone);
ids.Remove(Constants.RegisteredRole); ids.Remove(RoleNames.Registered);
break; break;
} }
permissionstring.Permissions = string.Join(";", ids.ToArray()); permissionstring.Permissions = string.Join(";", ids.ToArray());

10
Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
View File

@ -33,7 +33,7 @@ namespace Oqtane.Themes.Controls
{ {
actionList.Add(new ActionViewModel {Icon = Icons.Cog, Name = "Manage Settings", Action = async (u, m) => await Settings(u, m)}); actionList.Add(new ActionViewModel {Icon = Icons.Cog, Name = "Manage Settings", Action = async (u, m) => await Settings(u, m)});
if (UserSecurity.GetPermissionStrings(ModuleState.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(Constants.AllUsersRole)) if (UserSecurity.GetPermissionStrings(ModuleState.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
{ {
actionList.Add(new ActionViewModel {Icon=Icons.CircleX, Name = "Unpublish Module", Action = async (s, m) => await Unpublish(s, m) }); actionList.Add(new ActionViewModel {Icon=Icons.CircleX, Name = "Unpublish Module", Action = async (s, m) => await Unpublish(s, m) });
} }
@ -141,8 +141,8 @@ namespace Oqtane.Themes.Controls
if (permissionstring.PermissionName == PermissionNames.View) if (permissionstring.PermissionName == PermissionNames.View)
{ {
List<string> ids = permissionstring.Permissions.Split(';').ToList(); List<string> ids = permissionstring.Permissions.Split(';').ToList();
if (!ids.Contains(Constants.AllUsersRole)) ids.Add(Constants.AllUsersRole); if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
if (!ids.Contains(Constants.RegisteredRole)) ids.Add(Constants.RegisteredRole); if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
permissionstring.Permissions = string.Join(";", ids.ToArray()); permissionstring.Permissions = string.Join(";", ids.ToArray());
} }
} }
@ -159,8 +159,8 @@ namespace Oqtane.Themes.Controls
if (permissionstring.PermissionName == PermissionNames.View) if (permissionstring.PermissionName == PermissionNames.View)
{ {
List<string> ids = permissionstring.Permissions.Split(';').ToList(); List<string> ids = permissionstring.Permissions.Split(';').ToList();
ids.Remove(Constants.AllUsersRole); ids.Remove(RoleNames.Everyone);
ids.Remove(Constants.RegisteredRole); ids.Remove(RoleNames.Registered);
permissionstring.Permissions = string.Join(";", ids.ToArray()); permissionstring.Permissions = string.Join(";", ids.ToArray());
} }
} }

4
Oqtane.Client/UI/Pane.razor
View File

@ -81,10 +81,10 @@ else
authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.Permissions); authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.Permissions);
break; break;
case SecurityAccessLevel.Admin: case SecurityAccessLevel.Admin:
authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole); authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
break; break;
case SecurityAccessLevel.Host: case SecurityAccessLevel.Host:
authorized = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole); authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
break; break;
} }
} }

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

@ -32,7 +32,7 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public IEnumerable<Alias> Get() public IEnumerable<Alias> Get()
{ {
return _aliases.GetAliases(); return _aliases.GetAliases();
@ -40,7 +40,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Alias Get(int id) public Alias Get(int id)
{ {
return _aliases.GetAlias(id); return _aliases.GetAlias(id);
@ -86,7 +86,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Alias Post([FromBody] Alias alias) public Alias Post([FromBody] Alias alias)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -99,7 +99,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Alias Put(int id, [FromBody] Alias alias) public Alias Put(int id, [FromBody] Alias alias)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -112,7 +112,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id) public void Delete(int id)
{ {
_aliases.DeleteAlias(id); _aliases.DeleteAlias(id);

8
Oqtane.Server/Controllers/FileController.cs
View File

@ -58,7 +58,7 @@ namespace Oqtane.Controllers
} }
else else
{ {
if (User.IsInRole(Constants.HostRole)) if (User.IsInRole(RoleNames.Host))
{ {
folder = GetFolderPath(folder); folder = GetFolderPath(folder);
if (Directory.Exists(folder)) if (Directory.Exists(folder))
@ -132,7 +132,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Models.File Put(int id, [FromBody] Models.File file) public Models.File Put(int id, [FromBody] Models.File file)
{ {
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.FolderId, PermissionNames.Edit)) if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.FolderId, PermissionNames.Edit))
@ -164,7 +164,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id) public void Delete(int id)
{ {
Models.File file = _files.GetFile(id); Models.File file = _files.GetFile(id);
@ -282,7 +282,7 @@ namespace Oqtane.Controllers
} }
else else
{ {
if (User.IsInRole(Constants.HostRole)) if (User.IsInRole(RoleNames.Host))
{ {
folderPath = GetFolderPath(folder); folderPath = GetFolderPath(folder);
} }

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

@ -93,7 +93,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Folder Post([FromBody] Folder folder) public Folder Post([FromBody] Folder folder)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -106,7 +106,7 @@ namespace Oqtane.Controllers
else else
{ {
permissions = new List<Permission> { permissions = new List<Permission> {
new Permission(PermissionNames.Edit, Constants.AdminRole, true), new Permission(PermissionNames.Edit, RoleNames.Admin, true),
}.EncodePermissions(); }.EncodePermissions();
} }
if (_userPermissions.IsAuthorized(User, PermissionNames.Edit, permissions)) if (_userPermissions.IsAuthorized(User, PermissionNames.Edit, permissions))
@ -141,7 +141,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Folder Put(int id, [FromBody] Folder folder) public Folder Put(int id, [FromBody] Folder folder)
{ {
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, folder.FolderId, PermissionNames.Edit)) if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, folder.FolderId, PermissionNames.Edit))
@ -182,7 +182,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/?siteid=x&folderid=y&parentid=z // PUT api/<controller>/?siteid=x&folderid=y&parentid=z
[HttpPut] [HttpPut]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Put(int siteid, int folderid, int? parentid) public void Put(int siteid, int folderid, int? parentid)
{ {
if (_userPermissions.IsAuthorized(User, EntityNames.Folder, folderid, PermissionNames.Edit)) if (_userPermissions.IsAuthorized(User, EntityNames.Folder, folderid, PermissionNames.Edit))
@ -209,7 +209,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id) public void Delete(int id)
{ {
if (_userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit)) if (_userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit))

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

@ -36,7 +36,7 @@ namespace Oqtane.Controllers
{ {
var installation = new Installation {Success = false, Message = ""}; var installation = new Installation {Success = false, Message = ""};
if (ModelState.IsValid && (User.IsInRole(Constants.HostRole) || string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey)))) if (ModelState.IsValid && (User.IsInRole(RoleNames.Host) || string.IsNullOrEmpty(_config.GetConnectionString(SettingKeys.ConnectionStringKey))))
{ {
installation = _databaseManager.Install(config); installation = _databaseManager.Install(config);
} }
@ -57,7 +57,7 @@ namespace Oqtane.Controllers
} }
[HttpGet("upgrade")] [HttpGet("upgrade")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public Installation Upgrade() public Installation Upgrade()
{ {
var installation = new Installation {Success = true, Message = ""}; var installation = new Installation {Success = true, Message = ""};

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

@ -28,7 +28,7 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public IEnumerable<Job> Get() public IEnumerable<Job> Get()
{ {
return _jobs.GetJobs(); return _jobs.GetJobs();
@ -36,7 +36,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public Job Get(int id) public Job Get(int id)
{ {
return _jobs.GetJob(id); return _jobs.GetJob(id);
@ -44,7 +44,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public Job Post([FromBody] Job job) public Job Post([FromBody] Job job)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -57,7 +57,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public Job Put(int id, [FromBody] Job job) public Job Put(int id, [FromBody] Job job)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -70,7 +70,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Delete(int id) public void Delete(int id)
{ {
_jobs.DeleteJob(id); _jobs.DeleteJob(id);
@ -79,7 +79,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/start // GET api/<controller>/start
[HttpGet("start/{id}")] [HttpGet("start/{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Start(int id) public void Start(int id)
{ {
Job job = _jobs.GetJob(id); Job job = _jobs.GetJob(id);
@ -93,7 +93,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/stop // GET api/<controller>/stop
[HttpGet("stop/{id}")] [HttpGet("stop/{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Stop(int id) public void Stop(int id)
{ {
Job job = _jobs.GetJob(id); Job job = _jobs.GetJob(id);

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

@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public IEnumerable<JobLog> Get() public IEnumerable<JobLog> Get()
{ {
return _jobLogs.GetJobLogs(); return _jobLogs.GetJobLogs();
@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public JobLog Get(int id) public JobLog Get(int id)
{ {
return _jobLogs.GetJobLog(id); return _jobLogs.GetJobLog(id);
@ -39,7 +39,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public JobLog Post([FromBody] JobLog jobLog) public JobLog Post([FromBody] JobLog jobLog)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -52,7 +52,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public JobLog Put(int id, [FromBody] JobLog jobLog) public JobLog Put(int id, [FromBody] JobLog jobLog)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -65,7 +65,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Delete(int id) public void Delete(int id)
{ {
_jobLogs.DeleteJobLog(id); _jobLogs.DeleteJobLog(id);

4
Oqtane.Server/Controllers/LogController.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/<controller>?siteid=x&level=y&function=z&rows=50 // GET: api/<controller>?siteid=x&level=y&function=z&rows=50
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public IEnumerable<Log> Get(string siteid, string level, string function, string rows) public IEnumerable<Log> Get(string siteid, string level, string function, string rows)
{ {
return _logs.GetLogs(int.Parse(siteid), level, function, int.Parse(rows)); return _logs.GetLogs(int.Parse(siteid), level, function, int.Parse(rows));
@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Log Get(int id) public Log Get(int id)
{ {
return _logs.GetLog(id); return _logs.GetLog(id);

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

@ -89,7 +89,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Module Post([FromBody] Module module) public Module Post([FromBody] Module module)
{ {
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, module.PageId, PermissionNames.Edit)) if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, module.PageId, PermissionNames.Edit))
@ -108,7 +108,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Module Put(int id, [FromBody] Module module) public Module Put(int id, [FromBody] Module module)
{ {
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit)) if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
@ -140,7 +140,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id) public void Delete(int id)
{ {
if (_userPermissions.IsAuthorized(User, EntityNames.Module, id, PermissionNames.Edit)) if (_userPermissions.IsAuthorized(User, EntityNames.Module, id, PermissionNames.Edit))
@ -157,7 +157,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/export?moduleid=x // GET api/<controller>/export?moduleid=x
[HttpGet("export")] [HttpGet("export")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public string Export(int moduleid) public string Export(int moduleid)
{ {
string content = ""; string content = "";
@ -175,7 +175,7 @@ namespace Oqtane.Controllers
// POST api/<controller>/import?moduleid=x // POST api/<controller>/import?moduleid=x
[HttpPost("import")] [HttpPost("import")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public bool Import(int moduleid, [FromBody] string content) public bool Import(int moduleid, [FromBody] string content)
{ {
bool success = false; bool success = false;

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

@ -81,7 +81,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public void Put(int id, [FromBody] ModuleDefinition moduleDefinition) public void Put(int id, [FromBody] ModuleDefinition moduleDefinition)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -92,7 +92,7 @@ namespace Oqtane.Controllers
} }
[HttpGet("install")] [HttpGet("install")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void InstallModules() public void InstallModules()
{ {
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed"); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
@ -101,7 +101,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5?siteid=x // DELETE api/<controller>/5?siteid=x
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Delete(int id, int siteid) public void Delete(int id, int siteid)
{ {
ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, siteid); ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, siteid);
@ -168,7 +168,7 @@ namespace Oqtane.Controllers
// POST api/<controller>?moduleid=x // POST api/<controller>?moduleid=x
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Post([FromBody] ModuleDefinition moduleDefinition, string moduleid) public void Post([FromBody] ModuleDefinition moduleDefinition, string moduleid)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)

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

@ -26,7 +26,7 @@ namespace Oqtane.Controllers
// GET: api/<controller>?siteid=x&type=y&userid=z // GET: api/<controller>?siteid=x&type=y&userid=z
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public IEnumerable<Notification> Get(string siteid, string direction, string userid) public IEnumerable<Notification> Get(string siteid, string direction, string userid)
{ {
IEnumerable<Notification> notifications = null; IEnumerable<Notification> notifications = null;
@ -46,7 +46,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Notification Get(int id) public Notification Get(int id)
{ {
Notification notification = _notifications.GetNotification(id); Notification notification = _notifications.GetNotification(id);
@ -59,7 +59,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Notification Post([FromBody] Notification notification) public Notification Post([FromBody] Notification notification)
{ {
if (IsAuthorized(notification.FromUserId)) if (IsAuthorized(notification.FromUserId))
@ -72,7 +72,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Notification Put(int id, [FromBody] Notification notification) public Notification Put(int id, [FromBody] Notification notification)
{ {
if (IsAuthorized(notification.FromUserId)) if (IsAuthorized(notification.FromUserId))
@ -85,7 +85,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id) public void Delete(int id)
{ {
Notification notification = _notifications.GetNotification(id); Notification notification = _notifications.GetNotification(id);

4
Oqtane.Server/Controllers/PackageController.cs
View File

@ -27,7 +27,7 @@ namespace Oqtane.Controllers
// GET: api/<controller>?tag=x // GET: api/<controller>?tag=x
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public async Task<IEnumerable<Package>> Get(string tag) public async Task<IEnumerable<Package>> Get(string tag)
{ {
List<Package> packages = new List<Package>(); List<Package> packages = new List<Package>();
@ -56,7 +56,7 @@ namespace Oqtane.Controllers
} }
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public async Task Post(string packageid, string version, string folder) public async Task Post(string packageid, string version, string folder)
{ {
using (var httpClient = new HttpClient()) using (var httpClient = new HttpClient())

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

@ -102,7 +102,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Page Post([FromBody] Page page) public Page Post([FromBody] Page page)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -115,7 +115,7 @@ namespace Oqtane.Controllers
else else
{ {
permissions = new List<Permission> { permissions = new List<Permission> {
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(); }.EncodePermissions();
} }
@ -147,7 +147,7 @@ namespace Oqtane.Controllers
// POST api/<controller>/5?userid=x // POST api/<controller>/5?userid=x
[HttpPost("{id}")] [HttpPost("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Page Post(int id, string userid) public Page Post(int id, string userid)
{ {
Page page = null; Page page = null;
@ -213,7 +213,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Page Put(int id, [FromBody] Page page) public Page Put(int id, [FromBody] Page page)
{ {
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit)) if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
@ -233,7 +233,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/?siteid=x&pageid=y&parentid=z // PUT api/<controller>/?siteid=x&pageid=y&parentid=z
[HttpPut] [HttpPut]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Put(int siteid, int pageid, int? parentid) public void Put(int siteid, int pageid, int? parentid)
{ {
if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit)) if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
@ -261,7 +261,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id) public void Delete(int id)
{ {
Page page = _pages.GetPage(id); Page page = _pages.GetPage(id);

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

@ -65,7 +65,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public PageModule Post([FromBody] PageModule pageModule) public PageModule Post([FromBody] PageModule pageModule)
{ {
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit)) if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
@ -85,7 +85,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public PageModule Put(int id, [FromBody] PageModule pageModule) public PageModule Put(int id, [FromBody] PageModule pageModule)
{ {
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, pageModule.ModuleId, PermissionNames.Edit)) if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, pageModule.ModuleId, PermissionNames.Edit))
@ -105,7 +105,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/?pageid=x&pane=y // PUT api/<controller>/?pageid=x&pane=y
[HttpPut] [HttpPut]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Put(int pageid, string pane) public void Put(int pageid, string pane)
{ {
if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit)) if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
@ -133,7 +133,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id) public void Delete(int id)
{ {
PageModule pagemodule = _pageModules.GetPageModule(id); PageModule pagemodule = _pageModules.GetPageModule(id);

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

@ -37,7 +37,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Profile Post([FromBody] Profile profile) public Profile Post([FromBody] Profile profile)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -50,7 +50,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Profile Put(int id, [FromBody] Profile profile) public Profile Put(int id, [FromBody] Profile profile)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -63,7 +63,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id) public void Delete(int id)
{ {
_profiles.DeleteProfile(id); _profiles.DeleteProfile(id);

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

@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/<controller>?siteid=x // GET: api/<controller>?siteid=x
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public IEnumerable<Role> Get(string siteid) public IEnumerable<Role> Get(string siteid)
{ {
return _roles.GetRoles(int.Parse(siteid)); return _roles.GetRoles(int.Parse(siteid));
@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public Role Get(int id) public Role Get(int id)
{ {
return _roles.GetRole(id); return _roles.GetRole(id);
@ -39,7 +39,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Role Post([FromBody] Role role) public Role Post([FromBody] Role role)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -52,7 +52,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Role Put(int id, [FromBody] Role role) public Role Put(int id, [FromBody] Role role)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -65,7 +65,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id) public void Delete(int id)
{ {
_roles.DeleteRole(id); _roles.DeleteRole(id);

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

@ -124,10 +124,10 @@ namespace Oqtane.Controllers
switch (entityName) switch (entityName)
{ {
case EntityNames.Tenant: case EntityNames.Tenant:
authorized = User.IsInRole(Constants.HostRole); authorized = User.IsInRole(RoleNames.Host);
break; break;
case EntityNames.Site: case EntityNames.Site:
authorized = User.IsInRole(Constants.AdminRole); authorized = User.IsInRole(RoleNames.Admin);
break; break;
case EntityNames.Page: case EntityNames.Page:
case EntityNames.Module: case EntityNames.Module:
@ -138,7 +138,7 @@ namespace Oqtane.Controllers
authorized = true; authorized = true;
if (permissionName == PermissionNames.Edit) if (permissionName == PermissionNames.Edit)
{ {
authorized = User.IsInRole(Constants.AdminRole) || (_userPermissions.GetUser(User).UserId == entityId); authorized = User.IsInRole(RoleNames.Admin) || (_userPermissions.GetUser(User).UserId == entityId);
} }
break; break;
} }

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

@ -28,7 +28,7 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public IEnumerable<Site> Get() public IEnumerable<Site> Get()
{ {
return _sites.GetSites(); return _sites.GetSites();
@ -57,7 +57,7 @@ namespace Oqtane.Controllers
} }
else else
{ {
authorized = User.IsInRole(Constants.HostRole); authorized = User.IsInRole(RoleNames.Host);
} }
if (authorized) if (authorized)
{ {
@ -70,7 +70,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Site Put(int id, [FromBody] Site site) public Site Put(int id, [FromBody] Site site)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -84,7 +84,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Delete(int id) public void Delete(int id)
{ {
_sites.DeleteSite(id); _sites.DeleteSite(id);

2
Oqtane.Server/Controllers/SiteTemplateController.cs
View File

@ -19,7 +19,7 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public IEnumerable<SiteTemplate> Get() public IEnumerable<SiteTemplate> Get()
{ {
return _siteTemplates.GetSiteTemplates(); return _siteTemplates.GetSiteTemplates();

2
Oqtane.Server/Controllers/SqlController.cs
View File

@ -30,7 +30,7 @@ namespace Oqtane.Controllers
// POST: api/<controller> // POST: api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public SqlQuery Post([FromBody] SqlQuery sqlquery) public SqlQuery Post([FromBody] SqlQuery sqlquery)
{ {
var results = new List<Dictionary<string, string>>(); var results = new List<Dictionary<string, string>>();

2
Oqtane.Server/Controllers/SystemController.cs
View File

@ -19,7 +19,7 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public Dictionary<string, string> Get() public Dictionary<string, string> Get()
{ {
Dictionary<string, string> systeminfo = new Dictionary<string, string>(); Dictionary<string, string> systeminfo = new Dictionary<string, string>();

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

@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public IEnumerable<Tenant> Get() public IEnumerable<Tenant> Get()
{ {
return _tenants.GetTenants(); return _tenants.GetTenants();
@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public Tenant Get(int id) public Tenant Get(int id)
{ {
return _tenants.GetTenant(id); return _tenants.GetTenant(id);
@ -39,7 +39,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public Tenant Post([FromBody] Tenant tenant) public Tenant Post([FromBody] Tenant tenant)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -52,7 +52,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public Tenant Put(int id, [FromBody] Tenant tenant) public Tenant Put(int id, [FromBody] Tenant tenant)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -65,7 +65,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Delete(int id) public void Delete(int id)
{ {
_tenants.DeleteTenant(id); _tenants.DeleteTenant(id);

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

@ -34,14 +34,14 @@ namespace Oqtane.Controllers
// GET: api/<controller> // GET: api/<controller>
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.RegisteredRole)] [Authorize(Roles = RoleNames.Registered)]
public IEnumerable<Theme> Get() public IEnumerable<Theme> Get()
{ {
return _themes.GetThemes(); return _themes.GetThemes();
} }
[HttpGet("install")] [HttpGet("install")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void InstallThemes() public void InstallThemes()
{ {
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed"); _logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed");
@ -50,7 +50,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/xxx // DELETE api/<controller>/xxx
[HttpDelete("{themename}")] [HttpDelete("{themename}")]
[Authorize(Roles = Constants.HostRole)] [Authorize(Roles = RoleNames.Host)]
public void Delete(string themename) public void Delete(string themename)
{ {
List<Theme> themes = _themes.GetThemes().ToList(); List<Theme> themes = _themes.GetThemes().ToList();

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

@ -77,7 +77,7 @@ namespace Oqtane.Controllers
private User Filter(User user) private User Filter(User user)
{ {
if (user != null && !User.IsInRole(Constants.AdminRole) && User.Identity.Name?.ToLower() != user.Username.ToLower()) if (user != null && !User.IsInRole(RoleNames.Admin) && User.Identity.Name?.ToLower() != user.Username.ToLower())
{ {
user.DisplayName = ""; user.DisplayName = "";
user.Email = ""; user.Email = "";
@ -118,7 +118,7 @@ namespace Oqtane.Controllers
bool verified; bool verified;
bool allowregistration; bool allowregistration;
if (user.Username == Constants.HostUser || User.IsInRole(Constants.AdminRole)) if (user.Username == Constants.HostUser || User.IsInRole(RoleNames.Admin))
{ {
verified = true; verified = true;
allowregistration = true; allowregistration = true;
@ -166,7 +166,7 @@ namespace Oqtane.Controllers
// assign to host role if this is the host user ( initial installation ) // assign to host role if this is the host user ( initial installation )
if (user.Username == Constants.HostUser) if (user.Username == Constants.HostUser)
{ {
int hostroleid = _roles.GetRoles(user.SiteId, true).Where(item => item.Name == Constants.HostRole).FirstOrDefault().RoleId; int hostroleid = _roles.GetRoles(user.SiteId, true).Where(item => item.Name == RoleNames.Host).FirstOrDefault().RoleId;
UserRole userrole = new UserRole(); UserRole userrole = new UserRole();
userrole.UserId = newUser.UserId; userrole.UserId = newUser.UserId;
userrole.RoleId = hostroleid; userrole.RoleId = hostroleid;
@ -190,7 +190,7 @@ namespace Oqtane.Controllers
Permissions = new List<Permission> Permissions = new List<Permission>
{ {
new Permission(PermissionNames.Browse, newUser.UserId, true), new Permission(PermissionNames.Browse, newUser.UserId, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, newUser.UserId, true) new Permission(PermissionNames.Edit, newUser.UserId, true)
}.EncodePermissions() }.EncodePermissions()
}); });
@ -242,7 +242,7 @@ namespace Oqtane.Controllers
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
if (User.IsInRole(Constants.AdminRole) || User.Identity.Name == user.Username) if (User.IsInRole(RoleNames.Admin) || User.Identity.Name == user.Username)
{ {
if (user.Password != "") if (user.Password != "")
{ {
@ -270,7 +270,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5?siteid=x // DELETE api/<controller>/5?siteid=x
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public async Task Delete(int id) public async Task Delete(int id)
{ {
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(_users.GetUser(id).Username); IdentityUser identityuser = await _identityUserManager.FindByNameAsync(_users.GetUser(id).Username);
@ -460,9 +460,9 @@ namespace Oqtane.Controllers
foreach (UserRole userrole in userroles) foreach (UserRole userrole in userroles)
{ {
roles += userrole.Role.Name + ";"; roles += userrole.Role.Name + ";";
if (userrole.Role.Name == Constants.HostRole && userroles.Where(item => item.Role.Name == Constants.AdminRole).FirstOrDefault() == null) if (userrole.Role.Name == RoleNames.Host && userroles.Where(item => item.Role.Name == RoleNames.Admin).FirstOrDefault() == null)
{ {
roles += Constants.AdminRole + ";"; roles += RoleNames.Admin + ";";
} }
} }
if (roles != "") roles = ";" + roles; if (roles != "") roles = ";" + roles;

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

@ -27,7 +27,7 @@ namespace Oqtane.Controllers
// GET: api/<controller>?siteid=x // GET: api/<controller>?siteid=x
[HttpGet] [HttpGet]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public IEnumerable<UserRole> Get(string siteid) public IEnumerable<UserRole> Get(string siteid)
{ {
return _userRoles.GetUserRoles(int.Parse(siteid)); return _userRoles.GetUserRoles(int.Parse(siteid));
@ -35,7 +35,7 @@ namespace Oqtane.Controllers
// GET api/<controller>/5 // GET api/<controller>/5
[HttpGet("{id}")] [HttpGet("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public UserRole Get(int id) public UserRole Get(int id)
{ {
return _userRoles.GetUserRole(id); return _userRoles.GetUserRole(id);
@ -43,7 +43,7 @@ namespace Oqtane.Controllers
// POST api/<controller> // POST api/<controller>
[HttpPost] [HttpPost]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public UserRole Post([FromBody] UserRole userRole) public UserRole Post([FromBody] UserRole userRole)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -57,7 +57,7 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5 // PUT api/<controller>/5
[HttpPut("{id}")] [HttpPut("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public UserRole Put(int id, [FromBody] UserRole userRole) public UserRole Put(int id, [FromBody] UserRole userRole)
{ {
if (ModelState.IsValid) if (ModelState.IsValid)
@ -71,7 +71,7 @@ namespace Oqtane.Controllers
// DELETE api/<controller>/5 // DELETE api/<controller>/5
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize(Roles = Constants.AdminRole)] [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id) public void Delete(int id)
{ {
UserRole userRole = _userRoles.GetUserRole(id); UserRole userRole = _userRoles.GetUserRole(id);

4
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -458,7 +458,7 @@ namespace Oqtane.Infrastructure
}; };
user = users.AddUser(user); user = users.AddUser(user);
var hostRoleId = roles.GetRoles(user.SiteId, true).FirstOrDefault(item => item.Name == Constants.HostRole)?.RoleId ?? 0; var hostRoleId = roles.GetRoles(user.SiteId, true).FirstOrDefault(item => item.Name == RoleNames.Host)?.RoleId ?? 0;
var userRole = new UserRole { UserId = user.UserId, RoleId = hostRoleId, EffectiveDate = null, ExpiryDate = null }; var userRole = new UserRole { UserId = user.UserId, RoleId = hostRoleId, EffectiveDate = null, ExpiryDate = null };
userroles.AddUserRole(userRole); userroles.AddUserRole(userRole);
@ -477,7 +477,7 @@ namespace Oqtane.Infrastructure
Permissions = new List<Permission> Permissions = new List<Permission>
{ {
new Permission(PermissionNames.Browse, user.UserId, true), new Permission(PermissionNames.Browse, user.UserId, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, user.UserId, true), new Permission(PermissionNames.Edit, user.UserId, true),
}.EncodePermissions(), }.EncodePermissions(),
}); });

48
Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
View File

@ -43,16 +43,16 @@ namespace Oqtane.SiteTemplates
IsNavigation = true, IsNavigation = true,
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> { PagePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions() , }.EncodePermissions() ,
PageTemplateModules = new List<PageTemplateModule> { PageTemplateModules = new List<PageTemplateModule> {
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content", new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content",
ModulePermissions = new List<Permission> { ModulePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> that provides advanced functionality for developing web and mobile applications on ASP.NET Core. It leverages the revolutionary new Blazor component model to compose a <b>fully dynamic</b> web development experience which can be hosted either client-side or server-side. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" + Content = "<p><a href=\"https://www.oqtane.org\" target=\"_new\">Oqtane</a> is an open source <b>modular application framework</b> that provides advanced functionality for developing web and mobile applications on ASP.NET Core. It leverages the revolutionary new Blazor component model to compose a <b>fully dynamic</b> web development experience which can be hosted either client-side or server-side. Whether you are looking for a platform to <b>accelerate your web development</b> efforts, or simply interested in exploring the anatomy of a large-scale Blazor application, Oqtane provides a solid foundation based on proven enterprise architectural principles.</p>" +
"<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane-white.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" + "<p align=\"center\"><a href=\"https://www.oqtane.org\" target=\"_new\"><img class=\"img-fluid\" src=\"oqtane-white.png\"></a></p><p align=\"center\"><a class=\"btn btn-primary\" href=\"https://www.oqtane.org/Community\" target=\"_new\">Join Our Community</a>&nbsp;&nbsp;<a class=\"btn btn-primary\" href=\"https://github.com/oqtane/oqtane.framework\" target=\"_new\">Clone Our Repo</a></p>" +
@ -61,9 +61,9 @@ namespace Oqtane.SiteTemplates
}, },
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content", new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content",
ModulePermissions = new List<Permission> { ModulePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "<p>Copyright (c) 2019-2020 .NET Foundation</p>" + Content = "<p>Copyright (c) 2019-2020 .NET Foundation</p>" +
"<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>" + "<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>" +
@ -72,9 +72,9 @@ namespace Oqtane.SiteTemplates
}, },
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
ModulePermissions = new List<Permission> { ModulePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, RoleNames.Registered, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "<p>Oqtane allows you to control access to your content using security roles. This module is only visible to Registered Users of the site.</p>" Content = "<p>Oqtane allows you to control access to your content using security roles. This module is only visible to Registered Users of the site.</p>"
} }
@ -89,16 +89,16 @@ namespace Oqtane.SiteTemplates
IsNavigation = true, IsNavigation = true,
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> { PagePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, RoleNames.Registered, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> { PageTemplateModules = new List<PageTemplateModule> {
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content", new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
ModulePermissions = new List<Permission> { ModulePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, RoleNames.Registered, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "<p>Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.</p>" Content = "<p>Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.</p>"
} }
@ -113,16 +113,16 @@ namespace Oqtane.SiteTemplates
IsNavigation = true, IsNavigation = true,
IsPersonalizable = true, IsPersonalizable = true,
PagePermissions = new List<Permission> { PagePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> { PageTemplateModules = new List<PageTemplateModule> {
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content", new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content",
ModulePermissions = new List<Permission> { ModulePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "<p>Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.</p>" Content = "<p>Oqtane offers native support for user personalized pages. If a page is identified as personalizable by the site administrator in the page settings, when an authenticated user visits the page they will see an edit button at the top right corner of the page next to their username. When they click this button the sytem will create a new version of the page and allow them to edit the page content.</p>"
} }

6
Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs
View File

@ -31,9 +31,9 @@ namespace Oqtane.SiteTemplates
IsNavigation = true, IsNavigation = true,
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> { PagePermissions = new List<Permission> {
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule>() PageTemplateModules = new List<PageTemplateModule>()
}); });

12
Oqtane.Server/Infrastructure/UpgradeManager.cs
View File

@ -40,9 +40,9 @@ namespace Oqtane.Infrastructure
// EditMode = false, // EditMode = false,
// PagePermissions = new List<Permission> // PagePermissions = new List<Permission>
// { // {
// new Permission(PermissionNames.View, Constants.AdminRole, true), // new Permission(PermissionNames.View, RoleNames.Admin, true),
// new Permission(PermissionNames.View, Constants.AllUsersRole, true), // new Permission(PermissionNames.View, RoleNames.Everyone, true),
// new Permission(PermissionNames.Edit, Constants.AdminRole, true) // new Permission(PermissionNames.Edit, RoleNames.Admin, true)
// }.EncodePermissions(), // }.EncodePermissions(),
// PageTemplateModules = new List<PageTemplateModule> // PageTemplateModules = new List<PageTemplateModule>
// { // {
@ -51,9 +51,9 @@ namespace Oqtane.Infrastructure
// ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "Test", Pane = "Content", // ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "Test", Pane = "Content",
// ModulePermissions = new List<Permission> // ModulePermissions = new List<Permission>
// { // {
// new Permission(PermissionNames.View, Constants.AdminRole, true), // new Permission(PermissionNames.View, RoleNames.Admin, true),
// new Permission(PermissionNames.View, Constants.AllUsersRole, true), // new Permission(PermissionNames.View, RoleNames.Everyone, true),
// new Permission(PermissionNames.Edit, Constants.AdminRole, true) // new Permission(PermissionNames.Edit, RoleNames.Admin, true)
// }.EncodePermissions(), // }.EncodePermissions(),
// Content = "" // Content = ""
// } // }

6
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -239,15 +239,15 @@ namespace Oqtane.Repository
{ {
moduledefinition.Permissions = new List<Permission> moduledefinition.Permissions = new List<Permission>
{ {
new Permission(PermissionNames.Utilize, Constants.AdminRole, true) new Permission(PermissionNames.Utilize, RoleNames.Admin, true)
}.EncodePermissions(); }.EncodePermissions();
} }
else else
{ {
moduledefinition.Permissions = new List<Permission> moduledefinition.Permissions = new List<Permission>
{ {
new Permission(PermissionNames.Utilize, Constants.AdminRole, true), new Permission(PermissionNames.Utilize, RoleNames.Admin, true),
new Permission(PermissionNames.Utilize, Constants.RegisteredRole, true) new Permission(PermissionNames.Utilize, RoleNames.Registered, true)
}.EncodePermissions(); }.EncodePermissions();
} }

208
Oqtane.Server/Repository/SiteRepository.cs
View File

@ -60,9 +60,9 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -71,9 +71,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -89,9 +89,9 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -100,9 +100,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -119,9 +119,9 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -130,9 +130,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -148,9 +148,9 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, RoleNames.Registered, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -159,9 +159,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.RegisteredRole, true), new Permission(PermissionNames.View, RoleNames.Registered, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -174,8 +174,8 @@ namespace Oqtane.Repository
Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false, Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -184,8 +184,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -201,8 +201,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -211,8 +211,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -228,8 +228,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -238,8 +238,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -255,8 +255,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -265,8 +265,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -282,8 +282,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -292,8 +292,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -309,8 +309,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -319,8 +319,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -336,8 +336,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -346,8 +346,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -363,8 +363,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -373,8 +373,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -392,8 +392,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -402,8 +402,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -418,8 +418,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -428,8 +428,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Tenants.Index).ToModuleDefinitionName(), Title = "Tenant Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Tenants.Index).ToModuleDefinitionName(), Title = "Tenant Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -440,8 +440,8 @@ namespace Oqtane.Repository
Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = Icons.Globe, IsNavigation = false, IsPersonalizable = false, Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = Icons.Globe, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -450,8 +450,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -462,8 +462,8 @@ namespace Oqtane.Repository
Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = Icons.Browser, IsNavigation = false, IsPersonalizable = false, Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = Icons.Browser, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -472,8 +472,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -484,8 +484,8 @@ namespace Oqtane.Repository
Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = Icons.Brush, IsNavigation = false, IsPersonalizable = false, Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = Icons.Brush, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -494,8 +494,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -506,8 +506,8 @@ namespace Oqtane.Repository
Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = Icons.Timer, IsNavigation = false, IsPersonalizable = false, Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = Icons.Timer, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -516,8 +516,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -533,8 +533,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -543,8 +543,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -560,8 +560,8 @@ namespace Oqtane.Repository
IsPersonalizable = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -570,8 +570,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -582,8 +582,8 @@ namespace Oqtane.Repository
Name = "System Update", Parent = "Admin", Path = "admin/update", Icon = Icons.Aperture, IsNavigation = false, IsPersonalizable = false, Name = "System Update", Parent = "Admin", Path = "admin/update", Icon = Icons.Aperture, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List<Permission> PagePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
PageTemplateModules = new List<PageTemplateModule> PageTemplateModules = new List<PageTemplateModule>
{ {
@ -592,8 +592,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = "Content", ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = "Content",
ModulePermissions = new List<Permission> ModulePermissions = new List<Permission>
{ {
new Permission(PermissionNames.View, Constants.HostRole, true), new Permission(PermissionNames.View, RoleNames.Host, true),
new Permission(PermissionNames.Edit, Constants.HostRole, true) new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(), }.EncodePermissions(),
Content = "" Content = ""
} }
@ -640,18 +640,18 @@ namespace Oqtane.Repository
{ {
// create default entities for site // create default entities for site
List<Role> roles = _roleRepository.GetRoles(site.SiteId, true).ToList(); List<Role> roles = _roleRepository.GetRoles(site.SiteId, true).ToList();
if (!roles.Where(item => item.Name == Constants.AllUsersRole).Any()) if (!roles.Where(item => item.Name == RoleNames.Everyone).Any())
{ {
_roleRepository.AddRole(new Role {SiteId = null, Name = Constants.AllUsersRole, Description = "All Users", IsAutoAssigned = false, IsSystem = true}); _roleRepository.AddRole(new Role {SiteId = null, Name = RoleNames.Everyone, Description = "All Users", IsAutoAssigned = false, IsSystem = true});
} }
if (!roles.Where(item => item.Name == Constants.HostRole).Any()) if (!roles.Where(item => item.Name == RoleNames.Host).Any())
{ {
_roleRepository.AddRole(new Role {SiteId = null, Name = Constants.HostRole, Description = "Application Administrators", IsAutoAssigned = false, IsSystem = true}); _roleRepository.AddRole(new Role {SiteId = null, Name = RoleNames.Host, Description = "Application Administrators", IsAutoAssigned = false, IsSystem = true});
} }
_roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = Constants.RegisteredRole, Description = "Registered Users", IsAutoAssigned = true, IsSystem = true}); _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Registered, Description = "Registered Users", IsAutoAssigned = true, IsSystem = true});
_roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = Constants.AdminRole, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true}); _roleRepository.AddRole(new Role {SiteId = site.SiteId, Name = RoleNames.Admin, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true});
_profileRepository.AddProfile(new Profile _profileRepository.AddProfile(new Profile
{SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false}); {SiteId = site.SiteId, Name = "FirstName", Title = "First Name", Description = "Your First Or Given Name", Category = "Name", ViewOrder = 1, MaxLength = 50, DefaultValue = "", IsRequired = true, IsPrivate = false});
@ -675,9 +675,9 @@ namespace Oqtane.Repository
SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true, SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true,
Permissions = new List<Permission> Permissions = new List<Permission>
{ {
new Permission(PermissionNames.Browse, Constants.AdminRole, true), new Permission(PermissionNames.Browse, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AllUsersRole, true), new Permission(PermissionNames.View, RoleNames.Everyone, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions() }.EncodePermissions()
}); });
_folderRepository.AddFolder(new Folder _folderRepository.AddFolder(new Folder
@ -685,9 +685,9 @@ namespace Oqtane.Repository
SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = Utilities.PathCombine("Users",Path.DirectorySeparatorChar.ToString()), Order = 1, IsSystem = true, SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = Utilities.PathCombine("Users",Path.DirectorySeparatorChar.ToString()), Order = 1, IsSystem = true,
Permissions = new List<Permission> Permissions = new List<Permission>
{ {
new Permission(PermissionNames.Browse, Constants.AdminRole, true), new Permission(PermissionNames.Browse, RoleNames.Admin, true),
new Permission(PermissionNames.View, Constants.AdminRole, true), new Permission(PermissionNames.View, RoleNames.Admin, true),
new Permission(PermissionNames.Edit, Constants.AdminRole, true) new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions() }.EncodePermissions()
}); });

10
Oqtane.Server/Security/ClaimsPrincipalFactory.cs
View File

@ -39,15 +39,15 @@ namespace Oqtane.Security
{ {
id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, userrole.Role.Name)); id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, userrole.Role.Name));
// host users are members of every site // host users are members of every site
if (userrole.Role.Name == Constants.HostRole) if (userrole.Role.Name == RoleNames.Host)
{ {
if (userroles.Where(item => item.Role.Name == Constants.RegisteredRole).FirstOrDefault() == null) if (userroles.Where(item => item.Role.Name == RoleNames.Registered).FirstOrDefault() == null)
{ {
id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, Constants.RegisteredRole)); id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, RoleNames.Registered));
} }
if (userroles.Where(item => item.Role.Name == Constants.AdminRole).FirstOrDefault() == null) if (userroles.Where(item => item.Role.Name == RoleNames.Admin).FirstOrDefault() == null)
{ {
id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, Constants.AdminRole)); id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, RoleNames.Admin));
} }
} }
} }

4
Oqtane.Shared/Security/UserSecurity.cs
View File

@ -85,14 +85,14 @@ namespace Oqtane.Security
if (permission.StartsWith("!")) if (permission.StartsWith("!"))
{ {
string denyRole = permission.Replace("!", ""); string denyRole = permission.Replace("!", "");
if (denyRole == Constants.AllUsersRole || IsAllowed(userId, roles, denyRole)) if (denyRole == RoleNames.Everyone || IsAllowed(userId, roles, denyRole))
{ {
allowed = false; allowed = false;
} }
} }
else // grant permission else // grant permission
{ {
if (permission == Constants.AllUsersRole || IsAllowed(userId, roles, permission)) if (permission == RoleNames.Everyone || IsAllowed(userId, roles, permission))
{ {
allowed = true; allowed = true;
} }

21
Oqtane.Shared/Shared/Constants.cs
View File

@ -1,10 +1,9 @@
using System; using System;
using System.Globalization; using System.Globalization;
namespace Oqtane.Shared namespace Oqtane.Shared {
{
public class Constants public class Constants {
{
public const string PackageId = "Oqtane.Framework"; public const string PackageId = "Oqtane.Framework";
public const string Version = "1.0.4"; public const string Version = "1.0.4";
public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4"; public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4";
@ -41,10 +40,16 @@ namespace Oqtane.Shared
public const string MasterTenant = "Master"; public const string MasterTenant = "Master";
public const string DefaultSite = "Default Site"; public const string DefaultSite = "Default Site";
public const string AllUsersRole = "All Users"; const string RoleObsoleteMessage = "Use the corresponding memeber from Oqtane.Shared.RoleNames";
public const string HostRole = "Host Users";
public const string AdminRole = "Administrators"; [Obsolete(RoleObsoleteMessage)]
public const string RegisteredRole = "Registered Users"; public const string AllUsersRole = RoleNames.Everyone;
[Obsolete(RoleObsoleteMessage)]
public const string HostRole = RoleNames.Host;
[Obsolete(RoleObsoleteMessage)]
public const string AdminRole = RoleNames.Admin;
[Obsolete(RoleObsoleteMessage)]
public const string RegisteredRole = RoleNames.Registered;
public const string ImageFiles = "jpg,jpeg,jpe,gif,bmp,png,svg,ico"; public const string ImageFiles = "jpg,jpeg,jpe,gif,bmp,png,svg,ico";
public const string UploadableFiles = "jpg,jpeg,jpe,gif,bmp,png,svg,ico,mov,wmv,avi,mp4,mp3,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,zip,nupkg,csv"; public const string UploadableFiles = "jpg,jpeg,jpe,gif,bmp,png,svg,ico,mov,wmv,avi,mp4,mp3,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,zip,nupkg,csv";

8
Oqtane.Shared/Shared/RoleNames.cs Normal file
View File

@ -0,0 +1,8 @@
namespace Oqtane.Shared {
public class RoleNames {
public const string Everyone = "All Users";
public const string Host = "Host Users";
public const string Admin = "Administrators";
public const string Registered = "Registered Users";
}
}