diff --git a/Oqtane.Client/Modules/Admin/Login/Index.razor b/Oqtane.Client/Modules/Admin/Login/Index.razor index 80d4f5e4..f6f11fcf 100644 --- a/Oqtane.Client/Modules/Admin/Login/Index.razor +++ b/Oqtane.Client/Modules/Admin/Login/Index.razor @@ -163,7 +163,8 @@ if (!twofactor) { - user = await UserService.LoginUserAsync(user, false, false); + bool setCookie = (PageState.Runtime == Oqtane.Shared.Runtime.WebAssembly); + user = await UserService.LoginUserAsync(user, setCookie, false); } else { diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index e62db3aa..77a24823 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -260,7 +260,6 @@ { if (route.PagePath != "404") { - await LogService.Log(null, null, user.UserId, "SiteRouter", "SiteRouter", LogFunction.Other, LogLevel.Information, null, "Page Path /{Path} Does Not Exist Or User Is Not Authorized To View", route.PagePath); // redirect to 404 page NavigationManager.NavigateTo(Utilities.NavigateUrl(SiteState.Alias.Path, "404", "")); } diff --git a/Oqtane.Server/Pages/External.cshtml.cs b/Oqtane.Server/Pages/External.cshtml.cs index 1bd23ac6..aa530871 100644 --- a/Oqtane.Server/Pages/External.cshtml.cs +++ b/Oqtane.Server/Pages/External.cshtml.cs @@ -1,6 +1,5 @@ using System.Net; using Microsoft.AspNetCore.Authentication; -using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Oqtane.Extensions; diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs index 20770472..58cdeb29 100644 --- a/Oqtane.Server/Pages/_Host.cshtml.cs +++ b/Oqtane.Server/Pages/_Host.cshtml.cs @@ -186,7 +186,6 @@ namespace Oqtane.Pages { if (route.PagePath != "404") { - _logger.Log(LogLevel.Information, "Host", LogFunction.Other, "Page Path /{Path} Does Not Exist", route.PagePath); return RedirectPermanent(route.SiteUrl + "/404"); } } diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs index 7086e4e9..688e1b49 100644 --- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs +++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs @@ -159,6 +159,11 @@ namespace Oqtane.Repository moduledefinition.Name = (!string.IsNullOrEmpty(moduledef.Name)) ? moduledef.Name : moduledefinition.Name; moduledefinition.Description = (!string.IsNullOrEmpty(moduledef.Description)) ? moduledef.Description : moduledefinition.Description; moduledefinition.Categories = (!string.IsNullOrEmpty(moduledef.Categories)) ? moduledef.Categories : moduledefinition.Categories; + // manage versioning + if (string.IsNullOrEmpty(moduledefinition.ReleaseVersions)) + { + moduledefinition.ReleaseVersions = moduledefinition.Version; + } moduledefinition.Version = moduledef.Version; // remove module definition from list as it is already synced moduledefs.Remove(moduledef);