yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use only the current uri to determine the domain when an culture is specified

Browse Source
This commit is contained in:
Vitor Rodrigues
2021-09-03 15:45:59 +02:00
parent 8a4bf8c0b8
commit 03072ffcd8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Core/Routing/DomainUtilities.cs
View File

@@ -190,7 +190,7 @@ namespace Umbraco.Cms.Core.Routing
}
// look for domains that would be the base of the uri
var baseDomains = SelectByBase(considerForBaseDomains, uri);
var baseDomains = SelectByBase(considerForBaseDomains, uri, culture);
if (baseDomains.Count > 0) // found, return
return baseDomains.First();
@@ -208,12 +208,15 @@ namespace Umbraco.Cms.Core.Routing
private static bool IsBaseOf(DomainAndUri domain, Uri uri)
=> domain.Uri.EndPathWithSlash().IsBaseOf(uri);
private static IReadOnlyCollection<DomainAndUri> SelectByBase(IReadOnlyCollection<DomainAndUri> domainsAndUris, Uri uri)
private static bool MatchesCulture(DomainAndUri domain, string culture)
=> culture == null || domain.Culture == culture;
private static IReadOnlyCollection<DomainAndUri> SelectByBase(IReadOnlyCollection<DomainAndUri> domainsAndUris, Uri uri, string culture)
{
// look for domains that would be the base of the uri
// ie current is www.example.com/foo/bar, look for domain www.example.com
var currentWithSlash = uri.EndPathWithSlash();
var baseDomains = domainsAndUris.Where(d => IsBaseOf(d, currentWithSlash)).ToList();
var baseDomains = domainsAndUris.Where(d => IsBaseOf(d, currentWithSlash) && MatchesCulture(d, culture)).ToList();
// if none matches, try again without the port
// ie current is www.example.com:1234/foo/bar, look for domain www.example.com