Merge branch 'oqtane:dev' into dev

Oqtane.Client/Modules/Admin/Modules/Settings.razor

@@ -14,10 +14,16 @@
             @if (_containers != null)
             {
                 <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="module" HelpText="The name of the module" ResourceKey="Module">Module: </Label>
+                        <div class="col-sm-9">
+                            <input id="module" type="text" class="form-control" @bind="@_module" disabled />
+                        </div>
+                    </div>
                     <div class="row mb-1 align-items-center">
                         <Label Class="col-sm-3" For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
                         <div class="col-sm-9">
-                            <input id="title" type="text" name="Title" class="form-control" @bind="@_title" required />
+                            <input id="title" type="text" class="form-control" @bind="@_title" required />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -104,6 +110,7 @@
     private ElementReference form;
     private bool validated = false;
     private List<ThemeControl> _containers = new List<ThemeControl>();
+    private string _module;
     private string _title;
     private string _containerType;
     private string _allPages = "false";
@@ -125,6 +132,7 @@
 
     protected override void OnInitialized()
     {
+        _module = ModuleState.ModuleDefinition.Name;
         _title = ModuleState.Title;
         _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
 		_containerType = ModuleState.ContainerType;

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

@@ -144,6 +144,11 @@ else
     <TabPanel Name="Notifications" ResourceKey="Notifications">
         @if (notifications != null)
         {
+            <select class="form-select" @onchange="(e => FilterChanged(e))">
+                <option value="to">@Localizer["Inbox"]</option>
+                <option value="from">@Localizer["Items.Sent"]</option>
+            </select>
+            <br />
             <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
             <br /><br />
             @if (filter == "to")
@@ -159,22 +164,41 @@ else
                     <Row>
                         <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
                         <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
-                        <td>@context.FromDisplayName</td>
+                        
-                        <td>@context.Subject</td>
+                        @if (context.IsRead)
-                        <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                        {
+                            <td>@context.FromDisplayName</td>
+                            <td>@context.Subject</td>
+                            <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                        } 
+                        else 
+                        {
+                            <td><b>@context.FromDisplayName</b></td>
+                            <td><b>@context.Subject</b></td>
+                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                        }
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
                         <td colspan="3">
                             @{
-                                        string input = "___";
+                                string input = "___";
-                                        if (context.Body.Contains(input))
+                                if (context.Body.Contains(input))
-                                        {
+                                {
-                                            context.Body = context.Body.Split(input)[0];
+                                    context.Body = context.Body.Split(input)[0];
-                                            context.Body = context.Body.Replace("\n", "");
+                                    context.Body = context.Body.Replace("\n", "");
-                                            context.Body = context.Body.Replace("\r", "");
+                                    context.Body = context.Body.Replace("\r", "");
-                                        } }
+                                }
-                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                            }
+                            @if (context.IsRead)
+                            {
+                                @notificationSummary
+                            }
+                            else
+                            {
+                                <b>@notificationSummary</b>
+                            }
                         </td>
                     </Detail>
                 </Pager>
@@ -192,22 +216,42 @@ else
                     <Row>
                         <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
                         <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
-                        <td>@context.ToDisplayName</td>
+
-                        <td>@context.Subject</td>
+                        @if (context.IsRead)
-                        <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                        {
+                            <td>@context.ToDisplayName</td>
+                            <td>@context.Subject</td>
+                            <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                        } 
+                        else
+                        {
+                            <td><b>@context.ToDisplayName</b></td>
+                            <td><b>@context.Subject</b></td>
+                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                        }
+
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
                         <td colspan="3">
                             @{
-                                        string input = "___";
+                                string input = "___";
-                                        if (context.Body.Contains(input))
+                                if (context.Body.Contains(input))
-                                        {
+                                {
-                                            context.Body = context.Body.Split(input)[0];
+                                    context.Body = context.Body.Split(input)[0];
-                                            context.Body = context.Body.Replace("\n", "");
+                                    context.Body = context.Body.Replace("\n", "");
-                                            context.Body = context.Body.Replace("\r", "");
+                                    context.Body = context.Body.Replace("\r", "");
-                                        } }
+                                }
-                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                            }
+                            @if (context.IsRead)
+                            {
+                                @notificationSummary
+                            }
+                            else 
+                            {
+                                <b>@notificationSummary</b>
+                            } 
                         </td>
                     </Detail>
                 </Pager>
@@ -217,11 +261,6 @@ else
                 <br />
                 <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
             }
-            <br /><hr />
-            <select class="form-select" @onchange="(e => FilterChanged(e))">
-                <option value="to">@Localizer["Inbox"]</option>
-                <option value="from">@Localizer["Items.Sent"]</option>
-            </select>
         }
     </TabPanel>
 </TabStrip>
@@ -246,6 +285,7 @@ else
     private string category = string.Empty;
     private string filter = "to";
     private List<Notification> notifications;
+    private string notificationSummary = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 

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

@@ -118,6 +118,9 @@
             Notification notification = await NotificationService.GetNotificationAsync(notificationid);
             if (notification != null)
             {
+                notification.IsRead = true;
+                notification = await NotificationService.UpdateNotificationAsync(notification);
+
                 int userid = -1;
                 if (notification.ToUserId == PageState.User.UserId)
                 {

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -219,7 +219,14 @@
             if (folder != null)
             {
                 _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.PermissionList);
-                _files = await FileService.GetFilesAsync(FolderId);
+                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Browse, folder.PermissionList))
+                {
+                    _files = await FileService.GetFilesAsync(FolderId);
+                }
+                else
+                {
+                    _files = new List<File>();
+                }
             }
             else
             {
@@ -322,27 +329,29 @@
                     var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString();
                     await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken);
 
-                    // uploading is asynchronous so we need to wait for the uploads to complete
+                    // uploading is asynchronous so we need to poll to determine if uploads are completed
-                    // note that this will only wait a maximum of 15 seconds which may not be long enough for very large file uploads
+                    var success = true;
-                    bool success = false;
+                    int upload = 0;
-                    int attempts = 0;
+                    while (upload < uploads.Length && success)
-                    while (attempts < 5 && !success)
                     {
-                        attempts += 1;
+                        success = false;
-                        Thread.Sleep(1000 * attempts); // progressive retry 
+                        // note that progressive retry will only wait a maximum of 15 seconds which may not be long enough for very large file uploads
-
+                        int attempts = 0;
-                        success = true;
+                        while (attempts < 5 && !success)
-                        List<File> files = await FileService.GetFilesAsync(folder);
-                        if (files.Count > 0)
                         {
-                            foreach (string upload in uploads)
+                            attempts += 1;
+                            Thread.Sleep(1000 * attempts); // progressive retry
+
+                            var file = await FileService.GetFileAsync(int.Parse(folder), uploads[upload]);
+                            if (file != null)
                             {
-                                if (!files.Exists(item => item.Name == upload))
+                                success = true;
-                                {
-                                    success = false;
-                                }
                             }
                         }
+                        if (success)
+                        {
+                            upload++;
+                        }
                     }
 
                     // reset progress indicators
@@ -372,14 +381,14 @@
                     else
                     {
                         // set FileId to first file in upload collection
-                        await GetFiles();
+                        var file = await FileService.GetFileAsync(int.Parse(folder), uploads[0]);
-                        var file = _files.Where(item => item.Name == uploads[0]).FirstOrDefault();
                         if (file != null)
                         {
                             FileId = file.FileId;
                             await SetImage();
                             await OnUpload.InvokeAsync(FileId);
                         }
+                        await GetFiles();
                         StateHasChanged();
                     }
                 }

Oqtane.Client/Modules/Controls/Section.razor

@@ -17,7 +17,10 @@
     <hr class="app-rule" />
 </div>
 <div class="collapse @_show" id="@Name">
-    @ChildContent
+    @if (ChildContent != null)
+    {
+        @ChildContent
+    }
 </div>
 
 @code {
@@ -26,7 +29,7 @@
     private string _show = string.Empty;
 
     [Parameter]
-    public RenderFragment ChildContent { get; set; }
+    public RenderFragment ChildContent { get; set; } = null;
 
     [Parameter]
     public string Name { get; set; } // required - the name of the section

Oqtane.Client/Modules/ModuleBase.cs

@@ -9,7 +9,6 @@ using Oqtane.UI;
 using System.Collections.Generic;
 using Microsoft.JSInterop;
 using System.Linq;
-using Oqtane.Themes;
 
 namespace Oqtane.Modules
 {

Oqtane.Client/Oqtane.Client.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <Configurations>Debug;Release</Configurations>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -12,7 +12,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>

Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx

@@ -150,4 +150,10 @@
   <data name="Error.Module.Load" xml:space="preserve">
     <value>A Problem Was Encountered Loading Module {0}. The Module Is Either Invalid Or Does Not Exist.</value>
   </data>
+  <data name="Module.HelpText" xml:space="preserve">
+    <value>The name of the module</value>
+  </data>
+  <data name="Module.Text" xml:space="preserve">
+    <value>Module:</value>
+  </data>
 </root>

Oqtane.Client/Services/FileService.cs

@@ -46,6 +46,11 @@ namespace Oqtane.Services
             return await GetJsonAsync<File>($"{Apiurl}/{fileId}");
         }
 
+        public async Task<File> GetFileAsync(int folderId, string name)
+        {
+            return await GetJsonAsync<File>($"{Apiurl}/name/{name}/{folderId}");
+        }
+
         public async Task<File> AddFileAsync(File file)
         {
             return await PostJsonAsync<File>(Apiurl, file);

Oqtane.Client/Services/Interfaces/IFileService.cs

@@ -1,5 +1,6 @@
 using Oqtane.Models;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 
 namespace Oqtane.Services
@@ -33,6 +34,15 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<File> GetFileAsync(int fileId);
 
+        /// <summary>
+        /// Get a <see cref="File"/> based on the <see cref="Folder"/> and file name.
+        /// </summary>
+        /// <param name="folderId">Reference to the <see cref="Folder"/></param>
+        /// <param name="name">name of the file
+        /// </param>
+        /// <returns></returns>
+        Task<File> GetFileAsync(int folderId, string name);
+
         /// <summary>
         /// Add / store a <see cref="File"/> record.
         /// This does not contain the file contents. 

Oqtane.Client/Services/Interfaces/INotificationService.cs

@@ -18,6 +18,27 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<List<Notification>> GetNotificationsAsync(int siteId, string direction, int userId);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="siteId"></param>
+        /// <param name="direction"></param>
+        /// <param name="userId"></param>
+        /// <param name="count"></param>
+        /// <param name="isRead"></param>
+        /// <returns></returns>
+        Task<List<Notification>> GetNotificationsAsync(int siteId, string direction, int userId, int count, bool isRead);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="siteId"></param>
+        /// <param name="direction"></param>
+        /// <param name="userId"></param>
+        /// <param name="isRead"></param>
+        /// <returns></returns>
+        Task<int> GetNotificationCountAsync(int siteId, string direction, int userId, bool isRead);
+
         /// <summary>
         /// Returns a specific notifications
         /// </summary>

Oqtane.Client/Services/Interfaces/IPackageService.cs

@@ -27,6 +27,17 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task<List<Package>> GetPackagesAsync(string type, string search, string price, string package);
 
+        /// <summary>
+        /// Returns a list of packages matching the given parameters
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="search"></param>
+        /// <param name="price"></param>
+        /// <param name="package"></param>
+        /// <param name="sort"></param>
+        /// <returns></returns>
+        Task<List<Package>> GetPackagesAsync(string type, string search, string price, string package, string sort);
+
         /// <summary>
         /// Returns a specific package
         /// </summary>

Oqtane.Client/Services/NotificationService.cs

@@ -22,6 +22,20 @@ namespace Oqtane.Services
             return notifications.OrderByDescending(item => item.CreatedOn).ToList();
         }
 
+        public async Task<List<Notification>> GetNotificationsAsync(int siteId, string direction, int userId, int count, bool isRead)
+        {
+            var notifications = await GetJsonAsync<List<Notification>>($"{Apiurl}/read?siteid={siteId}&direction={direction.ToLower()}&userid={userId}&count={count}&isread={isRead}");
+
+            return notifications.OrderByDescending(item => item.CreatedOn).ToList();
+        }
+
+        public async Task<int> GetNotificationCountAsync(int siteId, string direction, int userId, bool isRead)
+        {
+            var notificationCount = await GetJsonAsync<int>($"{Apiurl}/read-count?siteid={siteId}&direction={direction.ToLower()}&userid={userId}&isread={isRead}");
+
+            return notificationCount;
+        }
+
         public async Task<Notification> GetNotificationAsync(int notificationId)
         {
             return await GetJsonAsync<Notification>($"{Apiurl}/{notificationId}");

Oqtane.Client/Services/PackageService.cs

@@ -23,7 +23,12 @@ namespace Oqtane.Services
 
         public async Task<List<Package>> GetPackagesAsync(string type, string search, string price, string package)
         {
-            return await GetJsonAsync<List<Package>>($"{Apiurl}?type={type}&search={WebUtility.UrlEncode(search)}&price={price}&package={package}");
+            return await GetPackagesAsync(type, search, price, package, "");
+        }
+
+        public async Task<List<Package>> GetPackagesAsync(string type, string search, string price, string package, string sort)
+        {
+            return await GetJsonAsync<List<Package>>($"{Apiurl}?type={type}&search={WebUtility.UrlEncode(search)}&price={price}&package={package}&sort={sort}");
         }
 
         public async Task<Package> GetPackageAsync(string packageId, string version)

Oqtane.Client/Services/ServiceBase.cs

@@ -21,7 +21,7 @@ namespace Oqtane.Services
             _siteState = siteState;
         }
 
-        private HttpClient GetHttpClient()
+        public HttpClient GetHttpClient()
         {
             if (!_httpClient.DefaultRequestHeaders.Contains(Constants.AntiForgeryTokenHeaderName) && _siteState != null && !string.IsNullOrEmpty(_siteState.AntiForgeryToken))
             {
@@ -206,7 +206,6 @@ namespace Oqtane.Services
                 Console.WriteLine($"Request: {response.RequestMessage.RequestUri}");
                 Console.WriteLine($"Response status: {response.StatusCode} {response.ReasonPhrase}");
             }
-
             return false;
         }
 

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -36,7 +36,7 @@
 
 @if (_canViewAdminDashboard || UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
 {
-    <button type="button" class="btn @ButtonClass" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel">
+    <button type="button" class="btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel">
         <span class="oi oi-cog"></span>
     </button>
 
@@ -471,6 +471,12 @@
 
     private async Task ToggleEditMode(bool EditMode)
     {
+        Page page = null;
+        if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))
+        {
+            page = await PageService.AddPageAsync(PageState.Page.PageId, PageState.User.UserId);
+        }
+
         if (_showEditMode)
         {
             if (EditMode)
@@ -490,9 +496,8 @@
 		}
 		else
 		{
-			if (PageState.Page.IsPersonalizable && PageState.User != null)
+            if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))
 			{
-				var page = await PageService.AddPageAsync(PageState.Page.PageId, PageState.User.UserId);
 				PageState.EditMode = true;
 				NavigationManager.NavigateTo(NavigateUrl(page.Path, "edit=" + ((PageState.EditMode) ? "true" : "false")));
 			}

Oqtane.Client/Themes/Controls/Theme/LoginBase.cs

@@ -19,7 +19,6 @@ namespace Oqtane.Themes.Controls
         [Inject] public IUserService UserService { get; set; }
         [Inject] public IJSRuntime jsRuntime { get; set; }
         [Inject] public IServiceProvider ServiceProvider { get; set; }
-        [Inject] public ILogService LoggingService { get; set; }
 
         protected void LoginUser()
         {

Oqtane.Client/Themes/ThemeBase.cs

@@ -1,6 +1,9 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using Oqtane.Enums;
 using Oqtane.Models;
+using Oqtane.Modules;
+using Oqtane.Services;
 using Oqtane.Shared;
 using Oqtane.UI;
 using System;
@@ -13,6 +16,9 @@ namespace Oqtane.Themes
 {
     public abstract class ThemeBase : ComponentBase, IThemeControl
     {
+        [Inject]
+        protected ILogService LoggingService { get; set; }
+
         [Inject]
         protected IJSRuntime JSRuntime { get; set; }
 
@@ -186,6 +192,148 @@ namespace Oqtane.Themes
             await interop.ScrollTo(0, 0, "smooth");
         }
 
+        // logging methods
+        public async Task Log(Alias alias, LogLevel level, string function, Exception exception, string message, params object[] args)
+        {
+            LogFunction logFunction;
+            if (string.IsNullOrEmpty(function))
+            {
+                // try to infer from page action
+                function = PageState.Action;
+            }
+            if (!Enum.TryParse(function, out logFunction))
+            {
+                switch (function.ToLower())
+                {
+                    case "add":
+                        logFunction = LogFunction.Create;
+                        break;
+                    case "edit":
+                        logFunction = LogFunction.Update;
+                        break;
+                    case "delete":
+                        logFunction = LogFunction.Delete;
+                        break;
+                    case "":
+                        logFunction = LogFunction.Read;
+                        break;
+                    default:
+                        logFunction = LogFunction.Other;
+                        break;
+                }
+            }
+            await Log(alias, level, logFunction, exception, message, args);
+        }
+
+        public async Task Log(Alias alias, LogLevel level, LogFunction function, Exception exception, string message, params object[] args)
+        {
+            int pageId = PageState.Page.PageId;
+            string category = GetType().AssemblyQualifiedName;
+            string feature = Utilities.GetTypeNameLastSegment(category, 1);
+
+            await LoggingService.Log(alias, pageId, null, PageState.User?.UserId, category, feature, function, level, exception, message, args);
+        }
+
+        public class Logger
+        {
+            private readonly ModuleBase _moduleBase;
+
+            public Logger(ModuleBase moduleBase)
+            {
+                _moduleBase = moduleBase;
+            }
+
+            public async Task LogTrace(string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Trace, "", null, message, args);
+            }
+
+            public async Task LogTrace(LogFunction function, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Trace, function, null, message, args);
+            }
+
+            public async Task LogTrace(Exception exception, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Trace, "", exception, message, args);
+            }
+
+            public async Task LogDebug(string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Debug, "", null, message, args);
+            }
+
+            public async Task LogDebug(LogFunction function, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Debug, function, null, message, args);
+            }
+
+            public async Task LogDebug(Exception exception, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Debug, "", exception, message, args);
+            }
+
+            public async Task LogInformation(string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Information, "", null, message, args);
+            }
+
+            public async Task LogInformation(LogFunction function, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Information, function, null, message, args);
+            }
+
+            public async Task LogInformation(Exception exception, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Information, "", exception, message, args);
+            }
+
+            public async Task LogWarning(string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Warning, "", null, message, args);
+            }
+
+            public async Task LogWarning(LogFunction function, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Warning, function, null, message, args);
+            }
+
+            public async Task LogWarning(Exception exception, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Warning, "", exception, message, args);
+            }
+
+            public async Task LogError(string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Error, "", null, message, args);
+            }
+
+            public async Task LogError(LogFunction function, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Error, function, null, message, args);
+            }
+
+            public async Task LogError(Exception exception, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Error, "", exception, message, args);
+            }
+
+            public async Task LogCritical(string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Critical, "", null, message, args);
+            }
+
+            public async Task LogCritical(LogFunction function, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Critical, function, null, message, args);
+            }
+
+            public async Task LogCritical(Exception exception, string message, params object[] args)
+            {
+                await _moduleBase.Log(null, LogLevel.Critical, "", exception, message, args);
+            }
+        }
+
         [Obsolete("ContentUrl(int fileId) is deprecated. Use FileUrl(int fileId) instead.", false)]
         public string ContentUrl(int fileid)
         {

Oqtane.Client/UI/SiteRouter.razor

@@ -223,12 +223,12 @@
             }
             if (page == null)
             {
-                // look for personalized page
                 page = await PageService.GetPageAsync(route.PagePath, site.SiteId);
             }
             else
             {
-                if (user != null && page.IsPersonalizable)
+                // look for personalized page
+                if (user != null && page.IsPersonalizable && !UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList))
                 {
                     var personalized = await PageService.GetPageAsync(route.PagePath + "/" + user.Username, site.SiteId);
                     if (personalized != null)

Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.MySQL</id>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane MySQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.PostgreSQL</id>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane PostgreSQL Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.SqlServer</id>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQL Server Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -10,7 +10,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Oqtane.Database.Sqlite</id>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
         <authors>Shaun Walker</authors>
         <owners>.NET Foundation</owners>
         <title>Oqtane SQLite Provider</title>
@@ -12,7 +12,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <license type="expression">MIT</license>
         <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+        <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
         <icon>icon.png</icon>
         <tags>oqtane</tags>
     </metadata>

Oqtane.Maui/Oqtane.Maui.csproj

@@ -6,7 +6,7 @@
     <!-- <TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks> -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -14,7 +14,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane.Maui</RootNamespace>
@@ -31,7 +31,7 @@
 		<ApplicationIdGuid>0E29FC31-1B83-48ED-B6E0-9F3C67B775D4</ApplicationIdGuid>
     
 		<!-- Versions -->
-		<ApplicationDisplayVersion>4.0.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>4.0.1</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>

Oqtane.Package/Oqtane.Client.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Client</id>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Framework.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Framework</id>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -11,8 +11,8 @@
     <copyright>.NET Foundation</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
-    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v4.0.0/Oqtane.Framework.4.0.0.Upgrade.zip</projectUrl>
+    <projectUrl>https://github.com/oqtane/oqtane.framework/releases/download/v4.0.1/Oqtane.Framework.4.0.1.Upgrade.zip</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane framework</tags>
   </metadata>

Oqtane.Package/Oqtane.Server.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Server</id>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Shared.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/Oqtane.Updater.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Oqtane.Updater</id>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</releaseNotes>
+    <releaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</releaseNotes>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
   </metadata>

Oqtane.Package/install.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.0.Install.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.1.Install.zip" -Force 

Oqtane.Package/upgrade.ps1

@@ -1 +1 @@
-Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.0.Upgrade.zip" -Force 
+Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.1.Upgrade.zip" -Force 

Oqtane.Server/Controllers/FileController.cs

@@ -123,8 +123,38 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {FileId}", id);
+                if (file != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {FileId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
+                return null;
+            }
+        }
+
+        [HttpGet("name/{name}/{folderId}")]
+        public Models.File Get(string name, int folderId)
+        {
+            Models.File file = _files.GetFile(folderId, name);
+            if (file != null && file.Folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, file.Folder.PermissionList))
+            {
+                return file;
+            }
+            else
+            {
+                if (file != null)
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized File Get Attempt {Name} For Folder {FolderId}", name, folderId);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/FolderController.cs

@@ -43,7 +43,7 @@ namespace Oqtane.Controllers
             {
                 foreach (Folder folder in _folders.GetFolders(SiteId))
                 {
-                    if (_userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
+                    if (_userPermissions.IsAuthorized(User, PermissionNames.View, folder.PermissionList))
                     {
                         folders.Add(folder);
                     }
@@ -64,14 +64,21 @@ namespace Oqtane.Controllers
         public Folder Get(int id)
         {
             Folder folder = _folders.GetFolder(id);
-            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, folder.PermissionList))
             {
                 return folder;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {FolderId}", id);
+                if (folder != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {FolderId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -80,19 +87,26 @@ namespace Oqtane.Controllers
         public Folder GetByPath(int siteId, string path)
         {
             var folderPath = WebUtility.UrlDecode(path).Replace("\\", "/");
-            if (!folderPath.EndsWith("/"))
+            if (!folderPath.EndsWith("/") && folderPath != "")
             {
                 folderPath += "/";
             }
             Folder folder = _folders.GetFolder(siteId, folderPath);
-            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.Browse, folder.PermissionList))
+            if (folder != null && folder.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, folder.PermissionList))
             {
                 return folder;
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {Path} For Site {SiteId}", path, siteId);
+                if (folder != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Folder Get Attempt {Path} For Site {SiteId}", path, siteId);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/LanguageController.cs

@@ -89,8 +89,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Get Attempt {LanguageId}", id);
+                if (language != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Language Get Attempt {LanguageId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/ModuleController.cs

@@ -113,8 +113,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Get Attempt {ModuleId}", id);
+                if (module != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Module Get Attempt {ModuleId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/ModuleDefinitionController.cs

@@ -89,15 +89,22 @@ namespace Oqtane.Controllers
             if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId)
             {
                 ModuleDefinition moduledefinition = _moduleDefinitions.GetModuleDefinition(id, SiteId);
-                if (_userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.PermissionList))
+                if (moduledefinition != null && _userPermissions.IsAuthorized(User, PermissionNames.Utilize, moduledefinition.PermissionList))
                 {
-                    if (string.IsNullOrEmpty(moduledefinition.Version)) moduledefinition.Version = new Version(1, 0, 0).ToString();
+                    moduledefinition.Version = (string.IsNullOrEmpty(moduledefinition.Version)) ? new Version(1, 0, 0).ToString() : moduledefinition.Version;
                     return moduledefinition;
                 }
                 else
                 {
-                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Get Attempt {ModuleDefinitionId} {SiteId}", id, siteid);
+                    if (moduledefinition != null)
-                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    {
+                        _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized ModuleDefinition Get Attempt {ModuleDefinitionId} {SiteId}", id, siteid);
+                        HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                    }
+                    else
+                    {
+                        HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                    }
                     return null;
                 }
             }

Oqtane.Server/Controllers/NotificationController.cs

@@ -9,6 +9,9 @@ using Oqtane.Repository;
 using Oqtane.Security;
 using System.Net;
 using System.Reflection.Metadata;
+using Microsoft.Extensions.Localization;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using System.Linq;
 
 namespace Oqtane.Controllers
 {
@@ -30,6 +33,72 @@ namespace Oqtane.Controllers
             _alias = tenantManager.GetAlias();
         }
 
+        // GET: api/<controller>/read?siteid=x&direction=to&userid=1&count=5&isread=false
+        [HttpGet("read")]
+        [Authorize(Roles = RoleNames.Registered)]
+        public IEnumerable<Notification> Get(string siteid, string direction, string userid, string count, string isread)
+        {
+            IEnumerable<Notification> notifications = null;
+
+            int SiteId;
+            int UserId;
+            int Count;
+            bool IsRead;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId && int.TryParse(userid, out UserId) && int.TryParse(count, out Count) && bool.TryParse(isread, out IsRead) && IsAuthorized(UserId))
+            {
+                if (direction == "to")
+                {
+                    notifications = _notifications.GetNotifications(SiteId, -1, UserId, Count, IsRead);
+                }
+                else
+                {
+                    notifications = _notifications.GetNotifications(SiteId, UserId, -1, Count, IsRead);
+                }
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Get Attempt {SiteId} {Direction} {UserId} {Count} {isRead}", siteid, direction, userid, count, isread);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                notifications = null;
+            }
+
+
+            return notifications;
+        }
+
+        // GET: api/<controller>/read?siteid=x&direction=to&userid=1&count=5&isread=false
+        [HttpGet("read-count")]
+        [Authorize(Roles = RoleNames.Registered)]
+        public int Get(string siteid, string direction, string userid, string isread)
+        {
+            int notificationsCount = 0;
+
+            int SiteId;
+            int UserId;
+            bool IsRead;
+            if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId && int.TryParse(userid, out UserId) && bool.TryParse(isread, out IsRead) && IsAuthorized(UserId))
+            {
+                if (direction == "to")
+                {
+                    notificationsCount = _notifications.GetNotificationCount(SiteId, -1, UserId, IsRead);
+                }
+                else
+                {
+                    notificationsCount = _notifications.GetNotificationCount(SiteId, UserId, -1, IsRead);
+                }
+            }
+            else
+            {
+                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Get Attempt {SiteId} {Direction} {UserId} {isRead}", siteid, direction, userid, isread);
+                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                notificationsCount = 0;
+            }
+
+
+            return notificationsCount;
+        }
+
+
         // GET: api/<controller>?siteid=x&type=y&userid=z
         [HttpGet]
         [Authorize(Roles = RoleNames.Registered)]
@@ -72,8 +141,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Get Attempt {NotificationId}", id);
+                if (notification != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Notification Get Attempt {NotificationId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/PackageController.cs

@@ -34,7 +34,7 @@ namespace Oqtane.Controllers
 
         // GET: api/<controller>?type=x&search=y&price=z&package=a
         [HttpGet]
-        public async Task<IEnumerable<Package>> Get(string type, string search, string price, string package)
+        public async Task<IEnumerable<Package>> Get(string type, string search, string price, string package, string sort)
         {
             // get packages
             List<Package> packages = new List<Package>();
@@ -44,7 +44,7 @@ namespace Oqtane.Controllers
                 {
                     client.DefaultRequestHeaders.Add("Referer", HttpContext.Request.Scheme + "://" + HttpContext.Request.Host.Value);
                     client.DefaultRequestHeaders.UserAgent.Add(new ProductInfoHeaderValue(Constants.PackageId, Constants.Version));
-                    packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}");
+                    packages = await GetJson<List<Package>>(client, Constants.PackageRegistryUrl + $"/api/registry/packages/?id={_configManager.GetInstallationId()}&type={type.ToLower()}&version={Constants.Version}&search={search}&price={price}&package={package}&sort={sort}");
                 }
             }
             return packages;

Oqtane.Server/Controllers/PageController.cs

@@ -7,14 +7,9 @@ using System.Linq;
 using Oqtane.Security;
 using System.Net;
 using Oqtane.Enums;
-using Oqtane.Extensions;
 using Oqtane.Infrastructure;
 using Oqtane.Repository;
-using Oqtane.Modules.Admin.Users;
 using System.IO;
-using Oqtane.Services;
-using Oqtane.UI;
-using System;
 
 namespace Oqtane.Controllers
 {
@@ -92,8 +87,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {PageId}", id);
+                if (page != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {PageId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -112,8 +114,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {SiteId} {Path}", siteid, path);
+                if (page != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Page Get Attempt {SiteId} {Path}", siteid, path);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -180,64 +189,68 @@ namespace Oqtane.Controllers
             User user = _userPermissions.GetUser(User);
             if (parent != null && parent.SiteId == _alias.SiteId && parent.IsPersonalizable && user.UserId == int.Parse(userid))
             {
-                page = new Page();
+                page = _pages.GetPage(parent.Path + "/" + user.Username, parent.SiteId);
-                page.SiteId = parent.SiteId;
+                if (page == null)
-                page.ParentId = parent.PageId;
-                page.Name = user.DisplayName;
-                page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(page.Name);
-                page.Title = page.Name + " - " + parent.Name;
-                page.Order = 0;
-                page.IsNavigation = false;
-                page.Url = "";
-                page.ThemeType = parent.ThemeType;
-                page.DefaultContainerType = parent.DefaultContainerType;
-                page.Icon = parent.Icon;
-                page.PermissionList = new List<Permission>()
                 {
-                    new Permission(PermissionNames.View, int.Parse(userid), true),
+                    page = new Page();
-                    new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                    page.SiteId = parent.SiteId;
-                    new Permission(PermissionNames.Edit, int.Parse(userid), true)
+                    page.ParentId = parent.PageId;
-                };
+                    page.Name = (!string.IsNullOrEmpty(user.DisplayName)) ? user.DisplayName : user.Username;
-                page.IsPersonalizable = false;
+                    page.Path = parent.Path + "/" + user.Username;
-                page.UserId = int.Parse(userid);
+                    page.Title = page.Name + " - " + parent.Name;
-                page = _pages.AddPage(page);
+                    page.Order = 0;
-
+                    page.IsNavigation = false;
-                // copy modules
+                    page.Url = "";
-                List<PageModule> pagemodules = _pageModules.GetPageModules(page.SiteId).ToList();
+                    page.ThemeType = parent.ThemeType;
-                foreach (PageModule pm in pagemodules.Where(item => item.PageId == parent.PageId && !item.IsDeleted))
+                    page.DefaultContainerType = parent.DefaultContainerType;
-                {
+                    page.Icon = parent.Icon;
-                    Module module = new Module();
+                    page.PermissionList = new List<Permission>()
-                    module.SiteId = page.SiteId;
-                    module.PageId = page.PageId;
-                    module.ModuleDefinitionName = pm.Module.ModuleDefinitionName;
-                    module.AllPages = false;
-                    module.PermissionList = new List<Permission>()
                     {
                         new Permission(PermissionNames.View, int.Parse(userid), true),
                         new Permission(PermissionNames.View, RoleNames.Everyone, true),
                         new Permission(PermissionNames.Edit, int.Parse(userid), true)
                     };
-                    module = _modules.AddModule(module);
+                    page.IsPersonalizable = false;
+                    page.UserId = int.Parse(userid);
+                    page = _pages.AddPage(page);
 
-                    string content = _modules.ExportModule(pm.ModuleId);
+                    // copy modules
-                    if (content != "")
+                    List<PageModule> pagemodules = _pageModules.GetPageModules(page.SiteId).ToList();
+                    foreach (PageModule pm in pagemodules.Where(item => item.PageId == parent.PageId && !item.IsDeleted))
                     {
-                        _modules.ImportModule(module.ModuleId, content);
+                        Module module = new Module();
+                        module.SiteId = page.SiteId;
+                        module.PageId = page.PageId;
+                        module.ModuleDefinitionName = pm.Module.ModuleDefinitionName;
+                        module.AllPages = false;
+                        module.PermissionList = new List<Permission>()
+                        {
+                            new Permission(PermissionNames.View, int.Parse(userid), true),
+                            new Permission(PermissionNames.View, RoleNames.Everyone, true),
+                            new Permission(PermissionNames.Edit, int.Parse(userid), true)
+                        };
+                        module = _modules.AddModule(module);
+
+                        string content = _modules.ExportModule(pm.ModuleId);
+                        if (content != "")
+                        {
+                            _modules.ImportModule(module.ModuleId, content);
+                        }
+
+                        PageModule pagemodule = new PageModule();
+                        pagemodule.PageId = page.PageId;
+                        pagemodule.ModuleId = module.ModuleId;
+                        pagemodule.Title = pm.Title;
+                        pagemodule.Pane = pm.Pane;
+                        pagemodule.Order = pm.Order;
+                        pagemodule.ContainerType = pm.ContainerType;
+
+                        _pageModules.AddPageModule(pagemodule);
                     }
 
-                    PageModule pagemodule = new PageModule();
+                    _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create);
-                    pagemodule.PageId = page.PageId;
+                    _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh);
-                    pagemodule.ModuleId = module.ModuleId;
-                    pagemodule.Title = pm.Title;
-                    pagemodule.Pane = pm.Pane;
-                    pagemodule.Order = pm.Order;
-                    pagemodule.ContainerType = pm.ContainerType;
-
-                    _pageModules.AddPageModule(pagemodule);
                 }
-
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create);
-                _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh);
             }
             else
             {

Oqtane.Server/Controllers/PageModuleController.cs

@@ -44,8 +44,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageModuleId}", id);
+                if (pagemodule != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageModuleId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -61,8 +68,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageId} {ModuleId}", pageid, moduleid);
+                if (pagemodule != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized PageModule Get Attempt {PageId} {ModuleId}", pageid, moduleid);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/ProfileController.cs

@@ -56,8 +56,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Get Attempt {ProfileId}", id);
+                if (profile != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Profile Get Attempt {ProfileId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/RoleController.cs

@@ -59,9 +59,16 @@ namespace Oqtane.Controllers
                 return role;
             }
             else
-            { 
+            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Get Attempt {RoleId}", id);
+                if (role != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Role Get Attempt {RoleId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/SettingController.cs

@@ -89,11 +89,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                if (entityName != EntityNames.Visitor)
+                if (setting != null && entityName != EntityNames.Visitor)
                 {
                     _logger.Log(LogLevel.Error, this, LogFunction.Read, "User Not Authorized To Access Setting {EntityName} {SettingId}", entityName, id);
                     HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/SiteController.cs

@@ -79,7 +79,7 @@ namespace Oqtane.Controllers
         private Site GetSite(int siteid)
         {
             var site = _sites.GetSite(siteid);
-            if (site.SiteId == _alias.SiteId)
+            if (site != null && site.SiteId == _alias.SiteId)
             {
                 // site settings
                 site.Settings = _settings.GetSettings(EntityNames.Site, site.SiteId)
@@ -153,8 +153,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Get Attempt {SiteId}", siteid);
+                if (site != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Get Attempt {SiteId}", siteid);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/UrlMappingController.cs

@@ -55,9 +55,16 @@ namespace Oqtane.Controllers
                 return urlMapping;
             }
             else
-            { 
+            {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UrlMapping Get Attempt {UrlMappingId}", id);
+                if (urlMapping != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UrlMapping Get Attempt {UrlMappingId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }
@@ -73,8 +80,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UrlMapping Get Attempt {SiteId} {Url}", siteid, url);
+                if (urlMapping != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized UrlMapping Get Attempt {SiteId} {Url}", siteid, url);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/UserController.cs

@@ -65,6 +65,10 @@ namespace Oqtane.Controllers
                     user.SiteId = int.Parse(siteid);
                     user.Roles = GetUserRoles(user.UserId, user.SiteId);
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return Filter(user);
             }
             else
@@ -88,6 +92,10 @@ namespace Oqtane.Controllers
                     user.SiteId = int.Parse(siteid);
                     user.Roles = GetUserRoles(user.UserId, user.SiteId);
                 }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return Filter(user);
             }
             else
@@ -648,10 +656,14 @@ namespace Oqtane.Controllers
             foreach (UserRole userrole in userroles)
             {
                 roles += userrole.Role.Name + ";";
-                if (userrole.Role.Name == RoleNames.Host && userroles.Where(item => item.Role.Name == RoleNames.Admin).FirstOrDefault() == null)
+                if (userrole.Role.Name == RoleNames.Host && !userroles.Any(item => item.Role.Name == RoleNames.Admin))
                 {
                     roles += RoleNames.Admin + ";";
                 }
+                if (userrole.Role.Name == RoleNames.Host && !userroles.Any(item => item.Role.Name == RoleNames.Registered))
+                {
+                    roles += RoleNames.Registered + ";";
+                }
             }
             if (roles != "") roles = ";" + roles;
             return roles;

Oqtane.Server/Controllers/UserRoleController.cs

@@ -79,8 +79,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Role Get Attempt {UserRoleId}", id);
+                if (userrole != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized User Role Get Attempt {UserRoleId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Controllers/VisitorController.cs

@@ -64,8 +64,15 @@ namespace Oqtane.Controllers
             }
             else
             {
-                _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Visitor Get Attempt {VisitorId}", id);
+                if (visitor != null)
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                {
+                    _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Visitor Get Attempt {VisitorId}", id);
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                }
+                else
+                {
+                    HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                }
                 return null;
             }
         }

Oqtane.Server/Migrations/Tenant/04000101_AddNotificationIsRead.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+using Oqtane.Shared;
+
+namespace Oqtane.Migrations.Tenant
+{
+    [DbContext(typeof(TenantDBContext))]
+    [Migration("Tenant.04.00.01.01")]
+    public class AddNotificationIsRead : MultiDatabaseMigration
+    {
+
+        public AddNotificationIsRead(IDatabase database) : base(database)
+        {
+        }
+
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            var notificationEntityBuilder = new NotificationEntityBuilder(migrationBuilder, ActiveDatabase);
+            notificationEntityBuilder.AddBooleanColumn("IsRead", true);
+            notificationEntityBuilder.UpdateColumn("IsRead", "1", "bool", "");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            var notificationEntityBuilder = new NotificationEntityBuilder(migrationBuilder, ActiveDatabase);
+            notificationEntityBuilder.DropColumn("IsRead");
+        }
+
+    }
+
+
+}

Oqtane.Server/Oqtane.Server.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>

Oqtane.Server/Repository/Interfaces/INotificationRepository.cs

@@ -6,6 +6,8 @@ namespace Oqtane.Repository
     public interface INotificationRepository
     {
         IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId);
+        IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId, int count, bool isRead);
+        int GetNotificationCount(int siteId, int fromUserId, int toUserId, bool isRead);
         Notification AddNotification(Notification notification);
         Notification UpdateNotification(Notification notification);
         Notification GetNotification(int notificationId);

Oqtane.Server/Repository/ModuleDefinitionRepository.cs

@@ -101,6 +101,7 @@ namespace Oqtane.Repository
                 ModuleDefinition.IsPortable = moduleDefinition.IsPortable;
                 ModuleDefinition.Resources = moduleDefinition.Resources;
                 ModuleDefinition.IsEnabled = moduleDefinition.IsEnabled;
+                ModuleDefinition.PackageName = moduleDefinition.PackageName;
             }
 
             return ModuleDefinition;

Oqtane.Server/Repository/NotificationRepository.cs

@@ -33,6 +33,54 @@ namespace Oqtane.Repository
                 .ToList();
         }
 
+        public IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId, int count, bool isRead)
+        {
+            if (toUserId == -1 && fromUserId == -1)
+            {
+                return _db.Notification
+                    .Where(item => item.SiteId == siteId)
+                    .Where(item => item.IsDelivered == false && item.IsDeleted == false)
+                    .Where(item => item.SendOn == null || item.SendOn < System.DateTime.UtcNow)
+                    .Where(item => item.IsRead == isRead)
+                    .OrderByDescending(item => item.CreatedOn)
+                    .ToList()
+                    .Take(count);
+            }
+
+            return _db.Notification
+                .Where(item => item.SiteId == siteId)
+                .Where(item => item.ToUserId == toUserId || toUserId == -1)
+                .Where(item => item.FromUserId == fromUserId || fromUserId == -1)
+                .Where(item => item.IsRead == isRead)
+                .OrderByDescending(item => item.CreatedOn)
+                .ToList()
+                .Take(count);
+        }
+
+        public int GetNotificationCount(int siteId, int fromUserId, int toUserId, bool isRead)
+        {
+            if (toUserId == -1 && fromUserId == -1)
+            {
+                return _db.Notification
+                    .Where(item => item.SiteId == siteId)
+                    .Where(item => item.IsDelivered == false && item.IsDeleted == false)
+                    .Where(item => item.SendOn == null || item.SendOn < System.DateTime.UtcNow)
+                    .Where(item => item.IsRead == isRead)
+                    .ToList()
+                    .Count();
+
+            }
+
+            return _db.Notification
+                .Where(item => item.SiteId == siteId)
+                .Where(item => item.ToUserId == toUserId || toUserId == -1)
+                .Where(item => item.FromUserId == fromUserId || fromUserId == -1)
+                .Where(item => item.IsRead == isRead)
+                .ToList()
+                .Count();
+        }
+
+
         public Notification AddNotification(Notification notification)
         {
             _db.Notification.Add(notification);

Oqtane.Server/Repository/ThemeRepository.cs

@@ -89,6 +89,7 @@ namespace Oqtane.Repository
                 Theme.Containers = theme.Containers;
                 Theme.ThemeSettingsType = theme.ThemeSettingsType;
                 Theme.ContainerSettingsType = theme.ContainerSettingsType;
+                Theme.PackageName = theme.PackageName;
                 Themes.Add(Theme);
             }
 

Oqtane.Server/wwwroot/Modules/Templates/External/Client/Modules/[Owner].Module.[Module]/Settings.razor

@@ -13,7 +13,7 @@
 </div>
 
 @code {
-    private string resourceType = "[Owner].[Module].Settings, [Owner].[Module].Client.Oqtane"; // for localization
+    private string resourceType = "[Owner].Module.[Module].Settings, [Owner].Module.[Module].Client.Oqtane"; // for localization
     public override string Title => "[Module] Settings";
 
     string _value;

Oqtane.Server/wwwroot/Modules/Templates/External/[Owner].Module.[Module].sln

@@ -20,9 +20,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU

Oqtane.Server/wwwroot/Themes/Templates/External/[Owner].Theme.[Theme].sln

@@ -16,9 +16,7 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU

Oqtane.Shared/Models/Notification.cs

@@ -94,6 +94,10 @@ namespace Oqtane.Models
         /// </summary>
         public DateTime? SendOn { get; set; }
 
+        /// <summary>
+        /// If it has been read. See also <see cref="IsDelivered" />
+        /// </summary>
+        public bool IsRead { get; set; }
 
         // constructors
         public Notification() {}
@@ -174,6 +178,7 @@ namespace Oqtane.Models
             }
             IsDelivered = false;
             DeliveredOn = null;
+            IsRead = false;
         }
     }
 

Oqtane.Shared/Models/Package.cs

@@ -32,6 +32,11 @@ namespace Oqtane.Models
         /// </summary>
         public string Description { get; set; }
 
+        /// <summary>
+        /// logo
+        /// </summary>
+        public int? LogoFileId { get; set; }
+
         /// <summary>
         /// License for the Package. 
         /// </summary>
@@ -62,6 +67,11 @@ namespace Oqtane.Models
         /// </summary>
         public string PackageUrl { get; set; }
 
+        /// <summary>
+        /// The direct Url for getting support for the product
+        /// </summary>
+        public string SupportUrl { get; set; }
+
         /// <summary>
         /// Indicates if any known security vulnerabilities exist 
         /// </summary>

Oqtane.Shared/Oqtane.Shared.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>

Oqtane.Shared/Shared/Constants.cs

@@ -7,8 +7,8 @@ namespace Oqtane.Shared
 {
     public class Constants
     {
-        public static readonly string Version = "4.0.0";
+        public static readonly string Version = "4.0.1";
-        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0";
+        public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1";
         public const string PackageId = "Oqtane.Framework";
         public const string ClientId = "Oqtane.Client";
         public const string UpdaterPackageId = "Oqtane.Updater";

Oqtane.Updater/Oqtane.Updater.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <Version>4.0.0</Version>
+    <Version>4.0.1</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -11,7 +11,7 @@
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>