45036f54dd
* Add sort order to IDomain, UmbracoDomain and DomainDto * Add migration to create domain sort order column * Add Sort method to domain service * Set sort order when persisting new domain and order results * Add multiple and block style support to umb-button-group * Allow sorting domains in back-office, improve UI and rewrite PostSaveLanguageAndDomains for correctly sorting domains * Ensure routing and cache keeps the domain sort order * Update test to assert correct domain order * Move migration to target 11.3 and cleanup plan * Fix formatting/styling and make SelectDomains private Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> --------- Co-authored-by: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
389 lines
16 KiB
C#
389 lines
16 KiB
C#
// Copyright (c) Umbraco.
|
|
// See LICENSE for more details.
|
|
|
|
using System;
|
|
using System.Linq;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Routing;
|
|
|
|
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
|
|
|
|
[TestFixture]
|
|
public class SiteDomainMapperTests
|
|
{
|
|
private SiteDomainMapper CreateSut() => new();
|
|
|
|
private static readonly string s_cultureFr = "fr-fr";
|
|
private static readonly string s_cultureGb = "en-gb";
|
|
|
|
[Test]
|
|
public void AddSites()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
|
|
|
|
var sites = siteDomainMapper.Sites;
|
|
|
|
Assert.AreEqual(2, sites.Count);
|
|
|
|
Assert.Contains("site1", sites.Keys);
|
|
Assert.Contains("site2", sites.Keys);
|
|
|
|
var domains = sites["site1"];
|
|
Assert.AreEqual(3, domains.Length);
|
|
Assert.Contains("domain1.com", domains);
|
|
Assert.Contains("domain1.net", domains);
|
|
Assert.Contains("domain1.org", domains);
|
|
|
|
domains = sites["site2"];
|
|
Assert.AreEqual(3, domains.Length);
|
|
Assert.Contains("domain2.com", domains);
|
|
Assert.Contains("domain2.net", domains);
|
|
Assert.Contains("domain2.org", domains);
|
|
}
|
|
|
|
[TestCase("foo")] // that one is suspect
|
|
[TestCase("domain.com")]
|
|
[TestCase("domain.com/")]
|
|
[TestCase("domain.com:12")]
|
|
[TestCase("domain.com:12/")]
|
|
[TestCase("http://www.domain.com")]
|
|
[TestCase("http://www.domain.com:12")]
|
|
[TestCase("http://www.domain.com:12/")]
|
|
[TestCase("https://foo.www.domain.com")]
|
|
[TestCase("https://foo.www.domain.com:5478/")]
|
|
public void AddValidSite(string domain)
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", domain);
|
|
}
|
|
|
|
[TestCase("domain.com/foo")]
|
|
[TestCase("http:/domain.com")]
|
|
[TestCase("*")]
|
|
public void AddInvalidSite(string domain)
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
Assert.Throws<ArgumentOutOfRangeException>(() => siteDomainMapper.AddSite("site1", domain));
|
|
}
|
|
|
|
[Test]
|
|
public void AddRemoveSites()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
|
|
|
|
var sites = siteDomainMapper.Sites;
|
|
|
|
siteDomainMapper.RemoveSite("site1");
|
|
siteDomainMapper.RemoveSite("site3");
|
|
|
|
Assert.AreEqual(1, sites.Count);
|
|
|
|
Assert.Contains("site2", sites.Keys);
|
|
}
|
|
|
|
[Test]
|
|
public void AddSiteAgain()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site1", "domain2.com", "domain1.net");
|
|
|
|
var sites = siteDomainMapper.Sites;
|
|
|
|
Assert.AreEqual(1, sites.Count);
|
|
|
|
Assert.Contains("site1", sites.Keys);
|
|
|
|
var domains = sites["site1"];
|
|
Assert.AreEqual(2, domains.Count());
|
|
Assert.Contains("domain2.com", domains);
|
|
Assert.Contains("domain1.net", domains);
|
|
}
|
|
|
|
[Test]
|
|
public void BindSitesOnce()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
|
|
siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
|
|
siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
|
|
|
|
siteDomainMapper.BindSites("site1", "site2");
|
|
|
|
var bindings = siteDomainMapper.Bindings;
|
|
|
|
Assert.AreEqual(2, bindings.Count);
|
|
Assert.Contains("site1", bindings.Keys);
|
|
Assert.Contains("site2", bindings.Keys);
|
|
|
|
var others = bindings["site1"];
|
|
Assert.AreEqual(1, others.Count);
|
|
Assert.Contains("site2", others);
|
|
|
|
others = bindings["site2"];
|
|
Assert.AreEqual(1, others.Count);
|
|
Assert.Contains("site1", others);
|
|
}
|
|
|
|
[Test]
|
|
public void BindMoreSites()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
|
|
siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
|
|
siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
|
|
|
|
siteDomainMapper.BindSites("site1", "site2");
|
|
siteDomainMapper.BindSites("site1", "site3");
|
|
|
|
var bindings = siteDomainMapper.Bindings;
|
|
|
|
Assert.AreEqual(3, bindings.Count);
|
|
Assert.Contains("site1", bindings.Keys);
|
|
Assert.Contains("site2", bindings.Keys);
|
|
Assert.Contains("site3", bindings.Keys);
|
|
|
|
var others = bindings["site1"];
|
|
Assert.AreEqual(2, others.Count);
|
|
Assert.Contains("site2", others);
|
|
Assert.Contains("site3", others);
|
|
|
|
others = bindings["site2"];
|
|
Assert.AreEqual(2, others.Count);
|
|
Assert.Contains("site1", others);
|
|
Assert.Contains("site3", others);
|
|
|
|
others = bindings["site3"];
|
|
Assert.AreEqual(2, others.Count);
|
|
Assert.Contains("site1", others);
|
|
Assert.Contains("site2", others);
|
|
}
|
|
|
|
private DomainAndUri[] DomainAndUris(Uri current, Domain[] domains) =>
|
|
domains
|
|
.Where(d => d.IsWildcard == false)
|
|
.Select(d => new DomainAndUri(d, current))
|
|
.OrderByDescending(d => d.Uri.ToString())
|
|
.ToArray();
|
|
|
|
[Test]
|
|
public void MapDomainWithScheme()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
|
|
siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
|
|
siteDomainMapper.AddSite("site4", "https://domain4.com", "https://domain4.net", "https://domain4.org");
|
|
|
|
var current = new Uri("https://domain1.com/foo/bar");
|
|
Domain[] domains =
|
|
{
|
|
new Domain(1, "domain2.com", -1, s_cultureFr, false, 0),
|
|
new Domain(1, "domain1.com", -1, s_cultureGb, false, 1),
|
|
};
|
|
var domainAndUris = DomainAndUris(current, domains);
|
|
var output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
|
|
Assert.AreEqual("https://domain1.com/", output);
|
|
|
|
// will pick it all right
|
|
current = new Uri("https://domain1.com/foo/bar");
|
|
domains = new[]
|
|
{
|
|
new Domain(1, "https://domain1.com", -1, s_cultureFr, false, 0),
|
|
new Domain(1, "https://domain2.com", -1, s_cultureGb, false, 1),
|
|
};
|
|
domainAndUris = DomainAndUris(current, domains);
|
|
output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
|
|
Assert.AreEqual("https://domain1.com/", output);
|
|
|
|
current = new Uri("https://domain1.com/foo/bar");
|
|
domains = new[]
|
|
{
|
|
new Domain(1, "https://domain1.com", -1, s_cultureFr, false, 0),
|
|
new Domain(1, "https://domain4.com", -1, s_cultureGb, false, 1),
|
|
};
|
|
domainAndUris = DomainAndUris(current, domains);
|
|
output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
|
|
Assert.AreEqual("https://domain1.com/", output);
|
|
|
|
current = new Uri("https://domain4.com/foo/bar");
|
|
domains = new[]
|
|
{
|
|
new Domain(1, "https://domain1.com", -1, s_cultureFr, false, 0),
|
|
new Domain(1, "https://domain4.com", -1, s_cultureGb, false, 1),
|
|
};
|
|
domainAndUris = DomainAndUris(current, domains);
|
|
output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
|
|
Assert.AreEqual("https://domain4.com/", output);
|
|
}
|
|
|
|
[Test]
|
|
public void MapDomain()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
|
|
siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
|
|
siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
|
|
|
|
// current is a site1 uri, domains contain current
|
|
// so we'll get current
|
|
var current = new Uri("http://domain1.com/foo/bar");
|
|
var output = siteDomainMapper.MapDomain(
|
|
new[]
|
|
{
|
|
new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false, 0), current),
|
|
new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false, 1), current),
|
|
},
|
|
current,
|
|
s_cultureFr,
|
|
s_cultureFr).Uri.ToString();
|
|
Assert.AreEqual("http://domain1.com/", output);
|
|
|
|
// current is a site1 uri, domains do not contain current
|
|
// so we'll get the corresponding site1 domain
|
|
current = new Uri("http://domain1.com/foo/bar");
|
|
output = siteDomainMapper.MapDomain(
|
|
new[]
|
|
{
|
|
new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false, 0), current),
|
|
new DomainAndUri(new Domain(1, "domain2.net", -1, s_cultureGb, false, 1), current),
|
|
},
|
|
current,
|
|
s_cultureFr,
|
|
s_cultureFr).Uri.ToString();
|
|
Assert.AreEqual("http://domain1.net/", output);
|
|
|
|
// current is a site1 uri, domains do not contain current
|
|
// so we'll get the corresponding site1 domain
|
|
// order does not matter
|
|
current = new Uri("http://domain1.com/foo/bar");
|
|
output = siteDomainMapper.MapDomain(
|
|
new[]
|
|
{
|
|
new DomainAndUri(new Domain(1, "domain2.net", -1, s_cultureFr, false, 0), current),
|
|
new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureGb, false, 1), current),
|
|
},
|
|
current,
|
|
s_cultureFr,
|
|
s_cultureFr).Uri.ToString();
|
|
Assert.AreEqual("http://domain1.net/", output);
|
|
}
|
|
|
|
[Test]
|
|
public void MapDomains()
|
|
{
|
|
var siteDomainMapper = CreateSut();
|
|
|
|
siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
|
|
siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
|
|
siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
|
|
siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
|
|
|
|
// the rule is:
|
|
// - exclude the current domain
|
|
// - exclude what MapDomain would return
|
|
// - return all domains from same site, or bound sites
|
|
|
|
// current is a site1 uri, domains contains current
|
|
var current = new Uri("http://domain1.com/foo/bar");
|
|
var output = siteDomainMapper.MapDomains(
|
|
new[]
|
|
{
|
|
new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false, 0), current), // no: current + what MapDomain would pick
|
|
new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false, 1), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false, 2), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false, 3), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false, 4), current), // yes: same site (though bogus setup)
|
|
},
|
|
current,
|
|
true,
|
|
s_cultureFr,
|
|
s_cultureFr).ToArray();
|
|
|
|
Assert.AreEqual(1, output.Length);
|
|
Assert.AreEqual("http://domain1.org/", output[0].Uri.ToString());
|
|
|
|
// current is a site1 uri, domains does not contain current
|
|
current = new Uri("http://domain1.com/foo/bar");
|
|
output = siteDomainMapper.MapDomains(
|
|
new[]
|
|
{
|
|
new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false, 0), current), // no: what MapDomain would pick
|
|
new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false, 1), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false, 2), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false, 3), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false, 4), current), // yes: same site (though bogus setup)
|
|
},
|
|
current,
|
|
true,
|
|
s_cultureFr,
|
|
s_cultureFr).ToArray();
|
|
|
|
Assert.AreEqual(1, output.Length);
|
|
Assert.AreEqual("http://domain1.org/", output[0].Uri.ToString());
|
|
|
|
siteDomainMapper.BindSites("site1", "site3");
|
|
siteDomainMapper.BindSites("site2", "site4");
|
|
|
|
// current is a site1 uri, domains contains current
|
|
current = new Uri("http://domain1.com/foo/bar");
|
|
output = siteDomainMapper.MapDomains(
|
|
new[]
|
|
{
|
|
new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false, 0), current), // no: current + what MapDomain would pick
|
|
new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false, 1), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false, 2), current), // yes: bound site
|
|
new DomainAndUri(new Domain(1, "domain3.org", -1, s_cultureGb, false, 3), current), // yes: bound site
|
|
new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false, 4), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false, 5), current), // yes: same site (though bogus setup)
|
|
},
|
|
current,
|
|
true,
|
|
s_cultureFr,
|
|
s_cultureFr).ToArray();
|
|
|
|
Assert.AreEqual(3, output.Length);
|
|
Assert.AreEqual("http://domain3.com/", output[0].Uri.ToString());
|
|
Assert.AreEqual("http://domain3.org/", output[1].Uri.ToString());
|
|
Assert.AreEqual("http://domain1.org/", output[2].Uri.ToString());
|
|
|
|
// current is a site1 uri, domains does not contain current
|
|
current = new Uri("http://domain1.com/foo/bar");
|
|
output = siteDomainMapper.MapDomains(
|
|
new[]
|
|
{
|
|
new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false, 0), current), // no: what MapDomain would pick
|
|
new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false, 1), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false, 2), current), // yes: bound site
|
|
new DomainAndUri(new Domain(1, "domain3.org", -1, s_cultureGb, false, 3), current), // yes: bound site
|
|
new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false, 4), current), // no: not same site
|
|
new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false, 5), current), // yes: same site (though bogus setup)
|
|
},
|
|
current,
|
|
true,
|
|
s_cultureFr,
|
|
s_cultureFr).ToArray();
|
|
|
|
Assert.AreEqual(3, output.Length);
|
|
Assert.AreEqual("http://domain3.com/", output[0].Uri.ToString());
|
|
Assert.AreEqual("http://domain3.org/", output[1].Uri.ToString());
|
|
Assert.AreEqual("http://domain1.org/", output[2].Uri.ToString());
|
|
}
|
|
}
|