kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #1156 add defensive coding for scenario where host name does not match any alias

Browse Source
This commit is contained in:
Shaun Walker 2021-03-11 20:21:15 -05:00
parent 6d3e17a5f5
commit 86ce8994d9
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Oqtane.Server/Pages/_Host.cshtml
View File

@ -1,4 +1,4 @@
@page "/" @page "/"
@namespace Oqtane.Pages @namespace Oqtane.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@using Microsoft.Extensions.Configuration @using Microsoft.Extensions.Configuration
@ -35,6 +35,11 @@
<a class="dismiss">🗙</a> <a class="dismiss">🗙</a>
</div> </div>
@if (Model.Message != "")
{
@Model.Message
}
<script src="js/interop.js"></script> <script src="js/interop.js"></script>
@if (Configuration.GetSection("Runtime").Value == "WebAssembly") @if (Configuration.GetSection("Runtime").Value == "WebAssembly")

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

@ -39,6 +39,7 @@ namespace Oqtane.Pages
public string HeadResources = ""; public string HeadResources = "";
public string BodyResources = ""; public string BodyResources = "";
public string Message = "";
public void OnGet() public void OnGet()
{ {
@ -54,20 +55,28 @@ namespace Oqtane.Pages
if (HttpContext.Request.Cookies[CookieRequestCultureProvider.DefaultCookieName] == null && !string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection"))) if (HttpContext.Request.Cookies[CookieRequestCultureProvider.DefaultCookieName] == null && !string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
{ {
var uri = new Uri(Request.GetDisplayUrl()); var uri = new Uri(Request.GetDisplayUrl());
var alias = _aliases.GetAlias(uri.Authority + "/" + uri.LocalPath.Substring(1)); var hostname = uri.Authority + "/" + uri.LocalPath.Substring(1);
_state.Alias = alias; var alias = _aliases.GetAlias(hostname);
if (alias != null)
// set default language for site if the culture is not supported
var languages = _languages.GetLanguages(alias.SiteId);
if (languages.Any() && languages.All(l => l.Code != CultureInfo.CurrentUICulture.Name))
{ {
var defaultLanguage = languages.Where(l => l.IsDefault).SingleOrDefault() ?? languages.First(); _state.Alias = alias;
SetLocalizationCookie(defaultLanguage.Code); // set default language for site if the culture is not supported
var languages = _languages.GetLanguages(alias.SiteId);
if (languages.Any() && languages.All(l => l.Code != CultureInfo.CurrentUICulture.Name))
{
var defaultLanguage = languages.Where(l => l.IsDefault).SingleOrDefault() ?? languages.First();
SetLocalizationCookie(defaultLanguage.Code);
}
else
{
SetLocalizationCookie(_localizationManager.GetDefaultCulture());
}
} }
else else
{ {
SetLocalizationCookie(_localizationManager.GetDefaultCulture()); Message = $"No Matching Alias For Host Name {hostname}";
} }
} }
} }