Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #2125 - cannot login using WebAssembly, remove granular 404 logging as it is already managed by url mapping, make IModule ReleaseVersions optional when using EF Core migrations

Browse Source
This commit is contained in:
Shaun Walker 2022-04-13 19:27:12 -04:00
parent 355d0405f4
commit 6dc1d42d90
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/Modules/Admin/Login/Index.razor
View File

@ -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
{

1
Oqtane.Client/UI/SiteRouter.razor
View File

@ -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", ""));
}

1
Oqtane.Server/Pages/External.cshtml.cs
View File

@ -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;

1
Oqtane.Server/Pages/_Host.cshtml.cs
View File

@ -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");
}
}

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

@ -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);