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

Oqtane.Client/Modules/Admin/Error/Index.razor

@@ -8,7 +8,7 @@
  protected override async Task OnInitializedAsync()
  {
  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;
  AddModuleMessage(message, MessageType.Error);

Oqtane.Client/Modules/Admin/Roles/Users.razor

@@ -88,7 +88,7 @@ else
  Role role = await RoleService.GetRoleAsync(roleid);
  name = role.Name;
  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();
  }
  catch (Exception ex)

Oqtane.Client/Modules/Admin/Sites/Add.razor

@@ -216,7 +216,7 @@ else
  private string _username = string.Empty;
  private string _password = string.Empty;
  private bool _integratedsecurity = true;
- private string _hostusername = Constants.HostUser;
+ private string _hostusername = UserNames.Host;
  private string _hostpassword = string.Empty;
 
  private string _name = string.Empty;
@@ -311,7 +311,7 @@ else
  // validate host credentials
  var user = new User();
  user.SiteId = PageState.Site.SiteId;
- user.Username = Constants.HostUser;
+ user.Username = UserNames.Host;
  user.Password = _hostpassword;
  user = await UserService.LoginUserAsync(user, false, false);
  if (user.IsAuthenticated)

Oqtane.Client/Modules/Admin/Tenants/Edit.razor

@@ -9,7 +9,7 @@
  <Label For="name" HelpText="The name of the tenant">Name: </Label>
  </td>
  <td>
- @if (name == Constants.MasterTenant)
+ @if (name == TenantNames.Master)
  {
  <input id="name" class="form-control" @bind="@name" readonly />
  }

Oqtane.Client/Modules/Admin/Tenants/Index.razor

@@ -17,7 +17,7 @@ else
  </Header>
  <Row>
  <td><ActionLink Action="Edit" Parameters="@($"id=" + context.TenantId.ToString())" /></td>
- <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == Constants.MasterTenant)" /></td>
+ <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == TenantNames.Master)" /></td>
  <td>@context.Name</td>
  </Row>
  </Pager>

Oqtane.Client/Modules/Admin/UserProfile/Index.razor

@@ -79,7 +79,7 @@ else
  @foreach (Profile profile in profiles)
  {
  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)
  {
@@ -299,7 +299,7 @@ else
  {
  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)))
  {

Oqtane.Client/Modules/Admin/Users/Index.razor

@@ -58,10 +58,10 @@ else
  {
  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
- .Where(item => item.Role.Name == Constants.RegisteredRole &&
+ .Where(item => item.Role.Name == RoleNames.Registered &&
  (
  item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
  item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||

Oqtane.Client/Modules/Admin/Users/Roles.razor

@@ -63,7 +63,7 @@ else
  <Row>
  <td>@context.Role.Name</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>
  }

Oqtane.Client/Modules/Controls/ActionDialog.razor

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

Oqtane.Client/Modules/Controls/ActionLink.razor

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

Oqtane.Client/Modules/Controls/FileManager.razor

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

Oqtane.Client/Modules/Controls/ModuleMessage.razor

@@ -6,7 +6,7 @@
 {
  <div class="@_classname" role="alert">
  @_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>
  }

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -103,14 +103,14 @@
  }
 
  _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>();
 
  foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
  {
  // 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))
@@ -161,7 +161,7 @@
  }
 
  private bool GetPermissionDisabled(string roleName)
- => roleName == Constants.AdminRole
+ => roleName == RoleNames.Admin
  ? true
  : false;
 
@@ -226,8 +226,8 @@
  {
  permission = _permissions[i];
  List<string> ids = permission.Permissions.Split(';').ToList();
- ids.Remove("!" + Constants.AllUsersRole); // remove deny all users
- ids.Remove("!" + Constants.RegisteredRole); // remove deny registered users
+ ids.Remove("!" + RoleNames.Everyone); // remove deny all users
+ ids.Remove("!" + RoleNames.Registered); // remove deny registered users
  permission.Permissions = string.Join(";", ids.ToArray());
  _permissions[i] = permission;
  }

Oqtane.Client/Themes/Controls/ControlPanel.razor

@@ -23,7 +23,7 @@
  </div>
  <div class="@BodyClass">
 
- @if (UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole))
+ @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
  {
  <div class="row">
  <div class="col">
@@ -51,7 +51,7 @@
  </div>
  <br />
  <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">
  <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)
  {
  List<string> ids = permissionstring.Permissions.Split(';').ToList();
- if (!ids.Contains(Constants.AllUsersRole)) ids.Add(Constants.AllUsersRole);
- if (!ids.Contains(Constants.RegisteredRole)) ids.Add(Constants.RegisteredRole);
+ if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
+ if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
  permissionstring.Permissions = string.Join(";", ids.ToArray());
  }
  }
@@ -531,12 +531,12 @@
  switch (action)
  {
  case "publish":
- if (!ids.Contains(Constants.AllUsersRole)) ids.Add(Constants.AllUsersRole);
- if (!ids.Contains(Constants.RegisteredRole)) ids.Add(Constants.RegisteredRole);
+ if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
+ if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
  break;
  case "unpublish":
- ids.Remove(Constants.AllUsersRole);
- ids.Remove(Constants.RegisteredRole);
+ ids.Remove(RoleNames.Everyone);
+ ids.Remove(RoleNames.Registered);
  break;
  }
  permissionstring.Permissions = string.Join(";", ids.ToArray());

Oqtane.Client/Themes/Controls/ModuleActionsBase.cs

@@ -33,7 +33,7 @@ protected virtual List<ActionViewModel> GetActions()
  {
  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) });
  }
@@ -141,8 +141,8 @@ private async Task<string> Publish(string s, PageModule pagemodule)
  if (permissionstring.PermissionName == PermissionNames.View)
  {
  List<string> ids = permissionstring.Permissions.Split(';').ToList();
- if (!ids.Contains(Constants.AllUsersRole)) ids.Add(Constants.AllUsersRole);
- if (!ids.Contains(Constants.RegisteredRole)) ids.Add(Constants.RegisteredRole);
+ if (!ids.Contains(RoleNames.Everyone)) ids.Add(RoleNames.Everyone);
+ if (!ids.Contains(RoleNames.Registered)) ids.Add(RoleNames.Registered);
  permissionstring.Permissions = string.Join(";", ids.ToArray());
  }
  }
@@ -159,8 +159,8 @@ private async Task<string> Unpublish(string s, PageModule pagemodule)
  if (permissionstring.PermissionName == PermissionNames.View)
  {
  List<string> ids = permissionstring.Permissions.Split(';').ToList();
- ids.Remove(Constants.AllUsersRole);
- ids.Remove(Constants.RegisteredRole);
+ ids.Remove(RoleNames.Everyone);
+ ids.Remove(RoleNames.Registered);
  permissionstring.Permissions = string.Join(";", ids.ToArray());
  }
  }

Oqtane.Client/UI/Installer.razor

@@ -131,7 +131,7 @@
  private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
  private string _username = string.Empty;
  private string _password = string.Empty;
- private string _hostUsername = Constants.HostUser;
+ private string _hostUsername = UserNames.Host;
  private string _hostPassword = string.Empty;
  private string _confirmPassword = string.Empty;
  private string _hostEmail = string.Empty;
@@ -188,8 +188,8 @@
  Aliases = uri.Authority,
  HostEmail = _hostEmail,
  HostPassword = _hostPassword,
- HostName = Constants.HostUser,
- TenantName = Constants.MasterTenant,
+ HostName = UserNames.Host,
+ TenantName = TenantNames.Master,
  IsNewTenant = true,
  SiteName = Constants.DefaultSite
  };

Oqtane.Client/UI/Pane.razor

@@ -31,7 +31,7 @@ else
 
  protected override void OnParametersSet()
  {
- if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && Name != Constants.AdminPane)
+ if (PageState.EditMode && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions) && Name != PaneNames.Admin)
  {
  _useadminborder = true;
  _paneadminborder = "app-pane-admin-border";
@@ -47,7 +47,7 @@ else
  {
  if (PageState.ModuleId != -1 && PageState.Action != Constants.DefaultAction)
  {
- if (Name.ToLower() == Constants.AdminPane.ToLower())
+ if (Name.ToLower() == PaneNames.Admin.ToLower())
  {
  Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
  if (module != null && !module.IsDeleted)
@@ -81,10 +81,10 @@ else
  authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.Permissions);
  break;
  case SecurityAccessLevel.Admin:
- authorized = UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole);
+ authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
  break;
  case SecurityAccessLevel.Host:
- authorized = UserSecurity.IsAuthorized(PageState.User, Constants.HostRole);
+ authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
  break;
  }
  }

Oqtane.Client/UI/SiteRouter.razor

@@ -505,7 +505,7 @@
  // ensure module's pane exists in current page and if not, assign it to the Admin pane
  if (page.Panes == null || page.Panes.FindIndex(item => item.Equals(module.Pane, StringComparison.OrdinalIgnoreCase)) == -1)
  {
- module.Pane = Constants.AdminPane;
+ module.Pane = PaneNames.Admin;
  }
 
  // calculate module position within pane

Oqtane.Server/Controllers/AliasController.cs

@@ -14,7 +14,7 @@
 
 namespace Oqtane.Controllers
 {
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
  public class AliasController : Controller
  {
  private readonly IAliasRepository _aliases;
@@ -32,15 +32,15 @@ public AliasController(IAliasRepository aliases, IHttpContextAccessor accessor,
 
  // GET: api/<controller>
  [HttpGet]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
  public IEnumerable<Alias> Get()
  {
  return _aliases.GetAliases();
  }
 
  // GET api/<controller>/5
  [HttpGet("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
  public Alias Get(int id)
  {
  return _aliases.GetAlias(id);
@@ -86,7 +86,7 @@ public Alias Get(string name, string sync)
 
  // POST api/<controller>
  [HttpPost]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
  public Alias Post([FromBody] Alias alias)
  {
  if (ModelState.IsValid)
@@ -99,7 +99,7 @@ public Alias Post([FromBody] Alias alias)
 
  // PUT api/<controller>/5
  [HttpPut("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
  public Alias Put(int id, [FromBody] Alias alias)
  {
  if (ModelState.IsValid)
@@ -112,7 +112,7 @@ public Alias Put(int id, [FromBody] Alias alias)
 
  // DELETE api/<controller>/5
  [HttpDelete("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
  public void Delete(int id)
  {
  _aliases.DeleteAlias(id);