@context.Role.Name
- @if (context.Role.Name != Constants.RegisteredRole)
+ @if (context.Role.Name != RoleNames.Registered)
{
await DeleteUserRole(context.UserRoleId))>Delete
}
diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor
index 0182fe03..fa992e97 100644
--- a/Oqtane.Client/Modules/Controls/ActionDialog.razor
+++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor
@@ -1,9 +1,9 @@
-@namespace Oqtane.Modules.Controls
-@inherits ModuleControlBase
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
@if (_visible)
{
-
+
@@ -76,6 +76,8 @@
protected override void OnParametersSet()
{
+ base.OnParametersSet();
+
if (string.IsNullOrEmpty(Text))
{
Text = Action;
@@ -95,6 +97,12 @@
_iconSpan = $"
";
}
+ if (IsLocalizable)
+ {
+ Header = Localize(nameof(Header));
+ Message = Localize(nameof(Message));
+ }
+
_authorized = IsAuthorized();
}
@@ -134,10 +142,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;
}
}
diff --git a/Oqtane.Client/Modules/Controls/ActionLink.razor b/Oqtane.Client/Modules/Controls/ActionLink.razor
index 7de2331a..b375038d 100644
--- a/Oqtane.Client/Modules/Controls/ActionLink.razor
+++ b/Oqtane.Client/Modules/Controls/ActionLink.razor
@@ -1,5 +1,5 @@
-@namespace Oqtane.Modules.Controls
-@inherits ModuleControlBase
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
@inject IUserService UserService
@if (_authorized)
@@ -56,6 +56,8 @@
protected override void OnParametersSet()
{
+ base.OnParametersSet();
+
_text = Action;
if (!string.IsNullOrEmpty(Text))
{
@@ -93,6 +95,11 @@
}
+ if (IsLocalizable)
+ {
+ _text = Localize(nameof(Text));
+ }
+
_url = EditUrl(Action, _parameters);
_authorized = IsAuthorized();
}
@@ -135,10 +142,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;
}
}
diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor
index 3022c49f..026a2986 100644
--- a/Oqtane.Client/Modules/Controls/AuditInfo.razor
+++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
@inherits ModuleControlBase
@if (_text != string.Empty)
@@ -14,13 +14,13 @@
public string CreatedBy { get; set; }
[Parameter]
- public DateTime CreatedOn { get; set; }
+ public DateTime? CreatedOn { get; set; }
[Parameter]
public string ModifiedBy { get; set; }
[Parameter]
- public DateTime ModifiedOn { get; set; }
+ public DateTime? ModifiedOn { get; set; }
[Parameter]
public string DeletedBy { get; set; }
@@ -37,7 +37,7 @@
protected override void OnParametersSet()
{
_text = string.Empty;
- if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn != null)
+ if (!String.IsNullOrEmpty(CreatedBy) || CreatedOn.HasValue)
{
_text += "
Created ";
@@ -48,13 +48,13 @@
if (CreatedOn != null)
{
- _text += " on " + CreatedOn.ToString("MMM dd yyyy HH:mm:ss") + " ";
+ _text += " on " + CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + " ";
}
_text += "
";
}
- if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn != null)
+ if (!String.IsNullOrEmpty(ModifiedBy) || ModifiedOn.HasValue)
{
_text += "
Last modified ";
@@ -65,7 +65,7 @@
if (ModifiedOn != null)
{
- _text += " on " + ModifiedOn.ToString("MMM dd yyyy HH:mm:ss") + " ";
+ _text += " on " + ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss") + " ";
}
_text += "
";
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index 2dff5419..291b2acb 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -70,7 +70,7 @@
}
- @((MarkupString) _message)
+
@if (_image != string.Empty)
{
@@ -91,9 +91,10 @@
private string _progressbarid = string.Empty;
private string _filter = "*";
private bool _haseditpermission = false;
- private string _message = string.Empty;
private string _image = string.Empty;
private string _guid;
+ private string _message = string.Empty;
+ private MessageType _messagetype;
[Parameter]
public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
@@ -172,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
@@ -217,7 +218,9 @@
catch (Exception ex)
{
await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
- _message = "
Error Loading Files
";
+
+ _message = "Error Loading Files";
+ _messagetype = MessageType.Error;
}
}
@@ -254,6 +257,7 @@
private async Task UploadFile()
{
+ _message = string.Empty;
var interop = new Interop(JSRuntime);
var upload = await interop.GetFiles(_fileinputid);
if (upload.Length > 0)
@@ -273,7 +277,10 @@
if (result == string.Empty)
{
await logger.LogInformation("File Upload Succeeded {Files}", upload);
- _message = "
File Upload Succeeded
";
+
+ _message = "File Upload Succeeded";
+ _messagetype = MessageType.Success;
+
await GetFiles();
if (upload.Length == 1)
@@ -290,30 +297,37 @@
else
{
await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
- _message = "
File Upload Failed
";
+
+ _message = "File Upload Failed";
+ _messagetype = MessageType.Error;
}
}
catch (Exception ex)
{
await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
- _message = "
File Upload Failed
";
+
+ _message = "File Upload Failed";
+ _messagetype = MessageType.Error;
}
}
else
{
- _message = "
You Have Not Selected A File To Upload
";
+ _message = "You Have Not Selected A File To Upload";
+ _messagetype = MessageType.Warning;
}
}
private async Task DeleteFile()
{
_message = string.Empty;
-
try
{
await FileService.DeleteFileAsync(FileId);
await logger.LogInformation("File Deleted {File}", FileId);
- _message = "
File Deleted
";
+
+ _message = "File Deleted";
+ _messagetype = MessageType.Success;
+
await GetFiles();
FileId = -1;
await SetImage();
@@ -322,7 +336,9 @@
catch (Exception ex)
{
await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
- _message = "
Error Deleting File
";
+
+ _message = "Error Deleting File";
+ _messagetype = MessageType.Error;
}
}
diff --git a/Oqtane.Client/Modules/Controls/Label.razor b/Oqtane.Client/Modules/Controls/Label.razor
index 751b222a..3869d8b4 100644
--- a/Oqtane.Client/Modules/Controls/Label.razor
+++ b/Oqtane.Client/Modules/Controls/Label.razor
@@ -1,5 +1,5 @@
-@namespace Oqtane.Modules.Controls
-@inherits ModuleControlBase
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
@if (!string.IsNullOrEmpty(HelpText))
{
@@ -28,6 +28,8 @@ else
protected override void OnParametersSet()
{
+ base.OnParametersSet();
+
_openLabel = "
@Localize("Text");
+ HelpText = Localize(nameof(HelpText));
+ }
}
}
diff --git a/Oqtane.Client/Modules/Controls/LocalizableComponent.cs b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
new file mode 100644
index 00000000..80222e66
--- /dev/null
+++ b/Oqtane.Client/Modules/Controls/LocalizableComponent.cs
@@ -0,0 +1,56 @@
+using System;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Controls
+{
+ public class LocalizableComponent : ModuleControlBase
+ {
+ private IStringLocalizer _localizer;
+
+ [Parameter]
+ public string ResourceKey { get; set; }
+
+ protected bool IsLocalizable { get; private set; }
+
+ protected string Localize(string name)
+ {
+ var key = $"{ResourceKey}.{name}";
+
+ // TODO: we should have a ShowMissingResourceKeys option which developers/translators can enable to find missing translations which would display the key rather than the name
+ if (!IsLocalizable)
+ {
+ return name;
+ }
+
+ return _localizer?[key] ?? name;
+ }
+
+ protected override void OnParametersSet()
+ {
+ if (!String.IsNullOrEmpty(ResourceKey))
+ {
+ if (ModuleState?.ModuleType != null)
+ {
+ var moduleType = Type.GetType(ModuleState.ModuleType);
+ if (moduleType != null)
+ {
+ using (var scope = ServiceActivator.GetScope())
+ {
+ var localizerFactory = scope.ServiceProvider.GetService();
+ _localizer = localizerFactory.Create(moduleType);
+ }
+ }
+ }
+
+ IsLocalizable = true;
+ }
+ else
+ {
+ IsLocalizable = false;
+ }
+ }
+ }
+}
diff --git a/Oqtane.Client/Modules/Controls/ModuleMessage.razor b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
index ad5957fa..ee846b13 100644
--- a/Oqtane.Client/Modules/Controls/ModuleMessage.razor
+++ b/Oqtane.Client/Modules/Controls/ModuleMessage.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
@inherits ModuleControlBase
@inject NavigationManager NavigationManager
@@ -6,7 +6,7 @@
{
@_message
- @if (Type == MessageType.Error && UserSecurity.IsAuthorized(PageState.User, Constants.HostRole))
+ @if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
@((MarkupString)" ")
View Details
}
@@ -16,7 +16,7 @@
@code {
private string _message = string.Empty;
- private string _classname = "alert alert-danger";
+ private string _classname = string.Empty;
[Parameter]
public string Message { get; set; }
@@ -26,23 +26,16 @@
protected override void OnParametersSet()
{
- if (!string.IsNullOrEmpty(Message))
+ _message = Message;
+ if (!string.IsNullOrEmpty(_message))
{
- _message = Message;
_classname = GetMessageType(Type);
}
}
- public void SetModuleMessage(string message, MessageType type)
- {
- _message = message;
- _classname = GetMessageType(type);
- StateHasChanged();
- }
-
private string GetMessageType(MessageType type)
{
- var classname = string.Empty;
+ string classname = string.Empty;
switch (type)
{
case MessageType.Success:
diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor
index 630a652b..204aa21f 100644
--- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor
+++ b/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
();
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 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;
}
diff --git a/Oqtane.Client/Modules/Controls/RichTextEditor.razor b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
index 5eeb17a2..3d7d2327 100644
--- a/Oqtane.Client/Modules/Controls/RichTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/RichTextEditor.razor
@@ -8,7 +8,7 @@
@if (_filemanagervisible)
{
@@ -107,7 +107,7 @@
public string DebugLevel { get; set; } = "info";
public override List
Resources => new List()
-{
+ {
new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.6.min.js" },
new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js" },
new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
@@ -181,6 +181,7 @@
public async Task InsertImage()
{
+ _message = string.Empty;
if (_filemanagervisible)
{
var fileid = _fileManager.GetFileId();
@@ -189,17 +190,15 @@
var interop = new RichTextEditorInterop(JSRuntime);
await interop.InsertImage(_editorElement, ContentUrl(fileid));
_filemanagervisible = false;
- _message = string.Empty;
}
else
{
- _message = "You Must Select An Image To Insert
";
+ _message = "You Must Select An Image To Insert";
}
}
else
{
_filemanagervisible = true;
- _message = string.Empty;
}
StateHasChanged();
}
diff --git a/Oqtane.Client/Modules/Controls/Section.razor b/Oqtane.Client/Modules/Controls/Section.razor
index 02fab969..573a536b 100644
--- a/Oqtane.Client/Modules/Controls/Section.razor
+++ b/Oqtane.Client/Modules/Controls/Section.razor
@@ -1,5 +1,5 @@
-@namespace Oqtane.Modules.Controls
-@inherits ModuleControlBase
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
@@ -41,4 +41,16 @@
_heading = (!string.IsNullOrEmpty(Heading)) ? Heading : Name;
_expanded = (!string.IsNullOrEmpty(Expanded)) ? Expanded : "false";
}
+
+ protected override void OnParametersSet()
+ {
+ base.OnParametersSet();
+
+ if (IsLocalizable)
+ {
+ _heading = !string.IsNullOrEmpty(Heading)
+ ? Localize(nameof(Heading))
+ : Localize(nameof(Name));
+ }
+ }
}
diff --git a/Oqtane.Client/Modules/Controls/TabPanel.razor b/Oqtane.Client/Modules/Controls/TabPanel.razor
index 9f04dc5f..9472bab3 100644
--- a/Oqtane.Client/Modules/Controls/TabPanel.razor
+++ b/Oqtane.Client/Modules/Controls/TabPanel.razor
@@ -1,5 +1,5 @@
-@namespace Oqtane.Modules.Controls
-@inherits ModuleControlBase
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
@if (Name == Parent.ActiveTab)
{
@@ -27,9 +27,34 @@ else
[Parameter]
public string Heading { get; set; } // optional - defaults to name if not specified
+ [Parameter]
+ public SecurityAccessLevel? Security { get; set; } // optional - can be used to specify SecurityAccessLevel
+
protected override void OnInitialized()
{
base.OnInitialized();
Parent.AddTabPanel((TabPanel)this);
}
+
+ protected override void OnParametersSet()
+ {
+ base.OnParametersSet();
+
+ if (IsLocalizable)
+ {
+ if (string.IsNullOrEmpty(Heading))
+ {
+ Name = Localize(nameof(Name));
+ }
+ else
+ {
+ Heading = Localize(nameof(Heading));
+ }
+ }
+ }
+
+ public string DisplayHeading()
+ {
+ return (string.IsNullOrEmpty(Heading)) ? Name : Heading;
+ }
}
diff --git a/Oqtane.Client/Modules/Controls/TabStrip.razor b/Oqtane.Client/Modules/Controls/TabStrip.razor
index cc58376f..be82b9ff 100644
--- a/Oqtane.Client/Modules/Controls/TabStrip.razor
+++ b/Oqtane.Client/Modules/Controls/TabStrip.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Controls
+@namespace Oqtane.Modules.Controls
@inherits ModuleControlBase
@@ -7,20 +7,23 @@
@@ -58,8 +61,30 @@
StateHasChanged();
}
- private string DisplayHeading(string Name, string Heading)
+ private bool IsAuthorized(TabPanel tabPanel)
{
- return (string.IsNullOrEmpty(Heading)) ? Name : Heading;
+ var authorized = false;
+ switch (tabPanel.Security)
+ {
+ case null: // security not specified - assume SecurityAccessLevel.Anonymous
+ authorized = true;
+ break;
+ case SecurityAccessLevel.Anonymous:
+ authorized = true;
+ break;
+ case SecurityAccessLevel.View:
+ authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.Permissions);
+ break;
+ case SecurityAccessLevel.Edit:
+ authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions);
+ break;
+ case SecurityAccessLevel.Admin:
+ authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);
+ break;
+ case SecurityAccessLevel.Host:
+ authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
+ break;
+ }
+ return authorized;
}
}
diff --git a/Oqtane.Client/Modules/MessageType.cs b/Oqtane.Client/Modules/MessageType.cs
index a78f95f9..561579b4 100644
--- a/Oqtane.Client/Modules/MessageType.cs
+++ b/Oqtane.Client/Modules/MessageType.cs
@@ -5,6 +5,7 @@
Success,
Info,
Warning,
- Error
+ Error,
+ Undefined
}
}
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index 633caed5..e51b9873 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
using Oqtane.Shared;
using Oqtane.Models;
using System.Threading.Tasks;
@@ -53,12 +53,15 @@ namespace Oqtane.Modules
if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
{
var scripts = new List
();
- foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+ foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
{
scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
}
- var interop = new Interop(JSRuntime);
- await interop.IncludeScripts(scripts.ToArray());
+ if (scripts.Any())
+ {
+ var interop = new Interop(JSRuntime);
+ await interop.IncludeScripts(scripts.ToArray());
+ }
}
}
}
@@ -292,4 +295,4 @@ namespace Oqtane.Modules
}
}
}
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj
index f0c021ff..3ce83439 100644
--- a/Oqtane.Client/Oqtane.Client.csproj
+++ b/Oqtane.Client/Oqtane.Client.csproj
@@ -1,12 +1,11 @@
-
+
- netstandard2.1
+ net5.0
Exe
- 7.3
3.0
Debug;Release
- 1.0.3
+ 2.0.0
Oqtane
Shaun Walker
.NET Foundation
@@ -15,7 +14,7 @@
https://www.oqtane.org
https://github.com/oqtane
Git
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
Oqtane
true
@@ -28,11 +27,11 @@
-
diff --git a/Oqtane.Client/Program.cs b/Oqtane.Client/Program.cs
index 8a1fd2b8..af283cec 100644
--- a/Oqtane.Client/Program.cs
+++ b/Oqtane.Client/Program.cs
@@ -1,19 +1,19 @@
-using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System.Threading.Tasks;
-using Oqtane.Services;
-using System.Reflection;
using System;
using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
using System.Linq;
using System.Net.Http;
-using System.Net.Http.Json;
-using Oqtane.Modules;
-using Oqtane.Shared;
-using Oqtane.Providers;
+using System.Reflection;
+using System.Threading.Tasks;
+using System.Runtime.Loader;
using Microsoft.AspNetCore.Components.Authorization;
-using System.IO.Compression;
-using System.IO;
+using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Oqtane.Modules;
+using Oqtane.Providers;
+using Oqtane.Shared;
+using Oqtane.Services;
namespace Oqtane.Client
{
@@ -28,6 +28,9 @@ namespace Oqtane.Client
builder.Services.AddSingleton(httpClient);
builder.Services.AddOptions();
+ // Register localization services
+ builder.Services.AddLocalization(options => options.ResourcesPath = "Resources");
+
// register auth services
builder.Services.AddAuthorizationCore();
builder.Services.AddScoped();
@@ -62,32 +65,33 @@ namespace Oqtane.Client
await LoadClientAssemblies(httpClient);
- // dynamically register module contexts and repository services
- Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
- foreach (Assembly assembly in assemblies)
+ var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
+ foreach (var assembly in assemblies)
{
- var implementationTypes = assembly.GetTypes()
- .Where(item => item.GetInterfaces().Contains(typeof(IService)));
-
- foreach (Type implementationtype in implementationTypes)
+ // dynamically register module services
+ var implementationTypes = assembly.GetInterfaces();
+ foreach (var implementationType in implementationTypes)
{
- Type servicetype = Type.GetType(implementationtype.AssemblyQualifiedName.Replace(implementationtype.Name, "I" + implementationtype.Name));
- if (servicetype != null)
+ if (implementationType.AssemblyQualifiedName != null)
{
- builder.Services.AddScoped(servicetype, implementationtype); // traditional service interface
- }
- else
- {
- builder.Services.AddScoped(implementationtype, implementationtype); // no interface defined for service
+ var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
+ builder.Services.AddScoped(serviceType ?? implementationType, implementationType);
}
}
- assembly.GetInstances()
- .ToList()
- .ForEach(x => x.ConfigureServices(builder.Services));
+ // register client startup services
+ var startUps = assembly.GetInstances();
+ foreach (var startup in startUps)
+ {
+ startup.ConfigureServices(builder.Services);
+ }
}
- await builder.Build().RunAsync();
+ var host = builder.Build();
+
+ ServiceActivator.Configure(host.Services);
+
+ await host.RunAsync();
}
private static async Task LoadClientAssemblies(HttpClient http)
@@ -101,8 +105,8 @@ namespace Oqtane.Client
// asemblies and debug symbols are packaged in a zip file
using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))
{
- Dictionary dlls = new Dictionary();
- Dictionary pdbs = new Dictionary();
+ var dlls = new Dictionary();
+ var pdbs = new Dictionary();
foreach (ZipArchiveEntry entry in archive.Entries)
{
@@ -129,11 +133,11 @@ namespace Oqtane.Client
{
if (pdbs.ContainsKey(item.Key))
{
- Assembly.Load(item.Value, pdbs[item.Key]);
+ AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(item.Value), new MemoryStream(pdbs[item.Key]));
}
else
{
- Assembly.Load(item.Value);
+ AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(item.Value));
}
}
}
diff --git a/Oqtane.Client/Services/ServiceBase.cs b/Oqtane.Client/Services/ServiceBase.cs
index 2e891ca3..71e1ad78 100644
--- a/Oqtane.Client/Services/ServiceBase.cs
+++ b/Oqtane.Client/Services/ServiceBase.cs
@@ -173,13 +173,15 @@ namespace Oqtane.Services
// add entityid parameter to url for custom authorization policy
public string CreateAuthorizationPolicyUrl(string url, int entityId)
{
+ string qs = "entityid=" + entityId.ToString();
+
if (url.Contains("?"))
{
- return url + "&entityid=" + entityId.ToString();
+ return url + "&" + qs;
}
else
{
- return url + "?entityid=" + entityId.ToString();
+ return url + "?" + qs;
}
}
diff --git a/Oqtane.Client/Themes/Controls/ControlPanel.razor b/Oqtane.Client/Themes/Controls/ControlPanel.razor
index 24e90513..7629066b 100644
--- a/Oqtane.Client/Themes/Controls/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/ControlPanel.razor
@@ -23,7 +23,7 @@
- @if (UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole))
+ @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{
@@ -51,7 +51,7 @@
- @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))
{
Publish("unpublish"))>Unpublish Page
@@ -510,8 +510,8 @@
if (permissionstring.PermissionName == PermissionNames.View)
{
List
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());
diff --git a/Oqtane.Client/Themes/Controls/MenuHorizontal.Razor b/Oqtane.Client/Themes/Controls/MenuHorizontal.razor
similarity index 100%
rename from Oqtane.Client/Themes/Controls/MenuHorizontal.Razor
rename to Oqtane.Client/Themes/Controls/MenuHorizontal.razor
diff --git a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
index a6a3f2ba..b0e95901 100644
--- a/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
+++ b/Oqtane.Client/Themes/Controls/ModuleActionsBase.cs
@@ -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)});
- 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 @@ namespace Oqtane.Themes.Controls
if (permissionstring.PermissionName == PermissionNames.View)
{
List 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 @@ namespace Oqtane.Themes.Controls
if (permissionstring.PermissionName == PermissionNames.View)
{
List 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());
}
}
diff --git a/Oqtane.Client/Themes/Controls/ModuleTitle.razor b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
index 8b093165..0dd706ee 100644
--- a/Oqtane.Client/Themes/Controls/ModuleTitle.razor
+++ b/Oqtane.Client/Themes/Controls/ModuleTitle.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.Themes.Controls
+@namespace Oqtane.Themes.Controls
@inherits ContainerBase
@attribute [OqtaneIgnore]
@@ -17,6 +17,13 @@
{
title = PageState.Action;
}
+ else
+ {
+ if (!string.IsNullOrEmpty(ModuleState.ControlTitle))
+ {
+ title = ModuleState.ControlTitle;
+ }
+ }
return Task.CompletedTask;
}
}
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 32b9c564..7f57ec70 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -32,12 +32,15 @@ namespace Oqtane.Themes
if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
{
var scripts = new List();
- foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+ foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script && item.Declaration != ResourceDeclaration.Global))
{
scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "" });
}
- var interop = new Interop(JSRuntime);
- await interop.IncludeScripts(scripts.ToArray());
+ if (scripts.Any())
+ {
+ var interop = new Interop(JSRuntime);
+ await interop.IncludeScripts(scripts.ToArray());
+ }
}
}
}
diff --git a/Oqtane.Client/UI/Installer.razor b/Oqtane.Client/UI/Installer.razor
index 204197f6..6ee0bba4 100644
--- a/Oqtane.Client/UI/Installer.razor
+++ b/Oqtane.Client/UI/Installer.razor
@@ -119,7 +119,7 @@
Install Now
@@ -129,13 +129,13 @@
private string _databaseType = "LocalDB";
private string _serverName = "(LocalDb)\\MSSQLLocalDB";
private string _databaseName = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
- private string _username = "";
- private string _password = "";
- private string _hostUsername = Constants.HostUser;
- private string _hostPassword = "";
- private string _confirmPassword = "";
- private string _hostEmail = "";
- private string _message = "";
+ private string _username = string.Empty;
+ private string _password = string.Empty;
+ private string _hostUsername = UserNames.Host;
+ private string _hostPassword = string.Empty;
+ private string _confirmPassword = string.Empty;
+ private string _hostEmail = string.Empty;
+ private string _message = string.Empty;
private string _integratedSecurityDisplay = "display: none;";
private string _loadingDisplay = "display: none;";
@@ -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
};
@@ -201,13 +201,13 @@
}
else
{
- _message = "" + installation.Message + "
";
+ _message = installation.Message;
_loadingDisplay = "display: none;";
}
}
else
{
- _message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length
";
+ _message = "Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length";
}
}
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 8dfe2e03..80af124d 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -1,8 +1,7 @@
@namespace Oqtane.UI
-
-
@if (_progressindicator)
@@ -12,6 +11,7 @@
@code {
private string _message;
+ private MessageType _messagetype;
private bool _progressindicator = false;
[CascadingParameter]
@@ -49,11 +49,13 @@
{
// module does not exist with typename specified
_message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
+ _messagetype = MessageType.Error;
}
}
else
{
_message = "Something is wrong with moduletype";
+ _messagetype = MessageType.Error;
}
};
@@ -61,9 +63,10 @@
public void AddModuleMessage(string message, MessageType type)
{
+ _message = message;
+ _messagetype = type;
_progressindicator = false;
StateHasChanged();
- ModuleMessage.SetModuleMessage(message, type);
}
public void ShowProgressIndicator()
diff --git a/Oqtane.Client/UI/Pane.razor b/Oqtane.Client/UI/Pane.razor
index 669e0ce4..028fca3f 100644
--- a/Oqtane.Client/UI/Pane.razor
+++ b/Oqtane.Client/UI/Pane.razor
@@ -1,19 +1,24 @@
-@using Microsoft.AspNetCore.Components.Rendering
+@using Microsoft.AspNetCore.Components.Rendering
@namespace Oqtane.UI
@inject IUserService UserService
@inject IModuleService ModuleService
@inject IModuleDefinitionService ModuleDefinitionService
-
- @if (_panetitle != "")
- {
+@if (_useadminborder)
+{
+
@((MarkupString)_panetitle)
- }
+ @DynamicComponent
+
+}
+else
+{
@DynamicComponent
-
" + Name + " Pane
";
}
@@ -41,7 +47,7 @@
{
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)
@@ -75,20 +81,16 @@
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;
}
}
if (authorized)
{
- if (!Constants.DefaultModuleActions.Contains(PageState.Action) && module.ControlTitle != "")
- {
- module.Title = module.ControlTitle;
- }
CreateComponent(builder, module);
}
}
@@ -135,4 +137,4 @@
builder.SetKey(module.PageModuleId);
builder.CloseComponent();
}
-}
+}
\ No newline at end of file
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 5c7f6cd5..d2854f64 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -1,4 +1,4 @@
-@using System.Diagnostics.CodeAnalysis
+@using System.Diagnostics.CodeAnalysis
@using System.Runtime.InteropServices
@namespace Oqtane.UI
@inject AuthenticationStateProvider AuthenticationStateProvider
@@ -76,7 +76,7 @@
User user = null;
List modules;
var moduleid = -1;
- var action = string.Empty;
+ var action = Constants.DefaultAction;
var urlparameters = string.Empty;
var editmode = false;
var reload = Reload.None;
@@ -202,20 +202,15 @@
{
modIdPos = i + 1;
actionPos = modIdPos + 1;
- if (actionPos > segments.Length - 1)
- {
- action = Constants.DefaultAction;
- }
- else
+ if (actionPos <= segments.Length - 1)
{
action = segments[actionPos];
-
}
}
}
- // check if path has moduleid and action specification ie. pagename/moduleid/action/
+ // check if path has moduleid and action specification ie. pagename/*/moduleid/action/
if (modIdPos > 0)
{
int.TryParse(segments[modIdPos], out result);
@@ -280,15 +275,15 @@
reload = Reload.Page;
}
- if (PageState == null || reload >= Reload.Page)
+ if (PageState == null || reload >= Reload.Site)
{
modules = await ModuleService.GetModulesAsync(site.SiteId);
- (page, modules) = ProcessModules(page, modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType);
}
else
{
modules = PageState.Modules;
}
+ (page, modules) = ProcessModules(page, modules, moduleid, action, (!string.IsNullOrEmpty(page.DefaultContainerType)) ? page.DefaultContainerType : site.DefaultContainerType);
_pagestate = new PageState
{
@@ -390,6 +385,10 @@
if (string.IsNullOrEmpty(page.ThemeType))
{
page.ThemeType = site.DefaultThemeType;
+ }
+
+ if (string.IsNullOrEmpty(page.LayoutType))
+ {
page.LayoutType = site.DefaultLayoutType;
}
@@ -443,7 +442,13 @@
var paneindex = new Dictionary();
foreach (Module module in modules)
{
- if (module.PageId == page.PageId || module.ModuleId == moduleid)
+ // initialize module control properties
+ module.SecurityAccessLevel = SecurityAccessLevel.Host;
+ module.ControlTitle = "";
+ module.Actions = "";
+ module.UseAdminContainer = false;
+
+ if ((module.PageId == page.PageId || module.ModuleId == moduleid) && module.ModuleDefinition != null)
{
var typename = string.Empty;
if (module.ModuleDefinition != null && (module.ModuleDefinition.Runtimes == "" || module.ModuleDefinition.Runtimes.Contains(GetRuntime().ToString())))
@@ -455,25 +460,24 @@
typename = Constants.ErrorModule;
}
- if (module.ModuleId == moduleid && action != "")
+ // handle default action
+ if (action == Constants.DefaultAction && !string.IsNullOrEmpty(module.ModuleDefinition.DefaultAction))
{
- // check if the module defines custom routes
- if (module.ModuleDefinition.ControlTypeRoutes != "")
+ action = module.ModuleDefinition.DefaultAction;
+ }
+
+ // check if the module defines custom action routes
+ if (module.ModuleDefinition.ControlTypeRoutes != "")
+ {
+ foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
{
- foreach (string route in module.ModuleDefinition.ControlTypeRoutes.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries))
+ if (route.StartsWith(action + "="))
{
- if (route.StartsWith(action + "="))
- {
- typename = route.Replace(action + "=", "");
- }
+ typename = route.Replace(action + "=", "");
}
}
- module.ModuleType = typename.Replace(Constants.ActionToken, action);
- }
- else
- {
- module.ModuleType = typename.Replace(Constants.ActionToken, Constants.DefaultAction);
}
+ module.ModuleType = typename.Replace(Constants.ActionToken, action);
// get additional metadata from IModuleControl interface
typename = module.ModuleType;
@@ -507,7 +511,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
@@ -522,6 +526,7 @@
module.PaneModuleIndex = paneindex[module.Pane.ToLower()];
+ // container fallback
if (string.IsNullOrEmpty(module.ContainerType))
{
module.ContainerType = defaultcontainertype;
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 12513215..ef8057f6 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -1,4 +1,4 @@
-@namespace Oqtane.UI
+@namespace Oqtane.UI
@inject IJSRuntime JsRuntime
@inject NavigationManager NavigationManager
@@ -33,11 +33,14 @@
// manage stylesheets for this page
string batch = DateTime.Now.ToString("yyyyMMddHHmmssfff");
var links = new List();
- foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
+ foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet && item.Declaration != ResourceDeclaration.Global))
{
links.Add(new { id = "app-stylesheet-" + batch + "-" + (links.Count + 1).ToString("00"), rel = "stylesheet", href = resource.Url, type = "text/css", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", key = "" });
}
- await interop.IncludeLinks(links.ToArray());
+ if (links.Any())
+ {
+ await interop.IncludeLinks(links.ToArray());
+ }
await interop.RemoveElementsById("app-stylesheet", "", "app-stylesheet-" + batch + "-00");
// add favicon
@@ -46,7 +49,7 @@
await interop.IncludeLink("app-favicon", "shortcut icon", Utilities.ContentUrl(PageState.Alias, PageState.Site.FaviconFileId.Value), "image/x-icon", "", "", "id");
}
// add PWA support
- if (PageState.Site.PwaIsEnabled)
+ if (PageState.Site.PwaIsEnabled && PageState.Site.PwaAppIconFileId != null && PageState.Site.PwaSplashIconFileId != null)
{
await InitializePwa(interop);
}
@@ -79,7 +82,7 @@
"\"sizes\": \"512x512\", " +
"\"type\": \"image/png\" " +
"}] " +
- "} " +
+ "}; " +
"const serialized = JSON.stringify(manifest); " +
"const blob = new Blob([serialized], {type: 'application/javascript'}); " +
"const url = URL.createObjectURL(blob); " +
diff --git a/Oqtane.Client/_Imports.razor b/Oqtane.Client/_Imports.razor
index 3dce6c30..3a920652 100644
--- a/Oqtane.Client/_Imports.razor
+++ b/Oqtane.Client/_Imports.razor
@@ -1,7 +1,8 @@
-@using System
+@using System
@using System.Linq
@using System.Collections.Generic
@using System.Net.Http
+@using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Authorization
@using Microsoft.AspNetCore.Components.Routing
diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec
index 46e286ae..6b01cba1 100644
--- a/Oqtane.Package/Oqtane.Client.nuspec
+++ b/Oqtane.Package/Oqtane.Client.nuspec
@@ -2,7 +2,7 @@
Oqtane.Client
- 1.0.3
+ 2.0.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -13,11 +13,11 @@
https://github.com/oqtane/oqtane.framework
https://www.oqtane.org/Portals/0/icon.jpg
oqtane
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
A modular application framework for Blazor
-
\ No newline at end of file
diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec
index 33ed5295..10313bc4 100644
--- a/Oqtane.Package/Oqtane.Framework.nuspec
+++ b/Oqtane.Package/Oqtane.Framework.nuspec
@@ -2,7 +2,7 @@
Oqtane.Framework
- 1.0.3
+ 2.0.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -13,11 +13,11 @@
https://github.com/oqtane/oqtane.framework
https://www.oqtane.org/Portals/0/icon.jpg
oqtane framework
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
A modular application framework for Blazor
-
\ No newline at end of file
diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec
index 854876a9..36715c37 100644
--- a/Oqtane.Package/Oqtane.Server.nuspec
+++ b/Oqtane.Package/Oqtane.Server.nuspec
@@ -2,7 +2,7 @@
Oqtane.Server
- 1.0.3
+ 2.0.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -13,11 +13,11 @@
https://github.com/oqtane/oqtane.framework
https://www.oqtane.org/Portals/0/icon.jpg
oqtane
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
A modular application framework for Blazor
-
\ No newline at end of file
diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec
index e2bfeaf0..538e0c8d 100644
--- a/Oqtane.Package/Oqtane.Shared.nuspec
+++ b/Oqtane.Package/Oqtane.Shared.nuspec
@@ -2,7 +2,7 @@
Oqtane.Shared
- 1.0.3
+ 2.0.0
Shaun Walker
.NET Foundation
Oqtane Framework
@@ -13,11 +13,11 @@
https://github.com/oqtane/oqtane.framework
https://www.oqtane.org/Portals/0/icon.jpg
oqtane
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
A modular application framework for Blazor
-
\ No newline at end of file
diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1
index 78559c96..116d8567 100644
--- a/Oqtane.Package/install.ps1
+++ b/Oqtane.Package/install.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\*" -DestinationPath "..\Oqtane.Server\bin\Release\Oqtane.Framework.1.0.3.Install.zip" -Force
\ No newline at end of file
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net5.0\publish\*" -DestinationPath "..\Oqtane.Server\bin\Release\Oqtane.Framework.2.0.0.Install.zip" -Force
\ No newline at end of file
diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd
index 014083b1..291e6b14 100644
--- a/Oqtane.Package/release.cmd
+++ b/Oqtane.Package/release.cmd
@@ -4,15 +4,15 @@ dotnet build -c Release ..\Oqtane.sln
nuget.exe pack Oqtane.Client.nuspec
nuget.exe pack Oqtane.Server.nuspec
nuget.exe pack Oqtane.Shared.nuspec
-del /F/Q/S "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish" > NUL
-rmdir /Q/S "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish"
+del /F/Q/S "..\Oqtane.Server\bin\Release\net5.0\publish" > NUL
+rmdir /Q/S "..\Oqtane.Server\bin\Release\net5.0\publish"
dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
-del "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\appsettings.json"
-ren "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\appsettings.release.json" "appsettings.json"
+del "..\Oqtane.Server\bin\Release\net5.0\publish\appsettings.json"
+ren "..\Oqtane.Server\bin\Release\net5.0\publish\appsettings.release.json" "appsettings.json"
C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\install.ps1"
-del "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\appsettings.json"
+del "..\Oqtane.Server\bin\Release\net5.0\publish\appsettings.json"
C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe ".\upgrade.ps1"
-del "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\Oqtane.Upgrade.*"
+del "..\Oqtane.Server\bin\Release\net5.0\publish\Oqtane.Upgrade.*"
nuget.exe pack Oqtane.Framework.nuspec
diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1
index 80445608..e41001aa 100644
--- a/Oqtane.Package/upgrade.ps1
+++ b/Oqtane.Package/upgrade.ps1
@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\netcoreapp3.1\publish\*" -DestinationPath "..\Oqtane.Server\bin\Release\Oqtane.Framework.1.0.3.Upgrade.zip" -Force
\ No newline at end of file
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net5.0\publish\*" -DestinationPath "..\Oqtane.Server\bin\Release\Oqtane.Framework.2.0.0.Upgrade.zip" -Force
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/AliasController.cs b/Oqtane.Server/Controllers/AliasController.cs
index c4422587..188160a0 100644
--- a/Oqtane.Server/Controllers/AliasController.cs
+++ b/Oqtane.Server/Controllers/AliasController.cs
@@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Http;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class AliasController : Controller
{
private readonly IAliasRepository _aliases;
@@ -32,7 +32,7 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public IEnumerable Get()
{
return _aliases.GetAliases();
@@ -40,7 +40,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Alias Get(int id)
{
return _aliases.GetAlias(id);
@@ -86,7 +86,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Alias Post([FromBody] Alias alias)
{
if (ModelState.IsValid)
@@ -99,7 +99,7 @@ namespace Oqtane.Controllers
// PUT api//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 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id)
{
_aliases.DeleteAlias(id);
diff --git a/Oqtane.Server/Controllers/FileController.cs b/Oqtane.Server/Controllers/FileController.cs
index c96f6891..fb43a7cb 100644
--- a/Oqtane.Server/Controllers/FileController.cs
+++ b/Oqtane.Server/Controllers/FileController.cs
@@ -22,7 +22,7 @@ using Microsoft.AspNetCore.Routing.Constraints;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class FileController : Controller
{
private readonly IWebHostEnvironment _environment;
@@ -58,7 +58,7 @@ namespace Oqtane.Controllers
}
else
{
- if (User.IsInRole(Constants.HostRole))
+ if (User.IsInRole(RoleNames.Host))
{
folder = GetFolderPath(folder);
if (Directory.Exists(folder))
@@ -132,7 +132,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Models.File Put(int id, [FromBody] Models.File file)
{
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, file.FolderId, PermissionNames.Edit))
@@ -164,7 +164,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id)
{
Models.File file = _files.GetFile(id);
@@ -282,7 +282,7 @@ namespace Oqtane.Controllers
}
else
{
- if (User.IsInRole(Constants.HostRole))
+ if (User.IsInRole(RoleNames.Host))
{
folderPath = GetFolderPath(folder);
}
@@ -444,8 +444,8 @@ namespace Oqtane.Controllers
string filepath = Path.Combine(GetFolderPath(file.Folder), file.Name);
if (System.IO.File.Exists(filepath))
{
- byte[] filebytes = System.IO.File.ReadAllBytes(filepath);
- return File(filebytes, "application/octet-stream", file.Name);
+ var stream = new FileStream(filepath, FileMode.Open);
+ return File(stream, "application/octet-stream", file.Name);
}
else
{
@@ -453,8 +453,8 @@ namespace Oqtane.Controllers
HttpContext.Response.StatusCode = 404;
if (System.IO.File.Exists(errorpath))
{
- byte[] filebytes = System.IO.File.ReadAllBytes(errorpath);
- return File(filebytes, "application/octet-stream", file.Name);
+ var stream = new FileStream(errorpath, FileMode.Open);
+ return File(stream, "application/octet-stream", file.Name);
}
}
}
@@ -462,16 +462,16 @@ namespace Oqtane.Controllers
{
_logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access File {FileId}", id);
HttpContext.Response.StatusCode = 401;
- byte[] filebytes = System.IO.File.ReadAllBytes(errorpath);
- return File(filebytes, "application/octet-stream", file.Name);
+ var stream = new FileStream(errorpath, FileMode.Open);
+ return File(stream, "application/octet-stream", file.Name);
}
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Read, "File Not Found {FileId}", id);
HttpContext.Response.StatusCode = 404;
- byte[] filebytes = System.IO.File.ReadAllBytes(errorpath);
- return File(filebytes, "application/octet-stream", "error.png");
+ var stream = new FileStream(errorpath, FileMode.Open);
+ return File(stream, "application/octet-stream", file.Name);
}
return null;
}
diff --git a/Oqtane.Server/Controllers/FolderController.cs b/Oqtane.Server/Controllers/FolderController.cs
index b1bebcfd..aad20a77 100644
--- a/Oqtane.Server/Controllers/FolderController.cs
+++ b/Oqtane.Server/Controllers/FolderController.cs
@@ -15,7 +15,7 @@ using Microsoft.AspNetCore.Hosting;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class FolderController : Controller
{
private readonly IWebHostEnvironment _environment;
@@ -93,7 +93,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Folder Post([FromBody] Folder folder)
{
if (ModelState.IsValid)
@@ -106,7 +106,7 @@ namespace Oqtane.Controllers
else
{
permissions = new List {
- new Permission(PermissionNames.Edit, Constants.AdminRole, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true),
}.EncodePermissions();
}
if (_userPermissions.IsAuthorized(User, PermissionNames.Edit, permissions))
@@ -141,7 +141,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Folder Put(int id, [FromBody] Folder folder)
{
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Folder, folder.FolderId, PermissionNames.Edit))
@@ -182,7 +182,7 @@ namespace Oqtane.Controllers
// PUT api//?siteid=x&folderid=y&parentid=z
[HttpPut]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Put(int siteid, int folderid, int? parentid)
{
if (_userPermissions.IsAuthorized(User, EntityNames.Folder, folderid, PermissionNames.Edit))
@@ -209,11 +209,16 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id)
{
if (_userPermissions.IsAuthorized(User, EntityNames.Folder, id, PermissionNames.Edit))
{
+ Models.Folder _folder = _folders.GetFolder(id, false);
+ if (Directory.Exists(GetFolderPath(_folder)))
+ {
+ Directory.Delete(GetFolderPath(_folder));
+ }
_folders.DeleteFolder(id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Folder Deleted {FolderId}", id);
}
diff --git a/Oqtane.Server/Controllers/InstallationController.cs b/Oqtane.Server/Controllers/InstallationController.cs
index 50b45710..7aaf537c 100644
--- a/Oqtane.Server/Controllers/InstallationController.cs
+++ b/Oqtane.Server/Controllers/InstallationController.cs
@@ -1,32 +1,36 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
-using Oqtane.Models;
-using Oqtane.Shared;
-using Oqtane.Infrastructure;
using System;
using System.IO;
using System.Reflection;
using System.Linq;
using System.IO.Compression;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
+using Oqtane.Infrastructure;
+using Oqtane.Models;
using Oqtane.Modules;
+using Oqtane.Shared;
using Oqtane.Themes;
-using System.Diagnostics;
+using Microsoft.Extensions.Caching.Memory;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class InstallationController : Controller
{
private readonly IConfigurationRoot _config;
private readonly IInstallationManager _installationManager;
private readonly IDatabaseManager _databaseManager;
+ private readonly ILocalizationManager _localizationManager;
+ private readonly IMemoryCache _cache;
- public InstallationController(IConfigurationRoot config, IInstallationManager installationManager, IDatabaseManager databaseManager)
+ public InstallationController(IConfigurationRoot config, IInstallationManager installationManager, IDatabaseManager databaseManager, ILocalizationManager localizationManager, IMemoryCache cache)
{
_config = config;
_installationManager = installationManager;
_databaseManager = databaseManager;
+ _localizationManager = localizationManager;
+ _cache = cache;
}
// POST api/
@@ -35,7 +39,7 @@ namespace Oqtane.Controllers
{
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);
}
@@ -56,7 +60,7 @@ namespace Oqtane.Controllers
}
[HttpGet("upgrade")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public Installation Upgrade()
{
var installation = new Installation {Success = true, Message = ""};
@@ -70,63 +74,7 @@ namespace Oqtane.Controllers
{
if (_config.GetSection("Runtime").Value == "WebAssembly")
{
- // get list of assemblies which should be downloaded to browser
- var assemblies = AppDomain.CurrentDomain.GetOqtaneClientAssemblies();
- var list = assemblies.Select(a => a.GetName().Name).ToList();
-
- // get module and theme dependencies
- foreach (var assembly in assemblies)
- {
- foreach (var type in assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IModule))))
- {
- var instance = Activator.CreateInstance(type) as IModule;
- foreach (string name in instance.ModuleDefinition.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
- {
- if (!list.Contains(name)) list.Add(name);
- }
- }
- foreach (var type in assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(ITheme))))
- {
- var instance = Activator.CreateInstance(type) as ITheme;
- foreach (string name in instance.Theme.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
- {
- if (!list.Contains(name)) list.Add(name);
- }
- }
- }
-
- // create zip file containing assemblies and debug symbols
- string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
- byte[] zipfile;
- using (var memoryStream = new MemoryStream())
- {
- using (var archive = new ZipArchive(memoryStream, ZipArchiveMode.Create, true))
- {
- ZipArchiveEntry entry;
- foreach (string file in list)
- {
- entry = archive.CreateEntry(file + ".dll");
- using (var filestream = new FileStream(Path.Combine(binfolder, file + ".dll"), FileMode.Open, FileAccess.Read))
- using (var entrystream = entry.Open())
- {
- filestream.CopyTo(entrystream);
- }
-
- // include debug symbols ( we may want to consider restricting this to only host users or when running in debug mode for performance )
- if (System.IO.File.Exists(Path.Combine(binfolder, file + ".pdb")))
- {
- entry = archive.CreateEntry(file + ".pdb");
- using (var filestream = new FileStream(Path.Combine(binfolder, file + ".pdb"), FileMode.Open, FileAccess.Read))
- using (var entrystream = entry.Open())
- {
- filestream.CopyTo(entrystream);
- }
- }
- }
- }
- zipfile = memoryStream.ToArray();
- }
- return File(zipfile, "application/octet-stream", "oqtane.zip");
+ return File(GetAssemblies(), System.Net.Mime.MediaTypeNames.Application.Octet, "oqtane.zip");
}
else
{
@@ -134,5 +82,86 @@ namespace Oqtane.Controllers
return null;
}
}
+
+ private byte[] GetAssemblies()
+ {
+ return _cache.GetOrCreate("assemblies", entry =>
+ {
+ // get list of assemblies which should be downloaded to client
+ var assemblies = AppDomain.CurrentDomain.GetOqtaneClientAssemblies();
+ var list = assemblies.Select(a => a.GetName().Name).ToList();
+ var binFolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+
+ // insert satellite assemblies at beginning of list
+ foreach (var culture in _localizationManager.GetSupportedCultures())
+ {
+ var assembliesFolderPath = Path.Combine(binFolder, culture);
+ if (culture == Constants.DefaultCulture)
+ {
+ continue;
+ }
+
+ if (Directory.Exists(assembliesFolderPath))
+ {
+ foreach (var resourceFile in Directory.EnumerateFiles(assembliesFolderPath))
+ {
+ list.Insert(0, Path.Combine(culture, Path.GetFileNameWithoutExtension(resourceFile)));
+ }
+ }
+ else
+ {
+ Console.WriteLine($"The satellite assemblies folder named '{culture}' is not found.");
+ }
+ }
+
+ // insert module and theme dependencies at beginning of list
+ foreach (var assembly in assemblies)
+ {
+ foreach (var type in assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IModule))))
+ {
+ var instance = Activator.CreateInstance(type) as IModule;
+ foreach (string name in instance.ModuleDefinition.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+ {
+ if (!list.Contains(name)) list.Insert(0, name);
+ }
+ }
+ foreach (var type in assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(ITheme))))
+ {
+ var instance = Activator.CreateInstance(type) as ITheme;
+ foreach (string name in instance.Theme.Dependencies.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+ {
+ if (!list.Contains(name)) list.Insert(0, name);
+ }
+ }
+ }
+
+ // create zip file containing assemblies and debug symbols
+ using (var memoryStream = new MemoryStream())
+ {
+ using (var archive = new ZipArchive(memoryStream, ZipArchiveMode.Create, true))
+ {
+ foreach (string file in list)
+ {
+ using (var filestream = new FileStream(Path.Combine(binFolder, file + ".dll"), FileMode.Open, FileAccess.Read))
+ using (var entrystream = archive.CreateEntry(file + ".dll").Open())
+ {
+ filestream.CopyTo(entrystream);
+ }
+
+ // include debug symbols
+ if (System.IO.File.Exists(Path.Combine(binFolder, file + ".pdb")))
+ {
+ using (var filestream = new FileStream(Path.Combine(binFolder, file + ".pdb"), FileMode.Open, FileAccess.Read))
+ using (var entrystream = archive.CreateEntry(file + ".pdb").Open())
+ {
+ filestream.CopyTo(entrystream);
+ }
+ }
+ }
+ }
+ return memoryStream.ToArray();
+ }
+ });
+ }
}
}
diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs
index 8e1993aa..03cf4e3b 100644
--- a/Oqtane.Server/Controllers/JobController.cs
+++ b/Oqtane.Server/Controllers/JobController.cs
@@ -12,7 +12,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class JobController : Controller
{
private readonly IJobRepository _jobs;
@@ -28,7 +28,7 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public IEnumerable Get()
{
return _jobs.GetJobs();
@@ -36,7 +36,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public Job Get(int id)
{
return _jobs.GetJob(id);
@@ -44,7 +44,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public Job Post([FromBody] Job job)
{
if (ModelState.IsValid)
@@ -57,7 +57,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public Job Put(int id, [FromBody] Job job)
{
if (ModelState.IsValid)
@@ -70,7 +70,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Delete(int id)
{
_jobs.DeleteJob(id);
@@ -79,7 +79,7 @@ namespace Oqtane.Controllers
// GET api//start
[HttpGet("start/{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Start(int id)
{
Job job = _jobs.GetJob(id);
@@ -93,7 +93,7 @@ namespace Oqtane.Controllers
// GET api//stop
[HttpGet("stop/{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Stop(int id)
{
Job job = _jobs.GetJob(id);
diff --git a/Oqtane.Server/Controllers/JobLogController.cs b/Oqtane.Server/Controllers/JobLogController.cs
index 0c3f8bc5..055e90a0 100644
--- a/Oqtane.Server/Controllers/JobLogController.cs
+++ b/Oqtane.Server/Controllers/JobLogController.cs
@@ -9,7 +9,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class JobLogController : Controller
{
private readonly IJobLogRepository _jobLogs;
@@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public IEnumerable Get()
{
return _jobLogs.GetJobLogs();
@@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public JobLog Get(int id)
{
return _jobLogs.GetJobLog(id);
@@ -39,7 +39,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public JobLog Post([FromBody] JobLog jobLog)
{
if (ModelState.IsValid)
@@ -52,7 +52,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public JobLog Put(int id, [FromBody] JobLog jobLog)
{
if (ModelState.IsValid)
@@ -65,7 +65,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Delete(int id)
{
_jobLogs.DeleteJobLog(id);
diff --git a/Oqtane.Server/Controllers/LogController.cs b/Oqtane.Server/Controllers/LogController.cs
index 8cccfd12..4de0abcb 100644
--- a/Oqtane.Server/Controllers/LogController.cs
+++ b/Oqtane.Server/Controllers/LogController.cs
@@ -9,7 +9,7 @@ using Oqtane.Shared;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class LogController : Controller
{
private readonly ILogManager _logger;
@@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/?siteid=x&level=y&function=z&rows=50
[HttpGet]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public IEnumerable Get(string siteid, string level, string function, string rows)
{
return _logs.GetLogs(int.Parse(siteid), level, function, int.Parse(rows));
@@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Log Get(int id)
{
return _logs.GetLog(id);
diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs
index b90db0b8..4fe6c846 100644
--- a/Oqtane.Server/Controllers/ModuleController.cs
+++ b/Oqtane.Server/Controllers/ModuleController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Oqtane.Models;
@@ -11,23 +11,29 @@ using Oqtane.Security;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class ModuleController : Controller
{
private readonly IModuleRepository _modules;
private readonly IPageModuleRepository _pageModules;
private readonly IPageRepository _pages;
private readonly IModuleDefinitionRepository _moduleDefinitions;
+ private readonly ISettingRepository _settings;
private readonly IUserPermissions _userPermissions;
+ private readonly ITenantResolver _tenants;
+ private readonly ISyncManager _syncManager;
private readonly ILogManager _logger;
- public ModuleController(IModuleRepository modules, IPageModuleRepository pageModules, IPageRepository pages, IModuleDefinitionRepository moduleDefinitions, IUserPermissions userPermissions, ILogManager logger)
+ public ModuleController(IModuleRepository modules, IPageModuleRepository pageModules, IPageRepository pages, IModuleDefinitionRepository moduleDefinitions, ISettingRepository settings, IUserPermissions userPermissions, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger)
{
- _modules = modules;
+ _modules = modules;
_pageModules = pageModules;
_pages = pages;
_moduleDefinitions = moduleDefinitions;
+ _settings = settings;
_userPermissions = userPermissions;
+ _tenants = tenants;
+ _syncManager = syncManager;
_logger = logger;
}
@@ -36,6 +42,8 @@ namespace Oqtane.Controllers
public IEnumerable Get(string siteid)
{
List moduledefinitions = _moduleDefinitions.GetModuleDefinitions(int.Parse(siteid)).ToList();
+ List settings = _settings.GetSettings(EntityNames.Module).ToList();
+
List modules = new List();
foreach (PageModule pagemodule in _pageModules.GetPageModules(int.Parse(siteid)))
{
@@ -61,6 +69,8 @@ namespace Oqtane.Controllers
module.ContainerType = pagemodule.ContainerType;
module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
+ module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
+ .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
modules.Add(module);
}
@@ -77,6 +87,9 @@ namespace Oqtane.Controllers
{
List moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
+ module.Settings = _settings.GetSettings(EntityNames.Module, id)
+ .ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
+
return module;
}
else
@@ -89,12 +102,13 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Module Post([FromBody] Module module)
{
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, module.PageId, PermissionNames.Edit))
{
module = _modules.AddModule(module);
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Module Added {Module}", module);
}
else
@@ -108,7 +122,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Module Put(int id, [FromBody] Module module)
{
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, module.ModuleId, PermissionNames.Edit))
@@ -128,6 +142,7 @@ namespace Oqtane.Controllers
}
}
}
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
}
else
{
@@ -140,12 +155,13 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id)
{
if (_userPermissions.IsAuthorized(User, EntityNames.Module, id, PermissionNames.Edit))
{
_modules.DeleteModule(id);
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Deleted {ModuleId}", id);
}
else
@@ -157,7 +173,7 @@ namespace Oqtane.Controllers
// GET api//export?moduleid=x
[HttpGet("export")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public string Export(int moduleid)
{
string content = "";
@@ -175,7 +191,7 @@ namespace Oqtane.Controllers
// POST api//import?moduleid=x
[HttpPost("import")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public bool Import(int moduleid, [FromBody] string content)
{
bool success = false;
diff --git a/Oqtane.Server/Controllers/ModuleDefinitionController.cs b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
index f1b9379f..421f54a8 100644
--- a/Oqtane.Server/Controllers/ModuleDefinitionController.cs
+++ b/Oqtane.Server/Controllers/ModuleDefinitionController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Models;
using Oqtane.Shared;
@@ -15,10 +15,11 @@ using System;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Configuration;
using System.Xml.Linq;
+using System.Text.Json;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class ModuleDefinitionController : Controller
{
private readonly IModuleDefinitionRepository _moduleDefinitions;
@@ -80,7 +81,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public void Put(int id, [FromBody] ModuleDefinition moduleDefinition)
{
if (ModelState.IsValid)
@@ -91,7 +92,7 @@ namespace Oqtane.Controllers
}
[HttpGet("install")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void InstallModules()
{
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Modules Installed");
@@ -100,7 +101,7 @@ namespace Oqtane.Controllers
// DELETE api//5?siteid=x
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Delete(int id, int siteid)
{
ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, siteid);
@@ -110,6 +111,7 @@ namespace Oqtane.Controllers
{
Type moduletype = Type.GetType(moduledefinition.ServerManagerType);
+ // execute uninstall logic
foreach (Tenant tenant in _tenants.GetTenants())
{
try
@@ -130,25 +132,28 @@ namespace Oqtane.Controllers
_logger.Log(LogLevel.Error, this, LogFunction.Delete, "Error Uninstalling {ModuleDefinitionName} For Tenant {Tenant} {Error}", moduledefinition.ModuleDefinitionName, tenant.Name, ex.Message);
}
}
-
+
+ // use assets.json to clean up file resources
+ string assetfilepath = Path.Combine(_environment.WebRootPath, "Modules", Utilities.GetTypeName(moduledefinition.ModuleDefinitionName), "assets.json");
+ if (System.IO.File.Exists(assetfilepath))
+ {
+ List assets = JsonSerializer.Deserialize>(System.IO.File.ReadAllText(assetfilepath));
+ foreach(string asset in assets)
+ {
+ if (System.IO.File.Exists(asset))
+ {
+ System.IO.File.Delete(asset);
+ }
+ }
+ _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Assets Removed For {ModuleDefinitionName}", moduledefinition.ModuleDefinitionName);
+ }
+
// clean up module static resource folder
string folder = Path.Combine(_environment.WebRootPath, Path.Combine("Modules", Utilities.GetTypeName(moduledefinition.ModuleDefinitionName)));
if (Directory.Exists(folder))
{
Directory.Delete(folder, true);
- _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Static Resources Removed For {ModuleDefinitionName}", moduledefinition.ModuleDefinitionName);
- }
-
- // get root assembly name ( note that this only works if modules follow a specific naming convention for their assemblies )
- string assemblyname = Utilities.GetAssemblyName(moduledefinition.ModuleDefinitionName).ToLower();
- assemblyname = assemblyname.Replace(".client", "").Replace(".oqtane", "");
-
- // remove module assemblies from /bin
- string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
- foreach (string file in Directory.EnumerateFiles(binfolder, assemblyname + "*.*"))
- {
- System.IO.File.Delete(file);
- _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Assembly {Filename} Removed For {ModuleDefinitionName}", file, moduledefinition.ModuleDefinitionName);
+ _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Module Resources Folder Removed For {ModuleDefinitionName}", moduledefinition.ModuleDefinitionName);
}
// remove module definition
@@ -163,7 +168,7 @@ namespace Oqtane.Controllers
// POST api/?moduleid=x
[HttpPost]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Post([FromBody] ModuleDefinition moduleDefinition, string moduleid)
{
if (ModelState.IsValid)
@@ -235,7 +240,20 @@ namespace Oqtane.Controllers
text = text.Replace("[ServerManagerType]", moduleDefinition.ServerManagerType);
text = text.Replace("[Folder]", folderPath);
text = text.Replace("[File]", Path.GetFileName(filePath));
- text = text.Replace("[FrameworkVersion]", Constants.Version);
+ if (moduleDefinition.Version == "local")
+ {
+ text = text.Replace("[FrameworkVersion]", Constants.Version);
+ text = text.Replace("[ClientReference]", "..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Client.dll ..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Server.dll ..\\..\\oqtane.framework\\Oqtane.Server\\bin\\Debug\\net5.0\\Oqtane.Shared.dll ?siteid=x&type=y&userid=z
[HttpGet]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public IEnumerable Get(string siteid, string direction, string userid)
{
IEnumerable notifications = null;
@@ -46,7 +46,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Notification Get(int id)
{
Notification notification = _notifications.GetNotification(id);
@@ -59,7 +59,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Notification Post([FromBody] Notification notification)
{
if (IsAuthorized(notification.FromUserId))
@@ -72,7 +72,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Notification Put(int id, [FromBody] Notification notification)
{
if (IsAuthorized(notification.FromUserId))
@@ -85,7 +85,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id)
{
Notification notification = _notifications.GetNotification(id);
diff --git a/Oqtane.Server/Controllers/PackageController.cs b/Oqtane.Server/Controllers/PackageController.cs
index 51194245..96af1346 100644
--- a/Oqtane.Server/Controllers/PackageController.cs
+++ b/Oqtane.Server/Controllers/PackageController.cs
@@ -15,7 +15,7 @@ using Oqtane.Shared;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class PackageController : Controller
{
private readonly IWebHostEnvironment _environment;
@@ -27,15 +27,14 @@ namespace Oqtane.Controllers
// GET: api/?tag=x
[HttpGet]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public async Task> Get(string tag)
{
List packages = new List();
using (var httpClient = new HttpClient())
{
- CancellationToken token;
- var searchResult = await GetJson(httpClient, "https://azuresearch-usnc.nuget.org/query?q=tags:oqtane", token);
+ var searchResult = await GetJson(httpClient, "https://azuresearch-usnc.nuget.org/query?q=tags:oqtane");
foreach(Data data in searchResult.Data)
{
if (data.Tags.Contains(tag))
@@ -56,14 +55,13 @@ namespace Oqtane.Controllers
}
[HttpPost]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public async Task Post(string packageid, string version, string folder)
{
using (var httpClient = new HttpClient())
{
- CancellationToken token;
folder = Path.Combine(_environment.WebRootPath, folder);
- var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version, token).ConfigureAwait(false);
+ var response = await httpClient.GetAsync("https://www.nuget.org/api/v2/package/" + packageid.ToLower() + "/" + version).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
string filename = packageid + "." + version + ".nupkg";
using (var fileStream = new FileStream(Path.Combine(folder, filename), FileMode.Create, FileAccess.Write, FileShare.None))
@@ -73,10 +71,10 @@ namespace Oqtane.Controllers
}
}
- private async Task GetJson(HttpClient httpClient, string url, CancellationToken token)
+ private async Task GetJson(HttpClient httpClient, string url)
{
Uri uri = new Uri(url);
- var response = await httpClient.GetAsync(uri, token).ConfigureAwait(false);
+ var response = await httpClient.GetAsync(uri).ConfigureAwait(false);
response.EnsureSuccessStatusCode();
var stream = await response.Content.ReadAsStreamAsync();
using (var streamReader = new StreamReader(stream))
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index 01645921..aab9c23d 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -13,7 +13,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class PageController : Controller
{
private readonly IPageRepository _pages;
@@ -102,7 +102,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Page Post([FromBody] Page page)
{
if (ModelState.IsValid)
@@ -115,7 +115,7 @@ namespace Oqtane.Controllers
else
{
permissions = new List {
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions();
}
@@ -147,7 +147,7 @@ namespace Oqtane.Controllers
// POST api//5?userid=x
[HttpPost("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Page Post(int id, string userid)
{
Page page = null;
@@ -213,7 +213,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Page Put(int id, [FromBody] Page page)
{
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, page.PageId, PermissionNames.Edit))
@@ -233,7 +233,7 @@ namespace Oqtane.Controllers
// PUT api//?siteid=x&pageid=y&parentid=z
[HttpPut]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Put(int siteid, int pageid, int? parentid)
{
if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
@@ -261,7 +261,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id)
{
Page page = _pages.GetPage(id);
diff --git a/Oqtane.Server/Controllers/PageModuleController.cs b/Oqtane.Server/Controllers/PageModuleController.cs
index f2c0d489..e9cabfba 100644
--- a/Oqtane.Server/Controllers/PageModuleController.cs
+++ b/Oqtane.Server/Controllers/PageModuleController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Oqtane.Models;
@@ -11,7 +11,7 @@ using Oqtane.Security;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class PageModuleController : Controller
{
private readonly IPageModuleRepository _pageModules;
@@ -65,13 +65,13 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public PageModule Post([FromBody] PageModule pageModule)
{
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Page, pageModule.PageId, PermissionNames.Edit))
{
pageModule = _pageModules.AddPageModule(pageModule);
- _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pageModule.PageId);
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Page Module Added {PageModule}", pageModule);
}
else
@@ -85,13 +85,13 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public PageModule Put(int id, [FromBody] PageModule pageModule)
{
if (ModelState.IsValid && _userPermissions.IsAuthorized(User, EntityNames.Module, pageModule.ModuleId, PermissionNames.Edit))
{
pageModule = _pageModules.UpdatePageModule(pageModule);
- _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pageModule.PageId);
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Updated {PageModule}", pageModule);
}
else
@@ -105,7 +105,7 @@ namespace Oqtane.Controllers
// PUT api//?pageid=x&pane=y
[HttpPut]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Put(int pageid, string pane)
{
if (_userPermissions.IsAuthorized(User, EntityNames.Page, pageid, PermissionNames.Edit))
@@ -121,7 +121,7 @@ namespace Oqtane.Controllers
}
order += 2;
}
- _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pageid);
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Page Module Order Updated {PageId} {Pane}", pageid, pane);
}
else
@@ -133,14 +133,14 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public void Delete(int id)
{
PageModule pagemodule = _pageModules.GetPageModule(id);
if (_userPermissions.IsAuthorized(User, EntityNames.Page, pagemodule.PageId, PermissionNames.Edit))
{
_pageModules.DeletePageModule(id);
- _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Page, pagemodule.PageId);
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Page Module Deleted {PageModuleId}", id);
}
else
diff --git a/Oqtane.Server/Controllers/ProfileController.cs b/Oqtane.Server/Controllers/ProfileController.cs
index aa1158ac..19411487 100644
--- a/Oqtane.Server/Controllers/ProfileController.cs
+++ b/Oqtane.Server/Controllers/ProfileController.cs
@@ -9,7 +9,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class ProfileController : Controller
{
private readonly IProfileRepository _profiles;
@@ -37,7 +37,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Profile Post([FromBody] Profile profile)
{
if (ModelState.IsValid)
@@ -50,7 +50,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Profile Put(int id, [FromBody] Profile profile)
{
if (ModelState.IsValid)
@@ -63,7 +63,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id)
{
_profiles.DeleteProfile(id);
diff --git a/Oqtane.Server/Controllers/RoleController.cs b/Oqtane.Server/Controllers/RoleController.cs
index 418382c5..708e20c3 100644
--- a/Oqtane.Server/Controllers/RoleController.cs
+++ b/Oqtane.Server/Controllers/RoleController.cs
@@ -9,7 +9,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class RoleController : Controller
{
private readonly IRoleRepository _roles;
@@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/?siteid=x
[HttpGet]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public IEnumerable Get(string siteid)
{
return _roles.GetRoles(int.Parse(siteid));
@@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public Role Get(int id)
{
return _roles.GetRole(id);
@@ -39,7 +39,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Role Post([FromBody] Role role)
{
if (ModelState.IsValid)
@@ -52,7 +52,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Role Put(int id, [FromBody] Role role)
{
if (ModelState.IsValid)
@@ -65,7 +65,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id)
{
_roles.DeleteRole(id);
diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs
index e9be3798..71645a1b 100644
--- a/Oqtane.Server/Controllers/SettingController.cs
+++ b/Oqtane.Server/Controllers/SettingController.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Models;
using Oqtane.Shared;
@@ -10,19 +10,23 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class SettingController : Controller
{
private readonly ISettingRepository _settings;
private readonly IPageModuleRepository _pageModules;
private readonly IUserPermissions _userPermissions;
+ private readonly ITenantResolver _tenants;
+ private readonly ISyncManager _syncManager;
private readonly ILogManager _logger;
- public SettingController(ISettingRepository settings, IPageModuleRepository pageModules, IUserPermissions userPermissions, ILogManager logger)
+ public SettingController(ISettingRepository settings, IPageModuleRepository pageModules, IUserPermissions userPermissions, ITenantResolver tenants, ISyncManager syncManager, ILogManager logger)
{
_settings = settings;
_pageModules = pageModules;
_userPermissions = userPermissions;
+ _tenants = tenants;
+ _syncManager = syncManager;
_logger = logger;
}
@@ -67,6 +71,10 @@ namespace Oqtane.Controllers
if (ModelState.IsValid && IsAuthorized(setting.EntityName, setting.EntityId, PermissionNames.Edit))
{
setting = _settings.AddSetting(setting);
+ if (setting.EntityName == EntityNames.Module)
+ {
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
+ }
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Setting Added {Setting}", setting);
}
else
@@ -85,6 +93,10 @@ namespace Oqtane.Controllers
if (ModelState.IsValid && IsAuthorized(setting.EntityName, setting.EntityId, PermissionNames.Edit))
{
setting = _settings.UpdateSetting(setting);
+ if (setting.EntityName == EntityNames.Module)
+ {
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
+ }
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Setting Updated {Setting}", setting);
}
else
@@ -104,6 +116,10 @@ namespace Oqtane.Controllers
if (IsAuthorized(setting.EntityName, setting.EntityId, PermissionNames.Edit))
{
_settings.DeleteSetting(id);
+ if (setting.EntityName == EntityNames.Module)
+ {
+ _syncManager.AddSyncEvent(_tenants.GetTenant().TenantId, EntityNames.Site, _tenants.GetAlias().SiteId);
+ }
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "Setting Deleted {Setting}", setting);
}
else
@@ -124,10 +140,10 @@ namespace Oqtane.Controllers
switch (entityName)
{
case EntityNames.Tenant:
- authorized = User.IsInRole(Constants.HostRole);
+ authorized = User.IsInRole(RoleNames.Host);
break;
case EntityNames.Site:
- authorized = User.IsInRole(Constants.AdminRole);
+ authorized = User.IsInRole(RoleNames.Admin);
break;
case EntityNames.Page:
case EntityNames.Module:
@@ -138,7 +154,7 @@ namespace Oqtane.Controllers
authorized = true;
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;
}
diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs
index c358ea3c..43a10dd1 100644
--- a/Oqtane.Server/Controllers/SiteController.cs
+++ b/Oqtane.Server/Controllers/SiteController.cs
@@ -10,7 +10,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class SiteController : Controller
{
private readonly ISiteRepository _sites;
@@ -28,7 +28,7 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public IEnumerable Get()
{
return _sites.GetSites();
@@ -57,7 +57,7 @@ namespace Oqtane.Controllers
}
else
{
- authorized = User.IsInRole(Constants.HostRole);
+ authorized = User.IsInRole(RoleNames.Host);
}
if (authorized)
{
@@ -70,7 +70,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Site Put(int id, [FromBody] Site site)
{
if (ModelState.IsValid)
@@ -84,7 +84,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Delete(int id)
{
_sites.DeleteSite(id);
diff --git a/Oqtane.Server/Controllers/SiteTemplateController.cs b/Oqtane.Server/Controllers/SiteTemplateController.cs
index c63170c1..abb9e19b 100644
--- a/Oqtane.Server/Controllers/SiteTemplateController.cs
+++ b/Oqtane.Server/Controllers/SiteTemplateController.cs
@@ -7,7 +7,7 @@ using Oqtane.Shared;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class SiteTemplateController : Controller
{
private readonly ISiteTemplateRepository _siteTemplates;
@@ -19,7 +19,7 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public IEnumerable Get()
{
return _siteTemplates.GetSiteTemplates();
diff --git a/Oqtane.Server/Controllers/SqlController.cs b/Oqtane.Server/Controllers/SqlController.cs
index 5bce5a92..7e7bedcc 100644
--- a/Oqtane.Server/Controllers/SqlController.cs
+++ b/Oqtane.Server/Controllers/SqlController.cs
@@ -14,7 +14,7 @@ using System;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class SqlController : Controller
{
private readonly ITenantRepository _tenants;
@@ -30,7 +30,7 @@ namespace Oqtane.Controllers
// POST: api/
[HttpPost]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public SqlQuery Post([FromBody] SqlQuery sqlquery)
{
var results = new List>();
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index 2f5d7339..61c5593b 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Hosting;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class SystemController : Controller
{
private readonly IWebHostEnvironment _environment;
@@ -19,7 +19,7 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public Dictionary Get()
{
Dictionary systeminfo = new Dictionary();
diff --git a/Oqtane.Server/Controllers/TenantController.cs b/Oqtane.Server/Controllers/TenantController.cs
index 0f76fc78..6670d4dd 100644
--- a/Oqtane.Server/Controllers/TenantController.cs
+++ b/Oqtane.Server/Controllers/TenantController.cs
@@ -9,7 +9,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class TenantController : Controller
{
private readonly ITenantRepository _tenants;
@@ -23,7 +23,7 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public IEnumerable Get()
{
return _tenants.GetTenants();
@@ -31,7 +31,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public Tenant Get(int id)
{
return _tenants.GetTenant(id);
@@ -39,7 +39,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public Tenant Post([FromBody] Tenant tenant)
{
if (ModelState.IsValid)
@@ -52,7 +52,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public Tenant Put(int id, [FromBody] Tenant tenant)
{
if (ModelState.IsValid)
@@ -65,7 +65,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Delete(int id)
{
_tenants.DeleteTenant(id);
diff --git a/Oqtane.Server/Controllers/ThemeController.cs b/Oqtane.Server/Controllers/ThemeController.cs
index 03836680..0aa6916c 100644
--- a/Oqtane.Server/Controllers/ThemeController.cs
+++ b/Oqtane.Server/Controllers/ThemeController.cs
@@ -10,12 +10,13 @@ using Microsoft.AspNetCore.Hosting;
using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Repository;
+using System.Text.Json;
// ReSharper disable StringIndexOfIsCultureSpecific.1
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class ThemeController : Controller
{
private readonly IThemeRepository _themes;
@@ -33,14 +34,14 @@ namespace Oqtane.Controllers
// GET: api/
[HttpGet]
- [Authorize(Roles = Constants.RegisteredRole)]
+ [Authorize(Roles = RoleNames.Registered)]
public IEnumerable Get()
{
return _themes.GetThemes();
}
[HttpGet("install")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void InstallThemes()
{
_logger.Log(LogLevel.Information, this, LogFunction.Create, "Themes Installed");
@@ -49,47 +50,39 @@ namespace Oqtane.Controllers
// DELETE api//xxx
[HttpDelete("{themename}")]
- [Authorize(Roles = Constants.HostRole)]
+ [Authorize(Roles = RoleNames.Host)]
public void Delete(string themename)
{
List themes = _themes.GetThemes().ToList();
Theme theme = themes.Where(item => item.ThemeName == themename).FirstOrDefault();
if (theme != null && Utilities.GetAssemblyName(theme.ThemeName) != "Oqtane.Client")
{
+ // use assets.json to clean up file resources
+ string assetfilepath = Path.Combine(_environment.WebRootPath, "Themes", Utilities.GetTypeName(theme.ThemeName), "assets.json");
+ if (System.IO.File.Exists(assetfilepath))
+ {
+ List assets = JsonSerializer.Deserialize>(System.IO.File.ReadAllText(assetfilepath));
+ foreach (string asset in assets)
+ {
+ if (System.IO.File.Exists(asset))
+ {
+ System.IO.File.Delete(asset);
+ }
+ }
+ _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Assets Removed For {ThemeName}", theme.ThemeName);
+ }
+
// clean up theme static resource folder
string folder = Path.Combine(_environment.WebRootPath, "Themes" , Utilities.GetTypeName(theme.ThemeName));
if (Directory.Exists(folder))
{
Directory.Delete(folder, true);
- _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Static Resources Removed For {ThemeName}", theme.ThemeName);
+ _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Resource Folder Removed For {ThemeName}", theme.ThemeName);
}
- // remove theme assembly from /bin
- string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
- System.IO.File.Delete(Path.Combine(binfolder, Utilities.GetAssemblyName(theme.ThemeName) + ".dll"));
- _logger.Log(LogLevel.Information, this, LogFunction.Delete, "Theme Assembly {Filename} Removed For {ThemeName}", Utilities.GetAssemblyName(theme.ThemeName) + ".dll", themename);
-
_installationManager.RestartApplication();
}
}
- // GET api//load/assembyname
- [HttpGet("load/{assemblyname}")]
- public IActionResult Load(string assemblyname)
- {
- if (Path.GetExtension(assemblyname).ToLower() == ".dll")
- {
- string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
- byte[] file = System.IO.File.ReadAllBytes(Path.Combine(binfolder, assemblyname));
- return File(file, "application/octet-stream", assemblyname);
- }
- else
- {
- _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Download Assembly {Assembly}", assemblyname);
- HttpContext.Response.StatusCode = 401;
- return null;
- }
- }
-
}
}
diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs
index 7ce9d1e5..5a97087a 100644
--- a/Oqtane.Server/Controllers/UserController.cs
+++ b/Oqtane.Server/Controllers/UserController.cs
@@ -14,10 +14,11 @@ using System.Net;
using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Repository;
+using Oqtane.Extensions;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class UserController : Controller
{
private readonly IUserRepository _users;
@@ -76,7 +77,7 @@ namespace Oqtane.Controllers
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.Email = "";
@@ -117,7 +118,7 @@ namespace Oqtane.Controllers
bool verified;
bool allowregistration;
- if (user.Username == Constants.HostUser || User.IsInRole(Constants.AdminRole))
+ if (user.Username == UserNames.Host || User.IsInRole(RoleNames.Admin))
{
verified = true;
allowregistration = true;
@@ -163,9 +164,9 @@ namespace Oqtane.Controllers
}
// assign to host role if this is the host user ( initial installation )
- if (user.Username == Constants.HostUser)
+ if (user.Username == UserNames.Host)
{
- 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.UserId = newUser.UserId;
userrole.RoleId = hostroleid;
@@ -186,8 +187,12 @@ namespace Oqtane.Controllers
Path = Utilities.PathCombine(folder.Path, newUser.UserId.ToString(),Path.DirectorySeparatorChar.ToString()),
Order = 1,
IsSystem = true,
- Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"[" + newUser.UserId.ToString() + "]\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"[" +
- newUser.UserId.ToString() + "]\"}]"
+ Permissions = new List
+ {
+ new Permission(PermissionNames.Browse, newUser.UserId, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, newUser.UserId, true)
+ }.EncodePermissions()
});
}
}
@@ -201,7 +206,7 @@ namespace Oqtane.Controllers
}
}
- if (newUser != null && user.Username != Constants.HostUser)
+ if (newUser != null && user.Username != UserNames.Host)
{
// add auto assigned roles to user for site
List roles = _roles.GetRoles(user.SiteId).Where(item => item.IsAutoAssigned).ToList();
@@ -237,7 +242,7 @@ namespace Oqtane.Controllers
{
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 != "")
{
@@ -265,7 +270,7 @@ namespace Oqtane.Controllers
// DELETE api//5?siteid=x
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public async Task Delete(int id)
{
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(_users.GetUser(id).Username);
@@ -455,9 +460,9 @@ namespace Oqtane.Controllers
foreach (UserRole userrole in userroles)
{
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;
diff --git a/Oqtane.Server/Controllers/UserRoleController.cs b/Oqtane.Server/Controllers/UserRoleController.cs
index 50b6d957..11c875de 100644
--- a/Oqtane.Server/Controllers/UserRoleController.cs
+++ b/Oqtane.Server/Controllers/UserRoleController.cs
@@ -9,7 +9,7 @@ using Oqtane.Repository;
namespace Oqtane.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class UserRoleController : Controller
{
private readonly IUserRoleRepository _userRoles;
@@ -27,7 +27,7 @@ namespace Oqtane.Controllers
// GET: api/?siteid=x
[HttpGet]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public IEnumerable Get(string siteid)
{
return _userRoles.GetUserRoles(int.Parse(siteid));
@@ -35,7 +35,7 @@ namespace Oqtane.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public UserRole Get(int id)
{
return _userRoles.GetUserRole(id);
@@ -43,7 +43,7 @@ namespace Oqtane.Controllers
// POST api/
[HttpPost]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public UserRole Post([FromBody] UserRole userRole)
{
if (ModelState.IsValid)
@@ -57,7 +57,7 @@ namespace Oqtane.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public UserRole Put(int id, [FromBody] UserRole userRole)
{
if (ModelState.IsValid)
@@ -71,7 +71,7 @@ namespace Oqtane.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Roles = Constants.AdminRole)]
+ [Authorize(Roles = RoleNames.Admin)]
public void Delete(int id)
{
UserRole userRole = _userRoles.GetUserRole(id);
diff --git a/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs b/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs
index d1c77301..67676d16 100644
--- a/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs
+++ b/Oqtane.Server/Extensions/ApplicationBuilderExtensions.cs
@@ -1,8 +1,10 @@
using System;
+using System.Globalization;
using System.Linq;
using System.Reflection;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
using Oqtane.Infrastructure;
namespace Oqtane.Extensions
@@ -22,5 +24,22 @@ namespace Oqtane.Extensions
return app;
}
+
+ public static IApplicationBuilder UseOqtaneLocalization(this IApplicationBuilder app)
+ {
+ var localizationManager = app.ApplicationServices.GetService();
+ var defaultCulture = localizationManager.GetDefaultCulture();
+ var supportedCultures = localizationManager.GetSupportedCultures();
+
+ CultureInfo.CurrentUICulture = new CultureInfo(defaultCulture);
+
+ app.UseRequestLocalization(options => {
+ options.SetDefaultCulture(defaultCulture)
+ .AddSupportedUICultures(supportedCultures)
+ .AddSupportedUICultures(supportedCultures);
+ });
+
+ return app;
+ }
}
}
diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
index f49d189a..3afb023b 100644
--- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.IO;
using System.Linq;
using System.Reflection;
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Hosting;
using Oqtane.Infrastructure;
using Oqtane.Modules;
using Oqtane.Services;
+using Oqtane.Shared;
using Oqtane.UI;
// ReSharper disable once CheckNamespace
@@ -14,10 +15,12 @@ namespace Microsoft.Extensions.DependencyInjection
{
public static class OqtaneServiceCollectionExtensions
{
- public static IServiceCollection AddOqtaneParts(this IServiceCollection services, Runtime runtime)
+ public static IServiceCollection AddOqtane(this IServiceCollection services, Runtime runtime, string[] supportedCultures)
{
LoadAssemblies();
+ LoadSatelliteAssemblies(supportedCultures);
services.AddOqtaneServices(runtime);
+
return services;
}
@@ -29,6 +32,7 @@ namespace Microsoft.Extensions.DependencyInjection
}
var hostedServiceType = typeof(IHostedService);
+
var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
foreach (var assembly in assemblies)
{
@@ -53,6 +57,7 @@ namespace Microsoft.Extensions.DependencyInjection
}
}
+ // register server startup services
var startUps = assembly.GetInstances();
foreach (var startup in startUps)
{
@@ -61,6 +66,7 @@ namespace Microsoft.Extensions.DependencyInjection
if (runtime == Runtime.Server)
{
+ // register client startup services if running on server
assembly.GetInstances()
.ToList()
.ForEach(x => x.ConfigureServices(services));
@@ -119,6 +125,58 @@ namespace Microsoft.Extensions.DependencyInjection
}
}
+ private static void LoadSatelliteAssemblies(string[] supportedCultures)
+ {
+ var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+ var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
+ if (assemblyPath == null)
+ {
+ return;
+ }
+
+ AssemblyLoadContext.Default.Resolving += ResolveDependencies;
+
+ foreach (var culture in supportedCultures)
+ {
+ if (culture == Constants.DefaultCulture)
+ {
+ continue;
+ }
+
+ var assembliesFolder = new DirectoryInfo(Path.Combine(assemblyPath, culture));
+ if (assembliesFolder.Exists)
+ {
+ foreach (var assemblyFile in assembliesFolder.EnumerateFiles(Constants.SatelliteAssemblyExtension))
+ {
+ AssemblyName assemblyName;
+ try
+ {
+ assemblyName = AssemblyName.GetAssemblyName(assemblyFile.FullName);
+ }
+ catch
+ {
+ Console.WriteLine($"Not Satellite Assembly : {assemblyFile.Name}");
+ continue;
+ }
+
+ try
+ {
+ Assembly assembly = AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(File.ReadAllBytes(assemblyFile.FullName)));
+ Console.WriteLine($"Loaded : {assemblyName}");
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine($"Failed : {assemblyName}\n{e}");
+ }
+ }
+ }
+ else
+ {
+ Console.WriteLine($"The satellite assemblies folder named '{culture}' is not found.");
+ }
+ }
+ }
+
private static Assembly ResolveDependencies(AssemblyLoadContext context, AssemblyName name)
{
var assemblyPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location) + "\\" + name.Name + ".dll";
diff --git a/Oqtane.Server/Extensions/WebHostBuilderExtensions.cs b/Oqtane.Server/Extensions/WebHostBuilderExtensions.cs
new file mode 100644
index 00000000..3e9b8fc7
--- /dev/null
+++ b/Oqtane.Server/Extensions/WebHostBuilderExtensions.cs
@@ -0,0 +1,21 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Oqtane.Infrastructure;
+
+namespace Microsoft.AspNetCore.Hosting
+{
+ public static class WebHostBuilderExtensions
+ {
+ public static IWebHostBuilder ConfigureLocalizationSettings(this IWebHostBuilder builder)
+ {
+ return builder.ConfigureServices((context, services) =>
+ {
+ var config = context.Configuration;
+
+ services.Configure(config.GetSection("Localization"));
+ services.AddSingleton(ctx => ctx.GetService>().Value);
+ services.AddTransient();
+ });
+ }
+ }
+}
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 6aa2369a..4f598322 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -72,7 +72,7 @@ namespace Oqtane.Infrastructure
if (install == null)
{
// startup or silent installation
- install = new InstallConfig { ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), TenantName = Constants.MasterTenant, IsNewTenant = false };
+ install = new InstallConfig { ConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey), TenantName = TenantNames.Master, IsNewTenant = false };
if (!IsInstalled())
{
@@ -83,7 +83,7 @@ namespace Oqtane.Infrastructure
if (!string.IsNullOrEmpty(install.ConnectionString) && !string.IsNullOrEmpty(install.Aliases) && !string.IsNullOrEmpty(install.HostPassword) && !string.IsNullOrEmpty(install.HostEmail))
{
// silent install
- install.HostName = Constants.HostUser;
+ install.HostName = UserNames.Host;
install.SiteTemplate = GetInstallationConfig(SettingKeys.SiteTemplateKey, Constants.DefaultSiteTemplate);
install.DefaultTheme = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme);
install.DefaultLayout = GetInstallationConfig(SettingKeys.DefaultLayoutKey, Constants.DefaultLayout);
@@ -192,7 +192,7 @@ namespace Oqtane.Infrastructure
{
var result = new Installation { Success = false, Message = string.Empty };
- if (install.TenantName == Constants.MasterTenant)
+ if (install.TenantName == TenantNames.Master)
{
MigrateScriptNamingConvention("Master", install.ConnectionString);
@@ -245,7 +245,7 @@ namespace Oqtane.Infrastructure
db.SaveChanges();
_cache.Remove("tenants");
- if (install.TenantName == Constants.MasterTenant)
+ if (install.TenantName == TenantNames.Master)
{
var job = new Job { Name = "Notification Job", JobType = "Oqtane.Infrastructure.NotificationJob, Oqtane.Server", Frequency = "m", Interval = 1, StartDate = null, EndDate = null, IsEnabled = false, IsStarted = false, IsExecuting = false, NextExecution = null, RetentionHistory = 10, CreatedBy = "", CreatedOn = DateTime.UtcNow, ModifiedBy = "", ModifiedOn = DateTime.UtcNow };
db.Job.Add(job);
@@ -350,7 +350,7 @@ namespace Oqtane.Infrastructure
foreach (var tenant in db.Tenant.ToList())
{
int index = Array.FindIndex(versions, item => item == moduledefinition.Version);
- if (tenant.Name == install.TenantName && install.TenantName != Constants.MasterTenant)
+ if (tenant.Name == install.TenantName && install.TenantName != TenantNames.Master)
{
index = -1;
}
@@ -439,17 +439,17 @@ namespace Oqtane.Infrastructure
};
site = sites.AddSite(site);
- IdentityUser identityUser = identityUserManager.FindByNameAsync(Constants.HostUser).GetAwaiter().GetResult();
+ IdentityUser identityUser = identityUserManager.FindByNameAsync(UserNames.Host).GetAwaiter().GetResult();
if (identityUser == null)
{
- identityUser = new IdentityUser { UserName = Constants.HostUser, Email = install.HostEmail, EmailConfirmed = true };
+ identityUser = new IdentityUser { UserName = UserNames.Host, Email = install.HostEmail, EmailConfirmed = true };
var create = identityUserManager.CreateAsync(identityUser, install.HostPassword).GetAwaiter().GetResult();
if (create.Succeeded)
{
var user = new User
{
SiteId = site.SiteId,
- Username = Constants.HostUser,
+ Username = UserNames.Host,
Password = install.HostPassword,
Email = install.HostEmail,
DisplayName = install.HostName,
@@ -458,7 +458,7 @@ namespace Oqtane.Infrastructure
};
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 };
userroles.AddUserRole(userRole);
@@ -477,7 +477,7 @@ namespace Oqtane.Infrastructure
Permissions = new List
{
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),
}.EncodePermissions(),
});
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index 3fbf40cd..00fb0895 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -1,8 +1,10 @@
-using System;
+using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Reflection;
+using System.Text.Json;
using System.Xml;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Caching.Memory;
@@ -80,6 +82,8 @@ namespace Oqtane.Infrastructure
// if compatible with framework version
if (frameworkversion == "" || Version.Parse(Constants.Version).CompareTo(Version.Parse(frameworkversion)) >= 0)
{
+ List assets = new List();
+
// module and theme packages must be in form of name.1.0.0.nupkg
string name = Path.GetFileNameWithoutExtension(packagename);
string[] segments = name?.Split('.');
@@ -96,18 +100,32 @@ namespace Oqtane.Infrastructure
case "lib":
filename = Path.Combine(binFolder, filename);
ExtractFile(entry, filename);
+ assets.Add(filename);
break;
case "wwwroot":
- filename = Path.Combine(webRootPath.Replace(Path.DirectorySeparatorChar + "wwwroot", ""), Utilities.PathCombine(entry.FullName.Split('/')));
+ filename = Path.Combine(webRootPath, Utilities.PathCombine(entry.FullName.Replace("wwwroot/", "").Split('/')));
ExtractFile(entry, filename);
+ assets.Add(filename);
break;
case "runtimes":
var destSubFolder = Path.GetDirectoryName(entry.FullName);
filename = Path.Combine(binFolder, destSubFolder, filename);
ExtractFile(entry, filename);
+ assets.Add(filename);
break;
}
}
+
+ // save list of assets
+ if (assets.Count != 0)
+ {
+ string assetfilepath = Path.Combine(webRootPath, folder, name, "assets.json");
+ if (File.Exists(assetfilepath))
+ {
+ File.Delete(assetfilepath);
+ }
+ File.WriteAllText(assetfilepath, JsonSerializer.Serialize(assets));
+ }
}
}
diff --git a/Oqtane.Server/Infrastructure/Interfaces/IHostResources.cs b/Oqtane.Server/Infrastructure/Interfaces/IHostResources.cs
new file mode 100644
index 00000000..f22c53f0
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Interfaces/IHostResources.cs
@@ -0,0 +1,12 @@
+using Oqtane.Models;
+using System.Collections.Generic;
+
+namespace Oqtane.Infrastructure
+{
+ // this interface is for declaring global resources and is useful for scenarios where you want to declare resources in a single location for the entire application
+ public interface IHostResources
+ {
+ List Resources { get; } // identifies global resources for an application
+ }
+}
+
diff --git a/Oqtane.Server/Infrastructure/Interfaces/ILocalizationManager.cs b/Oqtane.Server/Infrastructure/Interfaces/ILocalizationManager.cs
new file mode 100644
index 00000000..fa20eef4
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Interfaces/ILocalizationManager.cs
@@ -0,0 +1,9 @@
+namespace Oqtane.Infrastructure
+{
+ public interface ILocalizationManager
+ {
+ string GetDefaultCulture();
+
+ string[] GetSupportedCultures();
+ }
+}
diff --git a/Oqtane.Server/Infrastructure/Localization/LocalizationOptions.cs b/Oqtane.Server/Infrastructure/Localization/LocalizationOptions.cs
new file mode 100644
index 00000000..6330130e
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/Localization/LocalizationOptions.cs
@@ -0,0 +1,9 @@
+namespace Oqtane.Infrastructure
+{
+ public class LocalizationOptions
+ {
+ public string DefaultCulture { get; set; }
+
+ public string[] SupportedCultures { get; set; }
+ }
+}
diff --git a/Oqtane.Server/Infrastructure/LocalizationManager.cs b/Oqtane.Server/Infrastructure/LocalizationManager.cs
new file mode 100644
index 00000000..22b4ca79
--- /dev/null
+++ b/Oqtane.Server/Infrastructure/LocalizationManager.cs
@@ -0,0 +1,29 @@
+using System.Collections;
+using Microsoft.Extensions.Options;
+using Oqtane.Shared;
+
+namespace Oqtane.Infrastructure
+{
+ public class LocalizationManager : ILocalizationManager
+ {
+ private static readonly string DefaultCulture = Constants.DefaultCulture;
+ private static readonly string[] SupportedCultures = new[] { DefaultCulture };
+
+ private readonly LocalizationOptions _localizationOptions;
+
+ public LocalizationManager(IOptions localizationOptions)
+ {
+ _localizationOptions = localizationOptions.Value;
+ }
+
+ public string GetDefaultCulture()
+ => string.IsNullOrEmpty(_localizationOptions.DefaultCulture)
+ ? DefaultCulture
+ : _localizationOptions.DefaultCulture;
+
+ public string[] GetSupportedCultures()
+ => _localizationOptions.SupportedCultures.IsNullOrEmpty()
+ ? SupportedCultures
+ : _localizationOptions.SupportedCultures;
+ }
+}
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
index 8b71c33b..688a1b25 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/DefaultSiteTemplate.cs
@@ -1,4 +1,4 @@
-using Oqtane.Models;
+using Oqtane.Models;
using Oqtane.Infrastructure;
using System.Collections.Generic;
using Oqtane.Repository;
@@ -43,27 +43,27 @@ namespace Oqtane.SiteTemplates
IsNavigation = true,
IsPersonalizable = false,
PagePermissions = new List {
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions() ,
PageTemplateModules = new List {
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Welcome To Oqtane...", Pane = "Content",
ModulePermissions = new List {
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = "Oqtane is an open source modular application framework 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 fully dynamic web development experience which can be hosted either client-side or server-side. Whether you are looking for a platform to accelerate your web development 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.
" +
- "
Join Our Community Clone Our Repo
" +
+ "
Join Our Community Clone Our Repo
" +
"Blazor is an open source and cross-platform web UI framework for building single-page apps using .NET and C# instead of JavaScript. Blazor WebAssembly relies on Wasm, an open web standard that does not require plugins or code transpilation in order to run natively in a web browser. Blazor Server uses SignalR to host your application on a web server and provide a responsive and robust development experience. Blazor applications work in all modern web browsers, including mobile browsers.
" +
"Blazor is a feature of ASP.NET Core 3 , the popular cross platform web development framework from Microsoft that extends the .NET developer platform with tools and libraries for building web apps.
"
},
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "MIT License", Pane = "Content",
ModulePermissions = new List {
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = "Copyright (c) 2019-2020 .NET Foundation
" +
"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:
" +
@@ -72,9 +72,9 @@ namespace Oqtane.SiteTemplates
},
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
ModulePermissions = new List {
- new Permission(PermissionNames.View, Constants.RegisteredRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Registered, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = "Oqtane allows you to control access to your content using security roles. This module is only visible to Registered Users of the site.
"
}
@@ -89,16 +89,16 @@ namespace Oqtane.SiteTemplates
IsNavigation = true,
IsPersonalizable = false,
PagePermissions = new List {
- new Permission(PermissionNames.View, Constants.RegisteredRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Registered, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List {
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "Secure Content", Pane = "Content",
ModulePermissions = new List {
- new Permission(PermissionNames.View, Constants.RegisteredRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Registered, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = "Oqtane allows you to control access to your content using security roles. This page is only visible to Registered Users of the site.
"
}
@@ -113,16 +113,16 @@ namespace Oqtane.SiteTemplates
IsNavigation = true,
IsPersonalizable = true,
PagePermissions = new List {
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List {
new PageTemplateModule { ModuleDefinitionName = "Oqtane.Modules.HtmlText, Oqtane.Client", Title = "My Page", Pane = "Content",
ModulePermissions = new List {
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = "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.
"
}
diff --git a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs
index 33ccaf32..408fa3fe 100644
--- a/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs
+++ b/Oqtane.Server/Infrastructure/SiteTemplates/EmptySiteTemplate.cs
@@ -31,9 +31,9 @@ namespace Oqtane.SiteTemplates
IsNavigation = true,
IsPersonalizable = false,
PagePermissions = new List {
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List()
});
diff --git a/Oqtane.Server/Infrastructure/UpgradeManager.cs b/Oqtane.Server/Infrastructure/UpgradeManager.cs
index 2c538d97..0344de6e 100644
--- a/Oqtane.Server/Infrastructure/UpgradeManager.cs
+++ b/Oqtane.Server/Infrastructure/UpgradeManager.cs
@@ -40,9 +40,9 @@ namespace Oqtane.Infrastructure
// EditMode = false,
// PagePermissions = new List
// {
- // new Permission(PermissionNames.View, Constants.AdminRole, true),
- // new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- // new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ // new Permission(PermissionNames.View, RoleNames.Admin, true),
+ // new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ // new Permission(PermissionNames.Edit, RoleNames.Admin, true)
// }.EncodePermissions(),
// PageTemplateModules = new List
// {
@@ -51,9 +51,9 @@ namespace Oqtane.Infrastructure
// ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "Test", Pane = "Content",
// ModulePermissions = new List
// {
- // new Permission(PermissionNames.View, Constants.AdminRole, true),
- // new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- // new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ // new Permission(PermissionNames.View, RoleNames.Admin, true),
+ // new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ // new Permission(PermissionNames.Edit, RoleNames.Admin, true)
// }.EncodePermissions(),
// Content = ""
// }
diff --git a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
index ba164d4f..74bf8564 100644
--- a/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
+++ b/Oqtane.Server/Modules/HtmlText/Controllers/HtmlTextController.cs
@@ -12,7 +12,7 @@ using Oqtane.Controllers;
namespace Oqtane.Modules.HtmlText.Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class HtmlTextController : ModuleControllerBase
{
private readonly IHtmlTextRepository _htmlText;
@@ -24,7 +24,7 @@ namespace Oqtane.Modules.HtmlText.Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Policy = "ViewModule")]
+ [Authorize(Policy = PolicyNames.ViewModule)]
public List Get(int id)
{
var list = new List();
@@ -47,7 +47,7 @@ namespace Oqtane.Modules.HtmlText.Controllers
// POST api/
[HttpPost]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public HtmlTextInfo Post([FromBody] HtmlTextInfo htmlText)
{
try
@@ -68,7 +68,7 @@ namespace Oqtane.Modules.HtmlText.Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public HtmlTextInfo Put(int id, [FromBody] HtmlTextInfo htmlText)
{
try
@@ -89,7 +89,7 @@ namespace Oqtane.Modules.HtmlText.Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public void Delete(int id)
{
try
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 495819fc..9053bea7 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -1,10 +1,10 @@
-
+
- netcoreapp3.1
+ net5.0
7.3
Debug;Release
- 1.0.3
+ 2.0.0
Oqtane
Shaun Walker
.NET Foundation
@@ -13,7 +13,7 @@
https://www.oqtane.org
https://github.com/oqtane
Git
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
Oqtane
true
@@ -33,28 +33,31 @@
-
-
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index c48f226b..2aa0dd9d 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -1,9 +1,17 @@
-@page "/"
+@page "/"
@namespace Oqtane.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@using System.Globalization
+@using Microsoft.AspNetCore.Localization
@using Microsoft.Extensions.Configuration
@inject IConfiguration Configuration
+@model Oqtane.Pages.HostModel
+@{
+ // Set localization cookie
+ var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(CultureInfo.CurrentCulture, CultureInfo.CurrentUICulture));
+ HttpContext.Response.Cookies.Append(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue);
+}
@@ -16,6 +24,7 @@
An unhandled exception has occurred. See browser dev tools for details.
- Reload
+ Reload
🗙
@@ -44,5 +53,6 @@
{
}
+ @Html.Raw(@Model.BodyResources)
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
new file mode 100644
index 00000000..c50e5b1f
--- /dev/null
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -0,0 +1,138 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Oqtane.Infrastructure;
+using Oqtane.Shared;
+using Oqtane.Modules;
+using Oqtane.Models;
+using Oqtane.Themes;
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Oqtane.Pages
+{
+ public class HostModel : PageModel
+ {
+ public string HeadResources = "";
+ public string BodyResources = "";
+
+ public void OnGet()
+ {
+ var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
+ foreach (Assembly assembly in assemblies)
+ {
+ ProcessHostResources(assembly);
+ ProcessModuleControls(assembly);
+ ProcessThemeControls(assembly);
+ }
+ }
+
+ private void ProcessHostResources(Assembly assembly)
+ {
+ var types = assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IHostResources)));
+ foreach (var type in types)
+ {
+ var obj = Activator.CreateInstance(type) as IHostResources;
+ foreach (var resource in obj.Resources)
+ {
+ ProcessResource(resource);
+ }
+ }
+ }
+
+ private void ProcessModuleControls(Assembly assembly)
+ {
+ var types = assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IModuleControl)));
+ foreach (var type in types)
+ {
+ // Check if type should be ignored
+ if (type.IsOqtaneIgnore()) continue;
+
+ var obj = Activator.CreateInstance(type) as IModuleControl;
+ if (obj.Resources != null)
+ {
+ foreach (var resource in obj.Resources)
+ {
+ if (resource.Declaration == ResourceDeclaration.Global)
+ {
+ ProcessResource(resource);
+ }
+ }
+ }
+ }
+ }
+
+ private void ProcessThemeControls(Assembly assembly)
+ {
+ var types = assembly.GetTypes().Where(item => item.GetInterfaces().Contains(typeof(IThemeControl)));
+ foreach (var type in types)
+ {
+ // Check if type should be ignored
+ if (type.IsOqtaneIgnore()) continue;
+
+ var obj = Activator.CreateInstance(type) as IThemeControl;
+ if (obj.Resources != null)
+ {
+ foreach (var resource in obj.Resources)
+ {
+ if (resource.Declaration == ResourceDeclaration.Global)
+ {
+ ProcessResource(resource);
+ }
+ }
+ }
+ }
+ }
+
+ private void ProcessResource(Resource resource)
+ {
+ switch (resource.ResourceType)
+ {
+ case ResourceType.Stylesheet:
+ if (!HeadResources.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
+ {
+ HeadResources += "
" + Environment.NewLine;
+ }
+ break;
+ case ResourceType.Script:
+ if (resource.Location == Shared.ResourceLocation.Body)
+ {
+ if (!BodyResources.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
+ {
+ BodyResources += "" + Environment.NewLine;
+ }
+ }
+ else
+ {
+ if (!HeadResources.Contains(resource.Url, StringComparison.OrdinalIgnoreCase))
+ {
+ HeadResources += "" + Environment.NewLine;
+ }
+ }
+ break;
+ }
+ }
+
+ private string CrossOrigin(string crossorigin)
+ {
+ if (!string.IsNullOrEmpty(crossorigin))
+ {
+ return " crossorigin=\"" + crossorigin + "\"";
+ }
+ else
+ {
+ return "";
+ }
+ }
+ private string Integrity(string integrity)
+ {
+ if (!string.IsNullOrEmpty(integrity))
+ {
+ return " integrity=\"" + integrity + "\"";
+ }
+ else
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/Oqtane.Server/Program.cs b/Oqtane.Server/Program.cs
index c4b5492f..1ac0797e 100644
--- a/Oqtane.Server/Program.cs
+++ b/Oqtane.Server/Program.cs
@@ -26,6 +26,7 @@ namespace Oqtane.Server
.AddCommandLine(args)
.Build())
.UseStartup
()
+ .ConfigureLocalizationSettings()
.Build();
}
}
diff --git a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
index 976519fb..b38d5b62 100644
--- a/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
+++ b/Oqtane.Server/Repository/Interfaces/ISettingRepository.cs
@@ -1,10 +1,11 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using Oqtane.Models;
namespace Oqtane.Repository
{
public interface ISettingRepository
{
+ IEnumerable GetSettings(string entityName);
IEnumerable GetSettings(string entityName, int entityId);
Setting AddSetting(Setting setting);
Setting UpdateSetting(Setting setting);
diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index b2bfc71d..b0d21ff2 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -239,15 +239,15 @@ namespace Oqtane.Repository
{
moduledefinition.Permissions = new List
{
- new Permission(PermissionNames.Utilize, Constants.AdminRole, true)
+ new Permission(PermissionNames.Utilize, RoleNames.Admin, true)
}.EncodePermissions();
}
else
{
moduledefinition.Permissions = new List
{
- new Permission(PermissionNames.Utilize, Constants.AdminRole, true),
- new Permission(PermissionNames.Utilize, Constants.RegisteredRole, true)
+ new Permission(PermissionNames.Utilize, RoleNames.Admin, true),
+ new Permission(PermissionNames.Utilize, RoleNames.Registered, true)
}.EncodePermissions();
}
diff --git a/Oqtane.Server/Repository/SettingRepository.cs b/Oqtane.Server/Repository/SettingRepository.cs
index 30b7f676..34586f6e 100644
--- a/Oqtane.Server/Repository/SettingRepository.cs
+++ b/Oqtane.Server/Repository/SettingRepository.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Oqtane.Models;
@@ -14,6 +14,11 @@ namespace Oqtane.Repository
_db = context;
}
+ public IEnumerable GetSettings(string entityName)
+ {
+ return _db.Setting.Where(item => item.EntityName == entityName);
+ }
+
public IEnumerable GetSettings(string entityName, int entityId)
{
return _db.Setting.Where(item => item.EntityName == entityName)
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 6f77ed56..0130e5e3 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -60,9 +60,9 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -71,9 +71,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -89,9 +89,9 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -100,9 +100,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -119,9 +119,9 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -130,9 +130,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.AllUsersRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -148,9 +148,9 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.RegisteredRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Registered, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -159,9 +159,9 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.View, Constants.RegisteredRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Registered, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -174,8 +174,8 @@ namespace Oqtane.Repository
Name = "Admin", Parent = "", Path = "admin", Icon = "", IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -184,8 +184,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -201,8 +201,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -211,8 +211,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -228,8 +228,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -238,8 +238,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -255,8 +255,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -265,8 +265,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -282,8 +282,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -292,8 +292,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -309,8 +309,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -319,8 +319,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -336,8 +336,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -346,8 +346,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -363,8 +363,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -373,8 +373,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.AdminRole, true),
- new Permission(PermissionNames.Edit, Constants.AdminRole, true)
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
}.EncodePermissions(),
Content = ""
}
@@ -392,8 +392,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -402,8 +402,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -418,8 +418,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -428,8 +428,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Tenants.Index).ToModuleDefinitionName(), Title = "Tenant Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -440,8 +440,8 @@ namespace Oqtane.Repository
Name = "Site Management", Parent = "Admin", Path = "admin/sites", Icon = Icons.Globe, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -450,8 +450,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -462,8 +462,8 @@ namespace Oqtane.Repository
Name = "Module Management", Parent = "Admin", Path = "admin/modules", Icon = Icons.Browser, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -472,8 +472,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -484,8 +484,8 @@ namespace Oqtane.Repository
Name = "Theme Management", Parent = "Admin", Path = "admin/themes", Icon = Icons.Brush, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -494,8 +494,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -506,8 +506,8 @@ namespace Oqtane.Repository
Name = "Scheduled Jobs", Parent = "Admin", Path = "admin/jobs", Icon = Icons.Timer, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -516,8 +516,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -533,8 +533,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -543,8 +543,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -560,8 +560,8 @@ namespace Oqtane.Repository
IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -570,8 +570,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -582,8 +582,8 @@ namespace Oqtane.Repository
Name = "System Update", Parent = "Admin", Path = "admin/update", Icon = Icons.Aperture, IsNavigation = false, IsPersonalizable = false,
PagePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
PageTemplateModules = new List
{
@@ -592,8 +592,8 @@ namespace Oqtane.Repository
ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = "Content",
ModulePermissions = new List
{
- new Permission(PermissionNames.View, Constants.HostRole, true),
- new Permission(PermissionNames.Edit, Constants.HostRole, true)
+ new Permission(PermissionNames.View, RoleNames.Host, true),
+ new Permission(PermissionNames.Edit, RoleNames.Host, true)
}.EncodePermissions(),
Content = ""
}
@@ -640,18 +640,18 @@ namespace Oqtane.Repository
{
// create default entities for site
List 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 = Constants.AdminRole, Description = "Site Administrators", IsAutoAssigned = false, 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 = RoleNames.Admin, Description = "Site Administrators", IsAutoAssigned = false, IsSystem = true});
_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});
@@ -673,12 +673,22 @@ namespace Oqtane.Repository
Folder folder = _folderRepository.AddFolder(new Folder
{
SiteId = site.SiteId, ParentId = null, Name = "Root", Path = "", Order = 1, IsSystem = true,
- Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"All Users\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]"
+ Permissions = new List
+ {
+ new Permission(PermissionNames.Browse, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Everyone, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+ }.EncodePermissions()
});
_folderRepository.AddFolder(new Folder
{
SiteId = site.SiteId, ParentId = folder.FolderId, Name = "Users", Path = Utilities.PathCombine("Users",Path.DirectorySeparatorChar.ToString()), Order = 1, IsSystem = true,
- Permissions = "[{\"PermissionName\":\"Browse\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"View\",\"Permissions\":\"Administrators\"},{\"PermissionName\":\"Edit\",\"Permissions\":\"Administrators\"}]"
+ Permissions = new List
+ {
+ new Permission(PermissionNames.Browse, RoleNames.Admin, true),
+ new Permission(PermissionNames.View, RoleNames.Admin, true),
+ new Permission(PermissionNames.Edit, RoleNames.Admin, true)
+ }.EncodePermissions()
});
// process site template first
diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs
index 6c22ba75..7df0cbe2 100644
--- a/Oqtane.Server/Repository/TenantRepository.cs
+++ b/Oqtane.Server/Repository/TenantRepository.cs
@@ -40,7 +40,7 @@ namespace Oqtane.Repository
{
var oldTenant =_db.Tenant.AsNoTracking().FirstOrDefault(t=> t.TenantId == tenant.TenantId);
- if (oldTenant != null && (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)))
+ if (oldTenant != null && (oldTenant.Name.Equals(TenantNames.Master, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)))
{
throw new InvalidOperationException("Unable to rename the master tenant.");
}
@@ -59,7 +59,7 @@ namespace Oqtane.Repository
public void DeleteTenant(int tenantId)
{
var tenant = GetTenant(tenantId);
- if (tenant != null && !tenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase))
+ if (tenant != null && !tenant.Name.Equals(TenantNames.Master, StringComparison.OrdinalIgnoreCase))
{
_db.Tenant.Remove(tenant);
_db.SaveChanges();
diff --git a/Oqtane.Server/Scripts/Tenant.02.00.00.01.sql b/Oqtane.Server/Scripts/Tenant.02.00.00.01.sql
new file mode 100644
index 00000000..7f509242
--- /dev/null
+++ b/Oqtane.Server/Scripts/Tenant.02.00.00.01.sql
@@ -0,0 +1,16 @@
+/*
+
+Version 2.0.0 Tenant migration script
+
+*/
+
+ALTER TABLE [dbo].[Page]
+ALTER COLUMN [Path] [nvarchar](256) NOT NULL
+GO
+
+ALTER TABLE [dbo].[Profile] ADD
+ [Options] [nvarchar](2000) NULL
+GO
+
+UPDATE [dbo].[Profile] SET Options = ''
+GO
\ No newline at end of file
diff --git a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs
index 1e945938..6ac81731 100644
--- a/Oqtane.Server/Security/ClaimsPrincipalFactory.cs
+++ b/Oqtane.Server/Security/ClaimsPrincipalFactory.cs
@@ -39,15 +39,15 @@ namespace Oqtane.Security
{
id.AddClaim(new Claim(_options.ClaimsIdentity.RoleClaimType, userrole.Role.Name));
// 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));
}
}
}
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index ee53f340..8671e0f7 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -1,4 +1,5 @@
using System;
+using System.Collections;
using System.IO;
using System.Linq;
using System.Net.Http;
@@ -26,32 +27,48 @@ namespace Oqtane
{
public class Startup
{
- public IConfigurationRoot Configuration { get; }
private string _webRoot;
private Runtime _runtime;
private bool _useSwagger;
+ private IWebHostEnvironment _env;
+ private string[] _supportedCultures;
- public Startup(IWebHostEnvironment env)
+ public IConfigurationRoot Configuration { get; }
+
+ public Startup(IWebHostEnvironment env, ILocalizationManager localizationManager)
{
var builder = new ConfigurationBuilder()
.SetBasePath(env.ContentRootPath)
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
Configuration = builder.Build();
+ _supportedCultures = localizationManager.GetSupportedCultures();
+
_runtime = (Configuration.GetSection("Runtime").Value == "WebAssembly") ? Runtime.WebAssembly : Runtime.Server;
-
+
//add possibility to switch off swagger on production.
_useSwagger = Configuration.GetSection("UseSwagger").Value != "false";
_webRoot = env.WebRootPath;
AppDomain.CurrentDomain.SetData("DataDirectory", Path.Combine(env.ContentRootPath, "Data"));
+
+ _env = env;
}
// This method gets called by the runtime. Use this method to add services to the container.
// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
public void ConfigureServices(IServiceCollection services)
{
- services.AddServerSideBlazor();
+ // Register localization services
+ services.AddLocalization(options => options.ResourcesPath = "Resources");
+
+ services.AddServerSideBlazor().AddCircuitOptions(options =>
+ {
+ if (_env.IsDevelopment())
+ {
+ options.DetailedErrors = true;
+ }
+ });
// setup HttpClient for server side in a client side compatible fashion ( with auth cookie )
if (!services.Any(x => x.ServiceType == typeof(HttpClient)))
@@ -75,13 +92,13 @@ namespace Oqtane
// register custom authorization policies
services.AddAuthorizationCore(options =>
{
- options.AddPolicy("ViewPage", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.View)));
- options.AddPolicy("EditPage", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.Edit)));
- options.AddPolicy("ViewModule", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.View)));
- options.AddPolicy("EditModule", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.Edit)));
- options.AddPolicy("ViewFolder", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.View)));
- options.AddPolicy("EditFolder", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Edit)));
- options.AddPolicy("ListFolder", policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Browse)));
+ options.AddPolicy(PolicyNames.ViewPage, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.View)));
+ options.AddPolicy(PolicyNames.EditPage, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Page, PermissionNames.Edit)));
+ options.AddPolicy(PolicyNames.ViewModule, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.View)));
+ options.AddPolicy(PolicyNames.EditModule, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Module, PermissionNames.Edit)));
+ options.AddPolicy(PolicyNames.ViewFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.View)));
+ options.AddPolicy(PolicyNames.EditFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Edit)));
+ options.AddPolicy(PolicyNames.ListFolder, policy => policy.Requirements.Add(new PermissionRequirement(EntityNames.Folder, PermissionNames.Browse)));
});
// register scoped core services
@@ -116,7 +133,7 @@ namespace Oqtane
services.AddDbContext(options =>
options.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")
- .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
+ .Replace("|DataDirectory|", AppContext.GetData("DataDirectory")?.ToString())
));
services.AddDbContext(options => { });
@@ -187,6 +204,7 @@ namespace Oqtane
services.AddTransient();
services.AddTransient();
services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
@@ -197,7 +215,7 @@ namespace Oqtane
services.AddTransient();
// load the external assemblies into the app domain, install services
- services.AddOqtaneParts(_runtime);
+ services.AddOqtane(_runtime, _supportedCultures);
services.AddMvc()
.AddNewtonsoftJson()
@@ -213,6 +231,8 @@ namespace Oqtane
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
+ ServiceActivator.Configure(app.ApplicationServices);
+
if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
@@ -225,6 +245,10 @@ namespace Oqtane
}
// to allow install middleware it should be moved up
app.ConfigureOqtaneAssemblies(env);
+
+ // Allow oqtane localization middleware
+ app.UseOqtaneLocalization();
+
app.UseHttpsRedirection();
app.UseStaticFiles();
app.UseBlazorFrameworkFiles();
diff --git a/Oqtane.Server/appsettings.json b/Oqtane.Server/appsettings.json
index 0ab499f0..1af87b4c 100644
--- a/Oqtane.Server/appsettings.json
+++ b/Oqtane.Server/appsettings.json
@@ -11,5 +11,9 @@
"DefaultTheme": "",
"DefaultLayout": "",
"DefaultContainer": ""
+ },
+ "Localization": {
+ "DefaultCulture": "",
+ "SupportedCultures": []
}
}
\ No newline at end of file
diff --git a/Oqtane.Server/appsettings.release.json b/Oqtane.Server/appsettings.release.json
index 4fe3a03a..1af87b4c 100644
--- a/Oqtane.Server/appsettings.release.json
+++ b/Oqtane.Server/appsettings.release.json
@@ -1,8 +1,8 @@
{
- "Runtime": "Server",
"ConnectionStrings": {
"DefaultConnection": ""
},
+ "Runtime": "Server",
"Installation": {
"DefaultAlias": "",
"HostPassword": "",
@@ -11,5 +11,9 @@
"DefaultTheme": "",
"DefaultLayout": "",
"DefaultContainer": ""
+ },
+ "Localization": {
+ "DefaultCulture": "",
+ "SupportedCultures": []
}
}
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css b/Oqtane.Server/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css
new file mode 100644
index 00000000..abfbcc47
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css
@@ -0,0 +1,9 @@
+/* Login Module Custom Styles */
+
+.Oqtane-Modules-Admin-Login .username {
+ width: 200px;
+}
+
+.Oqtane-Modules-Admin-Login .password {
+ width: 200px;
+}
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor
index cd845092..339879f8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Edit.razor
@@ -10,10 +10,10 @@
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Index.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Index.razor
index 2ac9f31c..275b3ec8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Index.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Index.razor
@@ -73,7 +73,8 @@ else
@code {
public override List Resources => new List()
{
- new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+ new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
+ new Resource { ResourceType = ResourceType.Script, Url = ModulePath() + "Module.js" }
};
List<[Module]> _[Module]s;
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Interop.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Interop.cs
new file mode 100644
index 00000000..9d6f0a4e
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Interop.cs
@@ -0,0 +1,15 @@
+using Microsoft.JSInterop;
+using System.Threading.Tasks;
+
+namespace [Owner].[Module]
+{
+ public class Interop
+ {
+ private readonly IJSRuntime _jsRuntime;
+
+ public Interop(IJSRuntime jsRuntime)
+ {
+ _jsRuntime = jsRuntime;
+ }
+ }
+}
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor
index 415b24ca..7989d7c9 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/Settings.razor
@@ -5,10 +5,10 @@
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module].Client.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module].Client.csproj
index 4cd92d84..341d27b6 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module].Client.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/[Owner].[Module].Client.csproj
@@ -1,7 +1,7 @@
- netstandard2.1
+ net5.0
3.0
1.0.0
[Owner]
@@ -13,11 +13,11 @@
-
@@ -25,8 +25,8 @@
-
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor
index b6c565fc..d206b36e 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Client/_Imports.razor
@@ -2,6 +2,7 @@
@using System.Linq
@using System.Collections.Generic
@using System.Net.Http
+@using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj
index 5f1dba1f..cef85f51 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].Package.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.1
+ net5.0
false
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec
index 9ed078c4..df6e4997 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/[Owner].[Module].nuspec
@@ -20,12 +20,12 @@
-
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/debug.cmd b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/debug.cmd
index b9f4921e..c1971223 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Package/debug.cmd
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Package/debug.cmd
@@ -1,7 +1,7 @@
-XCOPY "..\Client\bin\Debug\netstandard2.1\[Owner].[Module].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Client\bin\Debug\netstandard2.1\[Owner].[Module].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Server\bin\Debug\netcoreapp3.1\[Owner].[Module].Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Server\bin\Debug\netcoreapp3.1\[Owner].[Module].Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Shared\bin\Debug\netstandard2.1\[Owner].[Module].Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Shared\bin\Debug\netstandard2.1\[Owner].[Module].Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
+XCOPY "..\Client\bin\Debug\net5.0\[Owner].[Module].Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net5.0\" /Y
+XCOPY "..\Client\bin\Debug\net5.0\[Owner].[Module].Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net5.0\" /Y
+XCOPY "..\Server\bin\Debug\net5.0\[Owner].[Module].Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net5.0\" /Y
+XCOPY "..\Server\bin\Debug\net5.0\[Owner].[Module].Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net5.0\" /Y
+XCOPY "..\Shared\bin\Debug\net5.0\[Owner].[Module].Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net5.0\" /Y
+XCOPY "..\Shared\bin\Debug\net5.0\[Owner].[Module].Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\net5.0\" /Y
XCOPY "..\Server\wwwroot\Modules\[Owner].[Module]\*" "..\..\[RootFolder]\Oqtane.Server\wwwroot\Modules\[Owner].[Module]\" /Y /S /I
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs
index c8fe7485..3e2fe7b8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs
@@ -10,7 +10,7 @@ using [Owner].[Module].Repository;
namespace [Owner].[Module].Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class [Module]Controller : Controller
{
private readonly I[Module]Repository _[Module]Repository;
@@ -30,7 +30,7 @@ namespace [Owner].[Module].Controllers
// GET: api/?moduleid=x
[HttpGet]
- [Authorize(Policy = "ViewModule")]
+ [Authorize(Policy = PolicyNames.ViewModule)]
public IEnumerable Get(string moduleid)
{
return _[Module]Repository.Get[Module]s(int.Parse(moduleid));
@@ -38,7 +38,7 @@ namespace [Owner].[Module].Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Policy = "ViewModule")]
+ [Authorize(Policy = PolicyNames.ViewModule)]
public Models.[Module] Get(int id)
{
Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
@@ -51,7 +51,7 @@ namespace [Owner].[Module].Controllers
// POST api/
[HttpPost]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public Models.[Module] Post([FromBody] Models.[Module] [Module])
{
if (ModelState.IsValid && [Module].ModuleId == _entityId)
@@ -64,7 +64,7 @@ namespace [Owner].[Module].Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public Models.[Module] Put(int id, [FromBody] Models.[Module] [Module])
{
if (ModelState.IsValid && [Module].ModuleId == _entityId)
@@ -77,7 +77,7 @@ namespace [Owner].[Module].Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public void Delete(int id)
{
Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql
index 7a1b99ea..ca9ba39d 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql
@@ -20,7 +20,7 @@ GO
/*
Create foreign key relationships
*/
-ALTER TABLE [dbo].[[Owner][Module]] WITH CHECK ADD CONSTRAINT [FK_[Owner][Module]_Module] FOREIGN KEY([ModuleId])
+ALTER TABLE [dbo].[[Owner][Module]] WITH CHECK ADD CONSTRAINT [FK_[Owner][Module]_Module] FOREIGN KEY([ModuleId])
REFERENCES [dbo].Module ([ModuleId])
ON DELETE CASCADE
GO
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj
index 8d6f5b57..64765a75 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.1
+ net5.0
7.3
true
1.0.0
@@ -11,6 +11,7 @@
[Description]
[Owner]
[Owner].[Module].Server.Oqtane
+ true
@@ -19,11 +20,12 @@
-
@@ -31,7 +33,7 @@
-
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/wwwroot/Modules/[Owner].[Module]/Module.js b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/wwwroot/Modules/[Owner].[Module]/Module.js
index 1b415a08..8f072470 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/wwwroot/Modules/[Owner].[Module]/Module.js
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/wwwroot/Modules/[Owner].[Module]/Module.js
@@ -1 +1,5 @@
-/* Module Script */
\ No newline at end of file
+/* Module Script */
+var [Owner] = [Owner] || {};
+
+[Owner].[Module] = {
+};
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module].Shared.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module].Shared.csproj
index 0e62a189..aa9995d0 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module].Shared.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Shared/[Owner].[Module].Shared.csproj
@@ -1,8 +1,7 @@
- netstandard2.1
- 7.3
+ net5.0
1.0.0
[Owner].[Module]
[Owner]
@@ -13,11 +12,11 @@
-
-
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor
index cd845092..339879f8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Edit.razor
@@ -10,10 +10,10 @@
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Index.razor b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Index.razor
index 5f8f04e2..37cfef2a 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Index.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Index.razor
@@ -63,7 +63,8 @@ else
@code {
public override List Resources => new List()
{
- new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+ new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
+ new Resource { ResourceType = ResourceType.Script, Url = ModulePath() + "Module.js" }
};
List<[Module]> _[Module]s;
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Interop.cs b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Interop.cs
new file mode 100644
index 00000000..9d6f0a4e
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Interop.cs
@@ -0,0 +1,15 @@
+using Microsoft.JSInterop;
+using System.Threading.Tasks;
+
+namespace [Owner].[Module]
+{
+ public class Interop
+ {
+ private readonly IJSRuntime _jsRuntime;
+
+ public Interop(IJSRuntime jsRuntime)
+ {
+ _jsRuntime = jsRuntime;
+ }
+ }
+}
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor
index 415b24ca..7989d7c9 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Client/Modules/[Owner].[Module]/Settings.razor
@@ -5,10 +5,10 @@
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs
index c8fe7485..3e2fe7b8 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/Modules/[Owner].[Module]/Controllers/[Module]Controller.cs
@@ -10,7 +10,7 @@ using [Owner].[Module].Repository;
namespace [Owner].[Module].Controllers
{
- [Route("{alias}/api/[controller]")]
+ [Route(ControllerRoutes.Default)]
public class [Module]Controller : Controller
{
private readonly I[Module]Repository _[Module]Repository;
@@ -30,7 +30,7 @@ namespace [Owner].[Module].Controllers
// GET: api/?moduleid=x
[HttpGet]
- [Authorize(Policy = "ViewModule")]
+ [Authorize(Policy = PolicyNames.ViewModule)]
public IEnumerable Get(string moduleid)
{
return _[Module]Repository.Get[Module]s(int.Parse(moduleid));
@@ -38,7 +38,7 @@ namespace [Owner].[Module].Controllers
// GET api//5
[HttpGet("{id}")]
- [Authorize(Policy = "ViewModule")]
+ [Authorize(Policy = PolicyNames.ViewModule)]
public Models.[Module] Get(int id)
{
Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
@@ -51,7 +51,7 @@ namespace [Owner].[Module].Controllers
// POST api/
[HttpPost]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public Models.[Module] Post([FromBody] Models.[Module] [Module])
{
if (ModelState.IsValid && [Module].ModuleId == _entityId)
@@ -64,7 +64,7 @@ namespace [Owner].[Module].Controllers
// PUT api//5
[HttpPut("{id}")]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public Models.[Module] Put(int id, [FromBody] Models.[Module] [Module])
{
if (ModelState.IsValid && [Module].ModuleId == _entityId)
@@ -77,7 +77,7 @@ namespace [Owner].[Module].Controllers
// DELETE api//5
[HttpDelete("{id}")]
- [Authorize(Policy = "EditModule")]
+ [Authorize(Policy = PolicyNames.EditModule)]
public void Delete(int id)
{
Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
diff --git a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/wwwroot/Modules/[Owner].[Module]/Module.js b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/wwwroot/Modules/[Owner].[Module]/Module.js
index 1b415a08..8f072470 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/wwwroot/Modules/[Owner].[Module]/Module.js
+++ b/Oqtane.Server/wwwroot/Modules/Templates/Internal/Oqtane.Server/wwwroot/Modules/[Owner].[Module]/Module.js
@@ -1 +1,5 @@
-/* Module Script */
\ No newline at end of file
+/* Module Script */
+var [Owner] = [Owner] || {};
+
+[Owner].[Module] = {
+};
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/Modules/dotnetconf2020.Weather/weather.json b/Oqtane.Server/wwwroot/Modules/dotnetconf2020.Weather/weather.json
new file mode 100644
index 00000000..b73afe4f
--- /dev/null
+++ b/Oqtane.Server/wwwroot/Modules/dotnetconf2020.Weather/weather.json
@@ -0,0 +1,27 @@
+[
+ {
+ "date": "2018-05-06",
+ "temperatureC": 1,
+ "summary": "Freezing"
+ },
+ {
+ "date": "2018-05-07",
+ "temperatureC": 14,
+ "summary": "Bracing"
+ },
+ {
+ "date": "2018-05-08",
+ "temperatureC": -13,
+ "summary": "Freezing"
+ },
+ {
+ "date": "2018-05-09",
+ "temperatureC": -16,
+ "summary": "Balmy"
+ },
+ {
+ "date": "2018-05-10",
+ "temperatureC": -2,
+ "summary": "Chilly"
+ }
+]
\ No newline at end of file
diff --git a/Oqtane.Server/wwwroot/css/app.css b/Oqtane.Server/wwwroot/css/app.css
index 4c9ef493..ce87887d 100644
--- a/Oqtane.Server/wwwroot/css/app.css
+++ b/Oqtane.Server/wwwroot/css/app.css
@@ -52,6 +52,31 @@ app {
width: 80%; /* Could be more or less, depending on screen size */
}
+/* Action Dialog */
+.app-actiondialog .modal {
+ position: fixed; /* Stay in place */
+ z-index: 9999; /* Sit on top */
+ left: 0;
+ top: 0;
+ display: block;
+ width: 100%; /* Full width */
+ height: 100%; /* Full height */
+ overflow: auto; /* Enable scroll if needed */
+ background: rgba(0,0,0,0.3); /* Dim background */
+}
+
+.app-actiondialog .modal-dialog {
+ width: 100%; /* Full width */
+ height: 100%; /* Full height */
+ max-width: none; /* Override default of 500px */
+}
+
+.app-actiondialog .modal-content {
+ margin: 15% auto; /* 15% from the top and centered */
+ width: 40%; /* Could be more or less, depending on screen size */
+}
+
+/* Admin Pane */
.app-pane-admin-border {
width: 100%;
border-width: 1px;
diff --git a/Oqtane.Server/wwwroot/js/interop.js b/Oqtane.Server/wwwroot/js/interop.js
index cf7f5df2..2e4092e4 100644
--- a/Oqtane.Server/wwwroot/js/interop.js
+++ b/Oqtane.Server/wwwroot/js/interop.js
@@ -208,14 +208,15 @@ Oqtane.Interop = {
bundles.push(scripts[s].bundle);
}
}
- const urls = [];
+ const promises = [];
for (let b = 0; b < bundles.length; b++) {
+ const urls = [];
for (let s = 0; s < scripts.length; s++) {
if (scripts[s].bundle === bundles[b]) {
urls.push(scripts[s].href);
}
}
- const promise = new Promise((resolve, reject) => {
+ promises.push(new Promise((resolve, reject) => {
if (loadjs.isDefined(bundles[b])) {
resolve(true);
}
@@ -237,9 +238,10 @@ Oqtane.Interop = {
.then(function () { resolve(true) })
.catch(function (pathsNotFound) { reject(false) });
}
- });
- await promise;
- urls = [];
+ }));
+ }
+ if (promises.length !== 0) {
+ await Promise.all(promises);
}
},
getAbsoluteUrl: function (url) {
diff --git a/Oqtane.Server/wwwroot/oqtane-black.png b/Oqtane.Server/wwwroot/oqtane-black.png
index f3c92bf0..942ef8c0 100644
Binary files a/Oqtane.Server/wwwroot/oqtane-black.png and b/Oqtane.Server/wwwroot/oqtane-black.png differ
diff --git a/Oqtane.Server/wwwroot/oqtane-glow.png b/Oqtane.Server/wwwroot/oqtane-glow.png
new file mode 100644
index 00000000..d62a37dc
Binary files /dev/null and b/Oqtane.Server/wwwroot/oqtane-glow.png differ
diff --git a/Oqtane.Server/wwwroot/oqtane-white.png b/Oqtane.Server/wwwroot/oqtane-white.png
index 1d75a012..fa7950bc 100644
Binary files a/Oqtane.Server/wwwroot/oqtane-white.png and b/Oqtane.Server/wwwroot/oqtane-white.png differ
diff --git a/Oqtane.Server/wwwroot/oqtane.png b/Oqtane.Server/wwwroot/oqtane.png
new file mode 100644
index 00000000..be8f48c9
Binary files /dev/null and b/Oqtane.Server/wwwroot/oqtane.png differ
diff --git a/Oqtane.Shared/Documentation/InternalApi.cs b/Oqtane.Shared/Documentation/InternalApi.cs
new file mode 100644
index 00000000..be660f77
--- /dev/null
+++ b/Oqtane.Shared/Documentation/InternalApi.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace Oqtane.Documentation
+{
+ ///
+ /// This attribute serves as metadata for other things to mark them as internal APIs.
+ /// Use this on stuff you want to document publicly, but mark as internal so people are warned
+ ///
+ [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+ [PublicApi]
+ // ReSharper disable once InconsistentNaming
+ public class InternalApi_DoNotUse_MayChangeWithoutNotice: Attribute
+ {
+ ///
+ /// The `[InternalApi_DoNotUse_MayChangeWithoutNotice]` attribute can be used without additional comment.
+ ///
+ // Important note - this constructor looks unnecessary, because comment is optional in the other constructor
+ // but we need it because of a minor issue in docfx
+ public InternalApi_DoNotUse_MayChangeWithoutNotice() { }
+
+ ///
+ /// Constructor with optional comment `[InternalApi_DoNotUse_MayChangeWithoutNotice(some-comment)]`.
+ ///
+ ///
+ /// This attribute marks classes, methods, etc. as private APIs
+ /// So they should _not_ be publicly documented.
+ /// By default, all APIs are private, so you only need this attribute on children of classes marked with `[PublicApi]`.
+ ///
+ [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+ [PublicApi]
+ public class PrivateApi: Attribute
+ {
+ ///
+ /// The `[PrivateApi]` attribute can be used without additional comment.
+ ///
+ // Important note - this constructor looks unnecessary, because comment could be optional in the other constructor
+ // but we need it because of a minor issue in docfx
+ public PrivateApi() { }
+
+ ///
+ /// Constructor with optional comment `[PrivateApi(some-comment)]`.
+ ///
+ ///
+ /// This attribute marks classes, properties etc. as public APIs.
+ /// Any API / code with this attribute will be published in the docs.
+ /// You can apply it to anything, but usually you will only need it on classes.
+ ///
+ [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+ [PublicApi]
+ public class PublicApi: Attribute
+ {
+ ///
+ /// The `[PublicApi]` attribute can usually be used without additional comment.
+ ///
+ // Important note - this constructor looks unnecessary, because comment could be optional in the other constructor
+ // but we need it because of a minor issue in docfx
+ public PublicApi() { }
+
+ ///
+ /// Constructor with optional comment `[PublicApi(some-comment)]`
+ ///
+ ///
+ /// This attribute marks APIs to be publicly documented with a clear warning that it's work in progress.
+ ///
+ [AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+ [PublicApi]
+ public class WorkInProgressApi: Attribute
+ {
+ ///
+ /// The `[WorkInProgressApi(some-comment)]` attributes must always have a comment why they are WIP.
+ ///
+ /// Settings { get; set; }
+
// PageModule properties
[NotMapped]
public int PageModuleId { get; set; }
diff --git a/Oqtane.Shared/Models/ModuleDefinition.cs b/Oqtane.Shared/Models/ModuleDefinition.cs
index 1e66735f..0fd8b892 100644
--- a/Oqtane.Shared/Models/ModuleDefinition.cs
+++ b/Oqtane.Shared/Models/ModuleDefinition.cs
@@ -20,6 +20,7 @@ namespace Oqtane.Models
ServerManagerType = "";
ControlTypeRoutes = "";
ReleaseVersions = "";
+ DefaultAction = "";
Runtimes = "";
Template = "";
}
@@ -57,6 +58,8 @@ namespace Oqtane.Models
public string ControlTypeRoutes { get; set; }
[NotMapped]
public string ReleaseVersions { get; set; }
+ [NotMapped]
+ public string DefaultAction { get; set; }
// internal properties
[NotMapped]
diff --git a/Oqtane.Shared/Models/Profile.cs b/Oqtane.Shared/Models/Profile.cs
index 11ecec07..dc4f6266 100644
--- a/Oqtane.Shared/Models/Profile.cs
+++ b/Oqtane.Shared/Models/Profile.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
namespace Oqtane.Models
{
@@ -15,6 +15,7 @@ namespace Oqtane.Models
public string DefaultValue { get; set; }
public bool IsRequired { get; set; }
public bool IsPrivate { get; set; }
+ public string Options { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedOn { get; set; }
diff --git a/Oqtane.Shared/Models/Resource.cs b/Oqtane.Shared/Models/Resource.cs
index 01bc57ba..72f26e4b 100644
--- a/Oqtane.Shared/Models/Resource.cs
+++ b/Oqtane.Shared/Models/Resource.cs
@@ -1,4 +1,4 @@
-using Oqtane.Shared;
+using Oqtane.Shared;
namespace Oqtane.Models
{
@@ -9,5 +9,7 @@ namespace Oqtane.Models
public string Integrity { get; set; }
public string CrossOrigin { get; set; }
public string Bundle { get; set; }
+ public ResourceDeclaration Declaration { get; set; }
+ public ResourceLocation Location { get; set; }
}
}
diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj
index 3f81e3e9..976f255b 100644
--- a/Oqtane.Shared/Oqtane.Shared.csproj
+++ b/Oqtane.Shared/Oqtane.Shared.csproj
@@ -1,10 +1,9 @@
-
+
- netstandard2.1
- 7.3
+ net5.0
Debug;Release
- 1.0.3
+ 2.0.0
Oqtane
Shaun Walker
.NET Foundation
@@ -13,15 +12,15 @@
https://www.oqtane.org
https://github.com/oqtane
Git
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
Oqtane
true
-
diff --git a/Oqtane.Shared/Security/UserSecurity.cs b/Oqtane.Shared/Security/UserSecurity.cs
index a8e85304..ec2d0db0 100644
--- a/Oqtane.Shared/Security/UserSecurity.cs
+++ b/Oqtane.Shared/Security/UserSecurity.cs
@@ -85,14 +85,14 @@ namespace Oqtane.Security
if (permission.StartsWith("!"))
{
string denyRole = permission.Replace("!", "");
- if (denyRole == Constants.AllUsersRole || IsAllowed(userId, roles, denyRole))
+ if (denyRole == RoleNames.Everyone || IsAllowed(userId, roles, denyRole))
{
allowed = false;
}
}
else // grant permission
{
- if (permission == Constants.AllUsersRole || IsAllowed(userId, roles, permission))
+ if (permission == RoleNames.Everyone || IsAllowed(userId, roles, permission))
{
allowed = true;
}
diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs
index bc0f77f1..cd0761dd 100644
--- a/Oqtane.Shared/Shared/Constants.cs
+++ b/Oqtane.Shared/Shared/Constants.cs
@@ -1,12 +1,12 @@
-using System;
+using System;
+using System.Globalization;
-namespace Oqtane.Shared
-{
- public class Constants
- {
+namespace Oqtane.Shared {
+
+ public class Constants {
public const string PackageId = "Oqtane.Framework";
- public const string Version = "1.0.3";
- public const string ReleaseVersions = "0.9.0,0.9.1,0.9.2,1.0.0,1.0.1,1.0.2,1.0.3";
+ public const string Version = "2.0.0";
+ public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0";
public const string PageComponent = "Oqtane.UI.ThemeBuilder, Oqtane.Client";
public const string ContainerComponent = "Oqtane.UI.ContainerBuilder, Oqtane.Client";
@@ -18,7 +18,9 @@ namespace Oqtane.Shared
public const string ActionToken = "{Action}";
public const string DefaultAction = "Index";
- public const string AdminPane = "Admin";
+
+ [Obsolete("Use PaneNames.Admin")]
+ public const string AdminPane = PaneNames.Admin;
public const string ModuleDelimiter = "*";
public const string UrlParametersDelimiter = "!";
@@ -35,18 +37,26 @@ namespace Oqtane.Shared
public const string ContentUrl = "/api/file/download/";
- public const string HostUser = "host";
+ [Obsolete("Use UserNames.Host instead.")]
+ public const string HostUser = UserNames.Host;
- public const string MasterTenant = "Master";
+ [Obsolete("Use TenantNames.Master instead")]
+ public const string MasterTenant = TenantNames.Master;
public const string DefaultSite = "Default Site";
- public const string AllUsersRole = "All Users";
- public const string HostRole = "Host Users";
- public const string AdminRole = "Administrators";
- public const string RegisteredRole = "Registered Users";
+ const string RoleObsoleteMessage = "Use the corresponding memeber from Oqtane.Shared.RoleNames";
- public const string ImageFiles = "jpg,jpeg,jpe,gif,bmp,png";
- public const string UploadableFiles = "jpg,jpeg,jpe,gif,bmp,png,mov,wmv,avi,mp4,mp3,doc,docx,xls,xlsx,ppt,pptx,pdf,txt,zip,nupkg";
+ [Obsolete(RoleObsoleteMessage)]
+ 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 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 ReservedDevices = "CON,NUL,PRN,COM0,COM1,COM2,COM3,COM4,COM5,COM6,COM7,COM8,COM9,LPT0,LPT1,LPT2,LPT3,LPT4,LPT5,LPT6,LPT7,LPT8,LPT9,CONIN$,CONOUT$";
public static readonly char[] InvalidFileNameChars =
@@ -57,5 +67,9 @@ namespace Oqtane.Shared
(Char) 28, (Char) 29, (Char) 30, (Char) 31, ':', '*', '?', '\\', '/'
};
public static readonly string[] InvalidFileNameEndingChars = { ".", " " };
+
+ public static readonly string SatelliteAssemblyExtension = ".resources.dll";
+
+ public static readonly string DefaultCulture = CultureInfo.InstalledUICulture.Name;
}
-}
\ No newline at end of file
+}
diff --git a/Oqtane.Shared/Shared/ControllerRoutes.cs b/Oqtane.Shared/Shared/ControllerRoutes.cs
new file mode 100644
index 00000000..07e170f3
--- /dev/null
+++ b/Oqtane.Shared/Shared/ControllerRoutes.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Oqtane.Shared {
+ public class ControllerRoutes {
+ public const string Default = "{alias}/api/[controller]";
+ }
+}
diff --git a/Oqtane.Shared/Shared/PaneNames.cs b/Oqtane.Shared/Shared/PaneNames.cs
new file mode 100644
index 00000000..063924f9
--- /dev/null
+++ b/Oqtane.Shared/Shared/PaneNames.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Oqtane.Shared {
+ public class PaneNames {
+ public const string Admin = "Admin";
+ }
+}
diff --git a/Oqtane.Shared/Shared/PolicyNames.cs b/Oqtane.Shared/Shared/PolicyNames.cs
new file mode 100644
index 00000000..0e478fe6
--- /dev/null
+++ b/Oqtane.Shared/Shared/PolicyNames.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Oqtane.Shared
+{
+ public class PolicyNames
+ {
+ public const string ViewPage = "ViewPage";
+ public const string EditPage = "EditPage";
+
+ public const string ViewModule = "ViewModule";
+ public const string EditModule = "EditModule";
+
+ public const string ViewFolder = "ViewFolder";
+ public const string EditFolder = "EditFolder";
+ public const string ListFolder = "ListFolder";
+ }
+}
diff --git a/Oqtane.Shared/Shared/RoleNames.cs b/Oqtane.Shared/Shared/RoleNames.cs
new file mode 100644
index 00000000..f526d613
--- /dev/null
+++ b/Oqtane.Shared/Shared/RoleNames.cs
@@ -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";
+ }
+}
diff --git a/Oqtane.Shared/Shared/ServiceActivator.cs b/Oqtane.Shared/Shared/ServiceActivator.cs
new file mode 100644
index 00000000..5718d174
--- /dev/null
+++ b/Oqtane.Shared/Shared/ServiceActivator.cs
@@ -0,0 +1,22 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Oqtane.Shared
+{
+ public static class ServiceActivator
+ {
+ private static IServiceProvider _serviceProvider = null;
+
+ public static void Configure(IServiceProvider serviceProvider)
+ {
+ _serviceProvider = serviceProvider;
+ }
+
+ public static IServiceScope GetScope(IServiceProvider serviceProvider = null)
+ {
+ var provider = serviceProvider ?? _serviceProvider;
+
+ return provider?.GetRequiredService().CreateScope();
+ }
+ }
+}
diff --git a/Oqtane.Shared/Shared/TenantNames.cs b/Oqtane.Shared/Shared/TenantNames.cs
new file mode 100644
index 00000000..057235fd
--- /dev/null
+++ b/Oqtane.Shared/Shared/TenantNames.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Oqtane.Shared {
+ public class TenantNames {
+ public const string Master = "Master";
+ }
+}
diff --git a/Oqtane.Shared/Shared/UserNames.cs b/Oqtane.Shared/Shared/UserNames.cs
new file mode 100644
index 00000000..fdb83800
--- /dev/null
+++ b/Oqtane.Shared/Shared/UserNames.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Oqtane.Shared {
+ public class UserNames {
+ public const string Host = "host";
+ }
+}
diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index ea36861b..c2cfc90f 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -326,7 +326,8 @@ namespace Oqtane.Shared
public static bool IsPathOrFileValid(this string name)
{
- return (name.IndexOfAny(Constants.InvalidFileNameChars) == -1 &&
+ return (name != null &&
+ name.IndexOfAny(Constants.InvalidFileNameChars) == -1 &&
!Constants.InvalidFileNameEndingChars.Any(name.EndsWith) &&
!Constants.ReservedDevices.Split(',').Contains(name.ToUpper().Split('.')[0]));
}
diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj
index 7dcd5c00..78c230db 100644
--- a/Oqtane.Test/Oqtane.Test.csproj
+++ b/Oqtane.Test/Oqtane.Test.csproj
@@ -1,10 +1,9 @@
- netcoreapp3.1
- 7.3
+ net5.0
Debug;Release
- 1.0.3
+ 2.0.0
Oqtane
Shaun Walker
.NET Foundation
@@ -13,19 +12,17 @@
https://www.oqtane.org
https://github.com/oqtane
Git
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
Oqtane
false
-
-
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/Oqtane.Upgrade/Oqtane.Upgrade.csproj b/Oqtane.Upgrade/Oqtane.Upgrade.csproj
index b134c041..cd3d0a4c 100644
--- a/Oqtane.Upgrade/Oqtane.Upgrade.csproj
+++ b/Oqtane.Upgrade/Oqtane.Upgrade.csproj
@@ -1,10 +1,9 @@
- netcoreapp3.1
- 7.3
+ net5.0
Exe
- 1.0.3
+ 2.0.0
Oqtane
Shaun Walker
.NET Foundation
@@ -13,7 +12,7 @@
https://www.oqtane.org
https://github.com/oqtane
Git
- https://github.com/oqtane/oqtane.framework/releases/tag/v1.0.3
+ https://github.com/oqtane/oqtane.framework/releases/tag/v2.0.0
Oqtane
false
diff --git a/Oqtane.Upgrade/Program.cs b/Oqtane.Upgrade/Program.cs
index af2665e0..d9a042ce 100644
--- a/Oqtane.Upgrade/Program.cs
+++ b/Oqtane.Upgrade/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
@@ -58,7 +58,7 @@ namespace Oqtane.Upgrade
files.Add(Path.Combine(binfolder, filename));
break;
case "wwwroot":
- files.Add(Path.Combine(webrootfolder.Replace(Path.DirectorySeparatorChar + "wwwroot", ""), entry.FullName.Replace('/', Path.DirectorySeparatorChar)));
+ files.Add(Path.Combine(webrootfolder, entry.FullName.Replace("wwwroot/", "").Replace('/', Path.DirectorySeparatorChar)));
break;
}
}
@@ -102,7 +102,7 @@ namespace Oqtane.Upgrade
filename = Path.Combine(binfolder, filename);
break;
case "wwwroot":
- filename = Path.Combine(webrootfolder.Replace(Path.DirectorySeparatorChar + "wwwroot", ""), entry.FullName.Replace('/', Path.DirectorySeparatorChar));
+ filename = Path.Combine(webrootfolder, entry.FullName.Replace("wwwroot/", "").Replace('/', Path.DirectorySeparatorChar));
break;
}
if (files.Contains(filename))
diff --git a/Oqtane.sln b/Oqtane.sln
index 0caeb4f6..2755bdb2 100644
--- a/Oqtane.sln
+++ b/Oqtane.sln
@@ -13,6 +13,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Upgrade", "Oqtane.Up
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Test", "Oqtane.Test\Oqtane.Test.csproj", "{823B556D-8D4E-4BB8-A65A-C4EB5E7E7424}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{77EECA8C-B58E-469E-B8C5-D543AFC9A654}"
+ ProjectSection(SolutionItems) = preProject
+ .editorconfig = .editorconfig
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/README.md b/README.md
index 16dfb37e..ee2caa2d 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,10 @@
# Oqtane Framework
-Oqtane is a Modular Application Framework for Blazor
[](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Foqtane%2Foqtane.framework%2Fmaster%2Fazuredeploy.json)
-Oqtane uses Blazor, an open source and cross-platform web UI framework for building single-page apps using .NET and C# instead of JavaScript. Blazor apps are composed of reusable web UI components implemented using C#, HTML, and CSS. Both client and server code is written in C#, allowing you to share code and libraries.
+Oqtane is a Modular Application Framework. It leverages Blazor, an open source and cross-platform web UI framework for building single-page apps using .NET and C# instead of JavaScript. Blazor apps are composed of reusable web UI components implemented using C#, HTML, and CSS. Both client and server code is written in C#, allowing you to share code and libraries.
Oqtane is being developed based on some fundamental principles which are outlined in the [Oqtane Philosophy](https://www.oqtane.org/Resources/Blog/PostId/538/oqtane-philosophy).
@@ -13,15 +12,23 @@ Please note that this project is owned by the .NET Foundation and is governed by
# Getting Started
-**Using the latest code:**
+**Using the latest repository source code ( ie. version 2.0.0 ):**
-- Install **[.NET Core 3.1 SDK (v3.1.300)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-3.1.300-windows-x64-installer)**.
+- Install **[.NET 5 SDK (v5.0.100)](https://dotnet.microsoft.com/download/dotnet/5.0)**.
-- Install the Preview edition of [Visual Studio 2019](https://visualstudio.microsoft.com/vs/preview/) (Community, Professional, and Enterprise Editions are all supported) with the **ASP.NET and web development** workload enabled. Oqtane works with all editions of Visual Studio from Community to Enterprise. If you do not have a SQL Server installation available already and you wish to use LocalDB for development, you must also install the **.NET desktop development workload**.
+- Install the latest Preview edition (v16.8, Preview 4 or higher) of [Visual Studio 2019](https://visualstudio.microsoft.com/vs/preview/) (Community, Professional, and Enterprise Editions are all supported) with the **ASP.NET and web development** workload enabled. Oqtane works with all editions of Visual Studio from Community to Enterprise. If you do not have a SQL Server installation available already and you wish to use LocalDB for development, you must also install the **.NET desktop development workload**.
- Download or Clone the Oqtane source code to your local system. Open the **Oqtane.sln** solution file and Build the solution.
-**Using an official release:**
+**Using the latest release code ( ie. release versions 1.0.0-1.0.4 ):**
+
+- Install **[.NET Core 3.1 SDK (v3.1.300)](https://dotnet.microsoft.com/download/dotnet-core/thank-you/sdk-3.1.300-windows-x64-installer)**.
+
+- Install [Visual Studio 2019](https://visualstudio.microsoft.com/vs) (Community, Professional, and Enterprise Editions are all supported) with the **ASP.NET and web development** workload enabled. Oqtane works with all editions of Visual Studio from Community to Enterprise. If you do not have a SQL Server installation available already and you wish to use LocalDB for development, you must also install the **.NET desktop development workload**.
+
+- Download or Clone the Oqtane source code to your local system. Open the **Oqtane.sln** solution file and Build the solution.
+
+**Installing an official release:**
- A detailed set of instructions for installing Oqtane on IIS is located here: [Installing Oqtane on IIS](https://www.oqtane.org/Resources/Blog/PostId/542/installing-oqtane-on-iis)
- Instructions for upgrading Oqtane are located here: [Upgrading Oqtane](https://www.oqtane.org/Resources/Blog/PostId/543/upgrading-oqtane)
@@ -32,34 +39,45 @@ Please note that this project is owned by the .NET Foundation and is governed by
- If you want to submit pull requests make sure you install the [Github Extension For Visual Studio](https://visualstudio.github.com/). It is recommended you ignore any local changes you have made to the appsettings.json file before you submit a pull request. To automate this activity, open a command prompt and navigate to the /Oqtane.Server/ folder and enter the command "git update-index --skip-worktree appsettings.json"
+**Video Series**
+
+- If you are getting started with Oqtane, a [series of videos](https://www.youtube.com/watch?v=JPfUZPlRRCE&list=PLYhXmd7yV0elLNLfQwZBUlM7ZSMYPTZ_f) are available which explain how to install the product, interact with the user interface, and develop custom modules.
+
+# Documentation
+There is a separate [Documentation repository](https://github.com/oqtane/oqtane.docs) which contains a variety of types of documentation for Oqtane, including API documentation that is auto generated using Docfx. The contents of the repository is published to Githib Pages and is available at [https://docs.oqtane.org](https://docs.oqtane.org/)
+
# Roadmap
This project is a work in progress and the schedule for implementing enhancements is dependent upon the availability of community members who are willing/able to assist.
-V.Next ( still in the process of being prioritized )
-- [ ] Admin UI markup optimization
-- [ ] DB Migrations for framework installation/upgrade
-- [ ] Support for SQLite
-- [ ] Static Localization ( ie. labels, help text, etc.. )
-- [ ] Migrate to Code-Behind Pattern ( *.razor.cs )
-- [ ] Generic Repository Pattern
-- [ ] JwT token authentication ( possibly using IdentityServer )
-- [ ] Optional Encryption for Settings Values
+V.2.0.0 ( estimated release date Nov 11, 2020 )
+- [x] Migration to .NET 5
+- [x] Static Localization ( ie. labels, help text, etc.. )
-V1.0.0 (MVP)
+V.1.x - Initial version released in conjunction with .NET Core 3.2 ( May 2020 )
- [x] Multi-Tenant ( Shared Database & Isolated Database )
-- [x] Modular Architecture / Headless API
+- [x] Modular Architecture
+- [x] Headless API with Swagger Support
- [x] Dynamic Page Compositing Model / Site & Page Management
- [x] Authentication / User Management / Profile Management
- [x] Authorization / Roles Management / Granular Permissions
- [x] Dynamic Routing
- [x] Extensibility via Custom Modules
- [x] Extensibility via Custom Themes
-- [x] Event Logging
+- [x] Event Logging / Audit Trail
- [x] Folder / File Management
- [x] Recycle Bin
- [x] Scheduled Jobs ( Background Processing )
- [x] Notifications / Email Delivery
-- [x] Auto-Upgrade Framework
+- [x] Seamless Upgrade Experience
+- [x] Progressive Web Application Support
+- [x] JavaScript Lazy Loading
+- [x] Dynamic CSS/Lazy Loading
+
+Future Consideration
+- [ ] Admin UI markup optimization ( ie. replace tables with divs in forms )
+- [ ] DB Migrations for framework installation/upgrade
+- [ ] Support for SQLite
+- [ ] OAuth Support
# Background
Oqtane was created by [Shaun Walker](https://www.linkedin.com/in/shaunbrucewalker/) and is inspired by the DotNetNuke web application framework. Initially created as a proof of concept, Oqtane is a native Blazor application written from the ground up using modern .NET Core technology. It is a modular application framework offering a fully dynamic page compositing model, multi-site support, designer friendly templates (skins), and extensibility via third party modules.
@@ -72,6 +90,13 @@ Oqtane was created by [Shaun Walker](https://www.linkedin.com/in/shaunbrucewalke
[Oqtane POC](https://www.oqtane.org/Resources/Blog/PostId/520/announcing-oqtane-a-modular-application-framework-for-blazor)
+# Architecture
+
+The following diagram visualizes the client and server components in the Oqtane architecture.
+
+
+
+
# Example Screenshots
Install Wizard:
diff --git a/oqtane.png b/oqtane.png
index 82c098e9..be8f48c9 100644
Binary files a/oqtane.png and b/oqtane.png differ
diff --git a/screenshots/Architecture.png b/screenshots/Architecture.png
new file mode 100644
index 00000000..a24815c7
Binary files /dev/null and b/screenshots/Architecture.png differ