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

Use variant context for determining requested culture (#18176)

Browse Source
This commit is contained in:
Kenn Jacobsen
2025-01-31 11:34:25 +01:00
committed by GitHub
parent d4cfe4d99c
commit 147bdf22bf
9 changed files with 114 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Cms.Api.Delivery/Querying/QueryOptionBase.cs
View File

@@ -1,6 +1,7 @@
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Extensions;
@@ -10,8 +11,8 @@ public abstract class QueryOptionBase
{
private readonly IRequestRoutingService _requestRoutingService;
private readonly IRequestPreviewService _requestPreviewService;
private readonly IRequestCultureService _requestCultureService;
private readonly IApiDocumentUrlService _apiDocumentUrlService;
private readonly IVariationContextAccessor _variationContextAccessor;
[Obsolete("Please use the non-obsolete constructor. Will be removed in V17.")]
public QueryOptionBase(
@@ -20,8 +21,8 @@ public abstract class QueryOptionBase
: this(
requestRoutingService,
StaticServiceProvider.Instance.GetRequiredService<IRequestPreviewService>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestCultureService>(),
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>())
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(),
StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>())
{
}
@@ -31,21 +32,22 @@ public abstract class QueryOptionBase
IRequestRoutingService requestRoutingService,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService)
: this(requestRoutingService, requestPreviewService, requestCultureService, apiDocumentUrlService)
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor)
: this(requestRoutingService, requestPreviewService, apiDocumentUrlService, variationContextAccessor)
{
}
public QueryOptionBase(
IRequestRoutingService requestRoutingService,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService)
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor)
{
_requestRoutingService = requestRoutingService;
_requestPreviewService = requestPreviewService;
_requestCultureService = requestCultureService;
_apiDocumentUrlService = apiDocumentUrlService;
_variationContextAccessor = variationContextAccessor;
}
protected Guid? GetGuidFromQuery(string queryStringValue)
@@ -64,7 +66,7 @@ public abstract class QueryOptionBase
var contentRoute = _requestRoutingService.GetContentRoute(queryStringValue);
return _apiDocumentUrlService.GetDocumentKeyByRoute(
contentRoute,
_requestCultureService.GetRequestedCulture(),
_variationContextAccessor.VariationContext?.Culture,
_requestPreviewService.IsPreview());
}
}

20
src/Umbraco.Cms.Api.Delivery/Querying/Selectors/AncestorsSelector.cs
View File

@@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Api.Delivery.Indexing.Selectors;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Cms.Core.Services.Navigation;
@@ -20,10 +21,9 @@ public sealed class AncestorsSelector : QueryOptionBase, ISelectorHandler
IRequestPreviewService requestPreviewService)
: this(
requestRoutingService,
StaticServiceProvider.Instance.GetRequiredService<IPublishedContentCache>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestPreviewService>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestCultureService>(),
requestPreviewService,
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(),
StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>(),
navigationQueryService)
{
}
@@ -35,10 +35,9 @@ public sealed class AncestorsSelector : QueryOptionBase, ISelectorHandler
IDocumentNavigationQueryService navigationQueryService)
: this(
requestRoutingService,
StaticServiceProvider.Instance.GetRequiredService<IPublishedContentCache>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestPreviewService>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestCultureService>(),
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(),
StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>(),
navigationQueryService)
{
}
@@ -47,10 +46,9 @@ public sealed class AncestorsSelector : QueryOptionBase, ISelectorHandler
public AncestorsSelector(IPublishedContentCache publishedContentCache, IRequestRoutingService requestRoutingService)
: this(
requestRoutingService,
StaticServiceProvider.Instance.GetRequiredService<IPublishedContentCache>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestPreviewService>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestCultureService>(),
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(),
StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>(),
StaticServiceProvider.Instance.GetRequiredService<IDocumentNavigationQueryService>())
{
}
@@ -58,10 +56,10 @@ public sealed class AncestorsSelector : QueryOptionBase, ISelectorHandler
public AncestorsSelector(
IRequestRoutingService requestRoutingService,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor,
IDocumentNavigationQueryService navigationQueryService)
: base(requestRoutingService, requestPreviewService, requestCultureService, apiDocumentUrlService)
: base(requestRoutingService, requestPreviewService, apiDocumentUrlService, variationContextAccessor)
=> _navigationQueryService = navigationQueryService;
[Obsolete("Use the constructor that takes all parameters. Scheduled for removal in V17.")]
@@ -69,10 +67,10 @@ public sealed class AncestorsSelector : QueryOptionBase, ISelectorHandler
IRequestRoutingService requestRoutingService,
IPublishedContentCache publishedContentCache,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor,
IDocumentNavigationQueryService navigationQueryService)
: this(requestRoutingService, requestPreviewService, requestCultureService, apiDocumentUrlService, navigationQueryService)
: this(requestRoutingService, requestPreviewService, apiDocumentUrlService, variationContextAccessor, navigationQueryService)
{
}

17
src/Umbraco.Cms.Api.Delivery/Querying/Selectors/ChildrenSelector.cs
View File

@@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Api.Delivery.Indexing.Selectors;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Extensions;
@@ -16,8 +17,8 @@ public sealed class ChildrenSelector : QueryOptionBase, ISelectorHandler
: this(
requestRoutingService,
StaticServiceProvider.Instance.GetRequiredService<IRequestPreviewService>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestCultureService>(),
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>())
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(),
StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>())
{
}
@@ -26,18 +27,18 @@ public sealed class ChildrenSelector : QueryOptionBase, ISelectorHandler
IPublishedContentCache publishedContentCache,
IRequestRoutingService requestRoutingService,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService)
: this(requestRoutingService, requestPreviewService, requestCultureService, apiDocumentUrlService)
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor)
: this(requestRoutingService, requestPreviewService, apiDocumentUrlService, variationContextAccessor)
{
}
public ChildrenSelector(
IRequestRoutingService requestRoutingService,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService)
: base(requestRoutingService, requestPreviewService, requestCultureService, apiDocumentUrlService)
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor)
: base(requestRoutingService, requestPreviewService, apiDocumentUrlService, variationContextAccessor)
{
}

17
src/Umbraco.Cms.Api.Delivery/Querying/Selectors/DescendantsSelector.cs
View File

@@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Api.Delivery.Indexing.Selectors;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.DependencyInjection;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PublishedCache;
using Umbraco.Extensions;
@@ -16,8 +17,8 @@ public sealed class DescendantsSelector : QueryOptionBase, ISelectorHandler
: this(
requestRoutingService,
StaticServiceProvider.Instance.GetRequiredService<IRequestPreviewService>(),
StaticServiceProvider.Instance.GetRequiredService<IRequestCultureService>(),
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>())
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(),
StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>())
{
}
@@ -26,18 +27,18 @@ public sealed class DescendantsSelector : QueryOptionBase, ISelectorHandler
IPublishedContentCache publishedContentCache,
IRequestRoutingService requestRoutingService,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService)
: this(requestRoutingService, requestPreviewService, requestCultureService, apiDocumentUrlService)
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor)
: this(requestRoutingService, requestPreviewService, apiDocumentUrlService, variationContextAccessor)
{
}
public DescendantsSelector(
IRequestRoutingService requestRoutingService,
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IApiDocumentUrlService apiDocumentUrlService)
: base(requestRoutingService, requestPreviewService, requestCultureService, apiDocumentUrlService)
IApiDocumentUrlService apiDocumentUrlService,
IVariationContextAccessor variationContextAccessor)
: base(requestRoutingService, requestPreviewService, apiDocumentUrlService, variationContextAccessor)
{
}

24
src/Umbraco.Core/DeliveryApi/ApiPublishedContentCache.cs
View File

@@ -12,9 +12,9 @@ namespace Umbraco.Cms.Core.DeliveryApi;
public sealed class ApiPublishedContentCache : IApiPublishedContentCache
{
private readonly IRequestPreviewService _requestPreviewService;
private readonly IRequestCultureService _requestCultureService;
private readonly IApiDocumentUrlService _apiDocumentUrlService;
private readonly IPublishedContentCache _publishedContentCache;
private readonly IVariationContextAccessor _variationContextAccessor;
private DeliveryApiSettings _deliveryApiSettings;
[Obsolete("Use the non-obsolete constructor. Will be removed in V17.")]
@@ -24,7 +24,12 @@ public sealed class ApiPublishedContentCache : IApiPublishedContentCache
IOptionsMonitor<DeliveryApiSettings> deliveryApiSettings,
IDocumentUrlService documentUrlService,
IPublishedContentCache publishedContentCache)
: this(requestPreviewService, requestCultureService, deliveryApiSettings, StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(), publishedContentCache)
: this(
requestPreviewService,
deliveryApiSettings,
StaticServiceProvider.Instance.GetRequiredService<IApiDocumentUrlService>(),
publishedContentCache,
StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>())
{
}
@@ -35,22 +40,23 @@ public sealed class ApiPublishedContentCache : IApiPublishedContentCache
IOptionsMonitor<DeliveryApiSettings> deliveryApiSettings,
IDocumentUrlService documentUrlService,
IApiDocumentUrlService apiDocumentUrlService,
IPublishedContentCache publishedContentCache)
: this(requestPreviewService, requestCultureService, deliveryApiSettings, apiDocumentUrlService, publishedContentCache)
IPublishedContentCache publishedContentCache,
IVariationContextAccessor variationContextAccessor)
: this(requestPreviewService, deliveryApiSettings, apiDocumentUrlService, publishedContentCache, variationContextAccessor)
{
}
public ApiPublishedContentCache(
IRequestPreviewService requestPreviewService,
IRequestCultureService requestCultureService,
IOptionsMonitor<DeliveryApiSettings> deliveryApiSettings,
IApiDocumentUrlService apiDocumentUrlService,
IPublishedContentCache publishedContentCache)
IPublishedContentCache publishedContentCache,
IVariationContextAccessor variationContextAccessor)
{
_requestPreviewService = requestPreviewService;
_requestCultureService = requestCultureService;
_apiDocumentUrlService = apiDocumentUrlService;
_publishedContentCache = publishedContentCache;
_variationContextAccessor = variationContextAccessor;
_deliveryApiSettings = deliveryApiSettings.CurrentValue;
deliveryApiSettings.OnChange(settings => _deliveryApiSettings = settings);
}
@@ -61,7 +67,7 @@ public sealed class ApiPublishedContentCache : IApiPublishedContentCache
Guid? documentKey = _apiDocumentUrlService.GetDocumentKeyByRoute(
route,
_requestCultureService.GetRequestedCulture(),
_variationContextAccessor.VariationContext?.Culture,
_requestPreviewService.IsPreview());
IPublishedContent? content = documentKey.HasValue
@@ -77,7 +83,7 @@ public sealed class ApiPublishedContentCache : IApiPublishedContentCache
Guid? documentKey = _apiDocumentUrlService.GetDocumentKeyByRoute(
route,
_requestCultureService.GetRequestedCulture(),
_variationContextAccessor.VariationContext?.Culture,
_requestPreviewService.IsPreview());
IPublishedContent? content = documentKey.HasValue

62
tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/PublishedContentCacheTests.cs
View File

@@ -18,6 +18,8 @@ public class PublishedContentCacheTests : DeliveryApiTests
private readonly Guid _contentThreeId = Guid.Parse("013387EE-57AF-4ABD-B03C-F991B0722CCA");
private readonly Guid _contentFourId = Guid.Parse("76D02780-F7D9-49E9-B5C3-3B992ED98F59");
private IPublishedContentCache _contentCache;
private IDocumentUrlService _documentUrlService;
@@ -39,6 +41,11 @@ public class PublishedContentCacheTests : DeliveryApiTests
var contentThreeMock = new Mock<IPublishedContent>();
ConfigurePublishedContentMock(contentThreeMock, _contentThreeId, "Content Three", "content-three", contentTypeThreeMock.Object, Array.Empty<IPublishedProperty>());
var contentTypeFourMock = new Mock<IPublishedContentType>();
contentTypeFourMock.SetupGet(m => m.Alias).Returns("theFourthContentType");
var contentFourMock = new Mock<IPublishedContent>();
ConfigurePublishedContentMock(contentFourMock, _contentFourId, "Content Four", "content-four", contentTypeFourMock.Object, Array.Empty<IPublishedProperty>());
var documentUrlService = new Mock<IDocumentUrlService>();
documentUrlService
.Setup(x => x.GetDocumentKeyByRoute("/content-one", It.IsAny<string?>(), It.IsAny<int?>(), It.IsAny<bool>()))
@@ -49,6 +56,9 @@ public class PublishedContentCacheTests : DeliveryApiTests
documentUrlService
.Setup(x => x.GetDocumentKeyByRoute("/content-three", It.IsAny<string?>(), 1234, It.IsAny<bool>()))
.Returns(_contentThreeId);
documentUrlService
.Setup(x => x.GetDocumentKeyByRoute("/content-four", It.IsIn("en-US", "da-DK"), It.IsAny<int?>(), It.IsAny<bool>()))
.Returns(_contentFourId);
var contentCacheMock = new Mock<IPublishedContentCache>();
contentCacheMock
@@ -60,6 +70,9 @@ public class PublishedContentCacheTests : DeliveryApiTests
contentCacheMock
.Setup(m => m.GetById(It.IsAny<bool>(), _contentThreeId))
.Returns(contentThreeMock.Object);
contentCacheMock
.Setup(m => m.GetById(It.IsAny<bool>(), _contentFourId))
.Returns(contentFourMock.Object);
_contentCache = contentCacheMock.Object;
_documentUrlService = documentUrlService.Object;
@@ -68,7 +81,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
[Test]
public void PublishedContentCache_CanGetById()
{
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetById(_contentOneId);
Assert.IsNotNull(content);
Assert.AreEqual(_contentOneId, content.Key);
@@ -79,7 +92,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
[Test]
public void PublishedContentCache_CanGetByRoute()
{
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByRoute("/content-two");
Assert.IsNotNull(content);
Assert.AreEqual(_contentTwoId, content.Key);
@@ -90,7 +103,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
[Test]
public void PublishedContentCache_CanGetByRoute_WithStartNodeIdPrefix()
{
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByRoute("1234/content-three");
Assert.IsNotNull(content);
Assert.AreEqual(_contentThreeId, content.Key);
@@ -101,7 +114,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
[Test]
public void PublishedContentCache_CanGetByIds()
{
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByIds(new[] { _contentOneId, _contentTwoId }).ToArray();
Assert.AreEqual(2, content.Length);
Assert.AreEqual(_contentOneId, content.First().Key);
@@ -113,7 +126,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
public void PublishedContentCache_GetById_SupportsDenyList(bool denied)
{
var denyList = denied ? new[] { "theOtherContentType" } : null;
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetById(_contentTwoId);
if (denied)
@@ -131,7 +144,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
public void PublishedContentCache_GetByRoute_SupportsDenyList(bool denied)
{
var denyList = denied ? new[] { "theContentType" } : null;
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByRoute("/content-one");
if (denied)
@@ -149,7 +162,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
public void PublishedContentCache_GetByIds_SupportsDenyList(string deniedContentType)
{
var denyList = new[] { deniedContentType };
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByIds(new[] { _contentOneId, _contentTwoId }).ToArray();
Assert.AreEqual(1, content.Length);
@@ -167,7 +180,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
public void PublishedContentCache_GetById_CanRetrieveContentTypesOutsideTheDenyList()
{
var denyList = new[] { "theContentType" };
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetById(_contentTwoId);
Assert.IsNotNull(content);
Assert.AreEqual(_contentTwoId, content.Key);
@@ -179,7 +192,7 @@ public class PublishedContentCacheTests : DeliveryApiTests
public void PublishedContentCache_GetByRoute_CanRetrieveContentTypesOutsideTheDenyList()
{
var denyList = new[] { "theOtherContentType" };
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByRoute("/content-one");
Assert.IsNotNull(content);
Assert.AreEqual(_contentOneId, content.Key);
@@ -187,11 +200,32 @@ public class PublishedContentCacheTests : DeliveryApiTests
Assert.AreEqual("theContentType", content.ContentType.Alias);
}
[TestCase("en-US")]
[TestCase("da-DK")]
public void PublishedContentCache_GetByRoute_CanRetrieveForCulture(string culture)
{
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor(culture));
var content = publishedContentCache.GetByRoute("/content-four");
Assert.IsNotNull(content);
Assert.AreEqual(_contentFourId, content.Key);
Assert.AreEqual("content-four", content.UrlSegment);
Assert.AreEqual("theFourthContentType", content.ContentType.Alias);
}
[TestCase("de-DE")]
[TestCase(null)]
public void PublishedContentCache_GetByRoute_CannotRetrieveForMissingOrUnknownCulture(string? culture)
{
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor(culture));
var content = publishedContentCache.GetByRoute("/content-four");
Assert.IsNull(content);
}
[Test]
public void PublishedContentCache_GetByIds_CanDenyAllRequestedContent()
{
var denyList = new[] { "theContentType", "theOtherContentType" };
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByIds(new[] { _contentOneId, _contentTwoId }).ToArray();
Assert.IsEmpty(content);
}
@@ -200,15 +234,15 @@ public class PublishedContentCacheTests : DeliveryApiTests
public void PublishedContentCache_DenyListIsCaseInsensitive()
{
var denyList = new[] { "THEcontentTYPE" };
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateRequestCultureService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache);
var publishedContentCache = new ApiPublishedContentCache(CreateRequestPreviewService(), CreateDeliveryApiSettings(denyList), CreateApiDocumentUrlService(), _contentCache, CreateVariationContextAccessor());
var content = publishedContentCache.GetByRoute("/content-one");
Assert.IsNull(content);
}
private IRequestCultureService CreateRequestCultureService()
private IVariationContextAccessor CreateVariationContextAccessor(string? culture = null)
{
var mock = new Mock<IRequestCultureService>();
var mock = new Mock<IVariationContextAccessor>();
mock.SetupGet(m => m.VariationContext).Returns(new VariationContext(culture));
return mock.Object;
}

5
tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/Selectors/AncestorsSelectorTests.cs
View File

@@ -2,6 +2,7 @@
using NUnit.Framework;
using Umbraco.Cms.Api.Delivery.Querying.Selectors;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Services.Navigation;
@@ -47,8 +48,8 @@ public class AncestorsSelectorTests
var subject = new AncestorsSelector(
requestRoutingServiceMock.Object,
Mock.Of<IRequestPreviewService>(),
Mock.Of<IRequestCultureService>(),
new ApiDocumentUrlService(documentUrlServiceMock.Object),
Mock.Of<IVariationContextAccessor>(),
_documentNavigationQueryService);
var result = subject.BuildSelectorOption("ancestors:/some/where");
@@ -63,8 +64,8 @@ public class AncestorsSelectorTests
var subject = new AncestorsSelector(
Mock.Of<IRequestRoutingService>(),
Mock.Of<IRequestPreviewService>(),
Mock.Of<IRequestCultureService>(),
Mock.Of<IApiDocumentUrlService>(),
Mock.Of<IVariationContextAccessor>(),
_documentNavigationQueryService);
var result = subject.BuildSelectorOption($"ancestors:{_documentKey:D}");

9
tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/Selectors/ChildrenSelectorTests.cs
View File

@@ -2,6 +2,7 @@
using NUnit.Framework;
using Umbraco.Cms.Api.Delivery.Querying.Selectors;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Services;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.DeliveryApi.Selectors;
@@ -30,8 +31,8 @@ public class ChildrenSelectorTests
var subject = new ChildrenSelector(
requestRoutingServiceMock.Object,
Mock.Of<IRequestPreviewService>(),
Mock.Of<IRequestCultureService>(),
new ApiDocumentUrlService(documentUrlServiceMock.Object));
new ApiDocumentUrlService(documentUrlServiceMock.Object),
Mock.Of<IVariationContextAccessor>());
var result = subject.BuildSelectorOption("children:/some/where");
Assert.AreEqual(1, result.Values.Length);
@@ -46,8 +47,8 @@ public class ChildrenSelectorTests
var subject = new ChildrenSelector(
Mock.Of<IRequestRoutingService>(),
Mock.Of<IRequestPreviewService>(),
Mock.Of<IRequestCultureService>(),
Mock.Of<IApiDocumentUrlService>());
Mock.Of<IApiDocumentUrlService>(),
Mock.Of<IVariationContextAccessor>());
var result = subject.BuildSelectorOption($"children:{documentKey:D}");
Assert.AreEqual(1, result.Values.Length);

9
tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/Selectors/DescendantsSelectorTests.cs
View File

@@ -2,6 +2,7 @@
using NUnit.Framework;
using Umbraco.Cms.Api.Delivery.Querying.Selectors;
using Umbraco.Cms.Core.DeliveryApi;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Services;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.DeliveryApi.Selectors;
@@ -30,8 +31,8 @@ public class DescendantsSelectorTests
var subject = new DescendantsSelector(
requestRoutingServiceMock.Object,
Mock.Of<IRequestPreviewService>(),
Mock.Of<IRequestCultureService>(),
new ApiDocumentUrlService(documentUrlServiceMock.Object));
new ApiDocumentUrlService(documentUrlServiceMock.Object),
Mock.Of<IVariationContextAccessor>());
var result = subject.BuildSelectorOption("descendants:/some/where");
Assert.AreEqual(1, result.Values.Length);
@@ -46,8 +47,8 @@ public class DescendantsSelectorTests
var subject = new DescendantsSelector(
Mock.Of<IRequestRoutingService>(),
Mock.Of<IRequestPreviewService>(),
Mock.Of<IRequestCultureService>(),
Mock.Of<IApiDocumentUrlService>());
Mock.Of<IApiDocumentUrlService>(),
Mock.Of<IVariationContextAccessor>());
var result = subject.BuildSelectorOption($"descendants:{documentKey:D}");
Assert.AreEqual(1, result.Values.Length);