Fixes issue with the IVirtualPageController not setting PublishedRequest content via FindContent (#15121)

* Fixes issue #12834

* Re-worked based on feedback

* Use dependency injection

* Only call new constructor

---------

Co-authored-by: Nikolaj Geisle <[email protected]>

Author: justin-nevitech

src/Umbraco.Web.Common/Routing/UmbracoVirtualPageRoute.cs

@@ -5,8 +5,10 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
+using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
+using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Cms.Web.Common.Extensions;
 
@@ -21,6 +23,7 @@ public class UmbracoVirtualPageRoute : IUmbracoVirtualPageRoute
     private readonly LinkParser _linkParser;
     private readonly UriUtility _uriUtility;
     private readonly IPublishedRouter _publishedRouter;
+    private readonly IUmbracoContextAccessor _umbracoContextAccessor;
 
     /// <summary>
     /// Constructor.
@@ -29,16 +32,29 @@ public class UmbracoVirtualPageRoute : IUmbracoVirtualPageRoute
     /// <param name="linkParser">The link parser.</param>
     /// <param name="uriUtility">The Uri utility.</param>
     /// <param name="publishedRouter">The published router.</param>
+    /// <param name="umbracoContextAccessor">The umbraco context accessor.</param>
     public UmbracoVirtualPageRoute(
         EndpointDataSource endpointDataSource,
         LinkParser linkParser,
         UriUtility uriUtility,
-        IPublishedRouter publishedRouter)
+        IPublishedRouter publishedRouter,
+        IUmbracoContextAccessor umbracoContextAccessor)
     {
         _endpointDataSource = endpointDataSource;
         _linkParser = linkParser;
         _uriUtility = uriUtility;
         _publishedRouter = publishedRouter;
+        _umbracoContextAccessor = umbracoContextAccessor;
+    }
+
+    [Obsolete("Please use constructor that takes an IUmbracoContextAccessor instead, scheduled for removal in v17")]
+    public UmbracoVirtualPageRoute(
+        EndpointDataSource endpointDataSource,
+        LinkParser linkParser,
+        UriUtility uriUtility,
+        IPublishedRouter publishedRouter)
+        : this(endpointDataSource, linkParser, uriUtility, publishedRouter, StaticServiceProvider.Instance.GetRequiredService<IUmbracoContextAccessor>())
+    {
     }
 
     /// <summary>
@@ -157,7 +173,8 @@ public async Task<IPublishedRequest> CreatePublishedRequest(HttpContext httpCont
         requestBuilder.SetPublishedContent(publishedContent);
         _publishedRouter.RouteDomain(requestBuilder);
 
-        return requestBuilder.Build();
+        // Ensure the culture and domain is set correctly for the published request
+        return await _publishedRouter.RouteRequestAsync(requestBuilder, new RouteRequestOptions(Core.Routing.RouteDirection.Inbound));
     }
 
     /// <summary>
@@ -171,6 +188,12 @@ public async Task SetRouteValues(HttpContext httpContext, IPublishedContent publ
     {
         IPublishedRequest publishedRequest = await CreatePublishedRequest(httpContext, publishedContent);
 
+        // Ensure the published request is set to the UmbracoContext
+        if (_umbracoContextAccessor.TryGetUmbracoContext(out IUmbracoContext? umbracoContext))
+        {
+            umbracoContext.PublishedRequest = publishedRequest;
+        }
+
         var umbracoRouteValues = new UmbracoRouteValues(
             publishedRequest,
             controllerActionDescriptor);