Add URL provider notation to UrlInfo

kjac · kjac · commit 28e920039027 · 2025-09-01T14:58:23.000+02:00
diff --git a/src/Umbraco.Cms.Api.Management/Factories/DocumentUrlFactory.cs b/src/Umbraco.Cms.Api.Management/Factories/DocumentUrlFactory.cs
@@ -49,6 +49,13 @@ public Task<IEnumerable<DocumentUrlInfoResponseModel>> CreatePreviewUrlSetsAsync
     private IEnumerable<DocumentUrlInfo> CreateDocumentUrlInfos(IEnumerable<UrlInfo> urlInfos)
         => urlInfos
             .Where(urlInfo => urlInfo.Url is not null)
-            .Select(urlInfo => new DocumentUrlInfo { Culture = urlInfo.Culture, Url = urlInfo.Url!.ToString(), Message = urlInfo.Message, IsExternal = urlInfo.IsExternal })
+            .Select(urlInfo => new DocumentUrlInfo
+            {
+                Culture = urlInfo.Culture,
+                Url = urlInfo.Url!.ToString(),
+                Message = urlInfo.Message,
+                IsExternal = urlInfo.IsExternal,
+                Provider = urlInfo.Provider,
+            })
             .ToArray();
 }
diff --git a/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentUrlInfo.cs b/src/Umbraco.Cms.Api.Management/ViewModels/Document/DocumentUrlInfo.cs
@@ -5,4 +5,6 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Document;
 public class DocumentUrlInfo : ContentUrlInfoBase
 {
     public required string? Message { get; init; }
+
+    public required string Provider { get; init; }
 }
diff --git a/src/Umbraco.Core/Constants-UrlProviders.cs b/src/Umbraco.Core/Constants-UrlProviders.cs
@@ -0,0 +1,9 @@
+namespace Umbraco.Cms.Core;
+
+public static partial class Constants
+{
+    public static class UrlProviders
+    {
+        public static string Default = "umbDefaultProvider";
+    }
+}
diff --git a/src/Umbraco.Core/Routing/AliasUrlProvider.cs b/src/Umbraco.Core/Routing/AliasUrlProvider.cs
@@ -121,7 +121,7 @@ public IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
             {
                 var path = "/" + alias;
                 var uri = new Uri(path, UriKind.Relative);
-                yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig));
+                yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig), Constants.UrlProviders.Default);
             }
         }
         else
@@ -153,7 +153,7 @@ public IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
                 {
                     var path = "/" + alias;
                     var uri = new Uri(CombinePaths(domainUri.Uri.GetLeftPart(UriPartial.Authority), path));
-                    yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig), domainUri.Culture);
+                    yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig), Constants.UrlProviders.Default, domainUri.Culture);
                 }
             }
         }
diff --git a/src/Umbraco.Core/Routing/DefaultMediaUrlProvider.cs b/src/Umbraco.Core/Routing/DefaultMediaUrlProvider.cs
@@ -39,7 +39,7 @@ public DefaultMediaUrlProvider(MediaUrlGeneratorCollection mediaPathGenerators,
         if (_mediaPathGenerators.TryGetMediaPath(propType?.EditorAlias, value, out var path))
         {
             Uri url = _urlAssembler.AssembleUrl(path!, current, mode);
-            return UrlInfo.FromUri(url, culture);
+            return UrlInfo.FromUri(url, Constants.UrlProviders.Default, culture);
         }
 
         return null;
diff --git a/src/Umbraco.Core/Routing/DefaultUrlProvider.cs b/src/Umbraco.Core/Routing/DefaultUrlProvider.cs
@@ -137,7 +137,7 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
 
             var uri = new Uri(CombinePaths(d.Uri.GetLeftPart(UriPartial.Path), path));
             uri = _uriUtility.UriFromUmbraco(uri, _requestSettings);
-            yield return UrlInfo.FromUri(uri, culture);
+            yield return UrlInfo.FromUri(uri, Constants.UrlProviders.Default, culture);
         }
     }
 
@@ -198,7 +198,7 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
             culture.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase))
         {
             Uri url = AssembleUrl(domainUri, path, current, mode);
-            return UrlInfo.FromUri(url, culture);
+            return UrlInfo.FromUri(url, Constants.UrlProviders.Default, culture);
         }
 
         return null;
diff --git a/src/Umbraco.Core/Routing/NewDefaultUrlProvider.cs b/src/Umbraco.Core/Routing/NewDefaultUrlProvider.cs
@@ -134,15 +134,15 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)
 
             var uri = new Uri(CombinePaths(d.Uri.GetLeftPart(UriPartial.Path), path));
             uri = _uriUtility.UriFromUmbraco(uri, _requestSettings);
-            yield return UrlInfo.FromUri(uri, culture);
+            yield return UrlInfo.FromUri(uri, Constants.UrlProviders.Default, culture);
         }
     }
 
     #region GetPreviewUrls
 
     /// <inheritdoc />
     public IEnumerable<UrlInfo> GetPreviewUrls(IContent content) => [
-        UrlInfo.AsUrl($"/{Constants.System.UmbracoPathSegment}/preview?id={content.Key}")
+        UrlInfo.AsUrl($"/{Constants.System.UmbracoPathSegment}/preview?id={content.Key}", Constants.UrlProviders.Default)
     ];
 
     #endregion
@@ -232,7 +232,7 @@ private string GetLegacyRouteFormatById(Guid key, string? culture)
             culture.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase))
         {
             Uri url = AssembleUrl(domainUri, path, current, mode);
-            return UrlInfo.FromUri(url, culture);
+            return UrlInfo.FromUri(url, Constants.UrlProviders.Default, culture);
         }
 
         return null;
diff --git a/src/Umbraco.Core/Routing/PublishedUrlInfoProvider.cs b/src/Umbraco.Core/Routing/PublishedUrlInfoProvider.cs
@@ -52,7 +52,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)
             // Handle "could not get URL"
             if (url is "#" or "#ex")
             {
-                urlInfos.Add(UrlInfo.AsMessage(_localizedTextService.Localize("content", "getUrlException"), culture));
+                urlInfos.Add(UrlInfo.AsMessage(_localizedTextService.Localize("content", "getUrlException"), Constants.UrlProviders.Default, culture));
                 continue;
             }
 
@@ -65,7 +65,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)
                 continue;
             }
 
-            urlInfos.Add(UrlInfo.AsUrl(url, culture));
+            urlInfos.Add(UrlInfo.AsUrl(url, Constants.UrlProviders.Default, culture));
         }
 
         // If the content is trashed, we can't get the other URLs, as we have no parent structure to navigate through.
@@ -105,7 +105,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)
                 _logger.LogDebug(logMsg, url, uri, culture);
             }
 
-            var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeErrorCannotRoute"), culture);
+            var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeErrorCannotRoute"), Constants.UrlProviders.Default, culture);
             return Attempt.Succeed(urlInfo);
         }
 
@@ -118,7 +118,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)
         {
             var collidingContent = publishedRequest.PublishedContent?.Key.ToString();
 
-            var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeError", [collidingContent]), culture);
+            var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeError", [collidingContent]), Constants.UrlProviders.Default, culture);
             return Attempt.Succeed(urlInfo);
         }
 
diff --git a/src/Umbraco.Core/Routing/UrlInfo.cs b/src/Umbraco.Core/Routing/UrlInfo.cs
@@ -12,9 +12,15 @@ public class UrlInfo : IEquatable<UrlInfo>
     /// <summary>
     ///     Initializes a new instance of the <see cref="UrlInfo" /> class.
     /// </summary>
-    public UrlInfo(Uri url, string? culture, string? message = null, bool isExternal = false)
+    public UrlInfo(Uri url, string provider, string? culture, string? message = null, bool isExternal = false)
     {
+        if (provider.IsNullOrWhiteSpace())
+        {
+            throw new ArgumentException("Value cannot be null or whitespace.", nameof(provider));
+        }
+
         Url = url;
+        Provider = provider;
         Culture = culture;
         Message = message;
         IsExternal = isExternal;
@@ -23,26 +29,32 @@ public UrlInfo(Uri url, string? culture, string? message = null, bool isExternal
     /// <summary>
     ///     Initializes a new instance of the <see cref="UrlInfo" /> class as a "message only" - that is, not an actual URL.
     /// </summary>
-    public UrlInfo(string message, string? culture = null)
+    public UrlInfo(string message, string provider, string? culture = null)
     {
         if (message.IsNullOrWhiteSpace())
         {
             throw new ArgumentException("Value cannot be null or whitespace.", nameof(message));
         }
 
+        if (provider.IsNullOrWhiteSpace())
+        {
+            throw new ArgumentException("Value cannot be null or whitespace.", nameof(provider));
+        }
+
         Url = null;
+        Provider = provider;
         Message = message;
         Culture = culture;
     }
 
-    public static UrlInfo AsUrl(string url, string? culture = null, bool isExternal = false)
-        => new(new Uri(url, UriKind.RelativeOrAbsolute), culture: culture, isExternal: isExternal);
+    public static UrlInfo AsUrl(string url, string provider, string? culture = null, bool isExternal = false)
+        => new(new Uri(url, UriKind.RelativeOrAbsolute), provider, culture: culture, isExternal: isExternal);
 
-    public static UrlInfo AsMessage(string message, string? culture = null)
-        => new(message, culture);
+    public static UrlInfo AsMessage(string message, string provider, string? culture = null)
+        => new(message, provider, culture: culture);
 
-    public static UrlInfo FromUri(Uri uri, string? culture = null, bool isExternal = false)
-        => new(uri, culture: culture, isExternal: isExternal);
+    public static UrlInfo FromUri(Uri uri, string provider, string? culture = null, bool isExternal = false)
+        => new(uri, provider, culture: culture, isExternal: isExternal);
 
     /// <summary>
     ///     Gets the culture.
@@ -56,6 +68,8 @@ public static UrlInfo FromUri(Uri uri, string? culture = null, bool isExternal =
     [DataMember(Name = "url")]
     public Uri? Url { get; }
 
+    public string Provider { get; }
+
     /// <summary>
     ///     Gets the message.
     /// </summary>
diff --git a/src/Umbraco.Core/Routing/UrlProviderExtensions.cs b/src/Umbraco.Core/Routing/UrlProviderExtensions.cs
@@ -50,7 +50,7 @@ public static async Task<IEnumerable<UrlInfo>> GetContentUrlsAsync(
 
         if (content.Published == false)
         {
-            result.Add(UrlInfo.AsMessage(textService.Localize("content", "itemNotPublished")));
+            result.Add(UrlInfo.AsMessage(textService.Localize("content", "itemNotPublished"), Constants.UrlProviders.Default));
             return result;
         }
 
@@ -155,7 +155,7 @@ private static async Task<IEnumerable<UrlInfo>> GetContentUrlsByCultureAsync(
 
                 // deal with exceptions
                 case "#ex":
-                    result.Add(UrlInfo.AsMessage(textService.Localize("content", "getUrlException"), culture));
+                    result.Add(UrlInfo.AsMessage(textService.Localize("content", "getUrlException"), Constants.UrlProviders.Default, culture));
                     break;
 
                 // got a URL, deal with collisions, add URL
@@ -168,7 +168,7 @@ private static async Task<IEnumerable<UrlInfo>> GetContentUrlsByCultureAsync(
                     }
                     else
                     {
-                        result.Add(UrlInfo.AsUrl(url, culture));
+                        result.Add(UrlInfo.AsUrl(url, Constants.UrlProviders.Default, culture));
                     }
 
                     break;
@@ -193,18 +193,19 @@ private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IC
         if (parent == null)
         {
             // oops, internal error
-            return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublishedAnomaly"), culture);
+            return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublishedAnomaly"), Constants.UrlProviders.Default, culture);
         }
 
         if (!parent.Published)
         {
             // totally not published
-            return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublished", new[] { parent.Name }), culture);
+            return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublished", new[] { parent.Name }), Constants.UrlProviders.Default, culture);
         }
 
         // culture not published
         return UrlInfo.AsMessage(
             textService.Localize("content", "parentCultureNotPublished", new[] { parent.Name }),
+            Constants.UrlProviders.Default,
             culture);
     }
 
@@ -242,7 +243,7 @@ private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IC
                 logger.LogDebug(logMsg, url, uri, culture);
             }
 
-            var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeErrorCannotRoute"), culture);
+            var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeErrorCannotRoute"), Constants.UrlProviders.Default, culture);
             return Attempt.Succeed(urlInfo);
         }
 
@@ -264,7 +265,7 @@ private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IC
             l.Reverse();
             var s = "/" + string.Join("/", l) + " (id=" + pcr.PublishedContent?.Id + ")";
 
-            var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeError", new[] { s }), culture);
+            var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeError", new[] { s }), Constants.UrlProviders.Default, culture);
             return Attempt.Succeed(urlInfo);
         }
 
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/PublishedUrlInfoProviderTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/PublishedUrlInfoProviderTests.cs
@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 
@@ -31,11 +32,13 @@ public async Task Two_items_in_level_1_with_same_name_will_have_conflicting_rout
         Assert.AreEqual(1, subPageUrls.Count);
         Assert.IsNotNull(subPageUrls.First().Url);
         Assert.AreEqual("/text-page-1/", subPageUrls.First().Url!.ToString());
+        Assert.AreEqual(Constants.UrlProviders.Default, subPageUrls.First().Provider);
         Assert.AreEqual(Subpage.Key, DocumentUrlService.GetDocumentKeyByRoute("/text-page-1/", "en-US", null, false));
 
         // Assert the url of child of second root is not exposed
         Assert.AreEqual(1, childOfSecondRootUrls.Count);
         Assert.IsNull(childOfSecondRootUrls.First().Url);
+        Assert.AreEqual(Constants.UrlProviders.Default, childOfSecondRootUrls.First().Provider);
 
         // Ensure the url without hide top level is not finding the child of second root
         Assert.AreNotEqual(childOfSecondRoot.Key, DocumentUrlService.GetDocumentKeyByRoute("/second-root/text-page-1/", "en-US", null, false));
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/PublishedUrlInfoProvider_hidetoplevel_false.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/PublishedUrlInfoProvider_hidetoplevel_false.cs
@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
@@ -37,9 +38,11 @@ public async Task Two_items_in_level_1_with_same_name_will_not_have_conflicting_
         Assert.AreEqual(1, subPageUrls.Count);
         Assert.IsNotNull(subPageUrls.First().Url);
         Assert.AreEqual("/textpage/text-page-1/", subPageUrls.First().Url!.ToString());
+        Assert.AreEqual(Constants.UrlProviders.Default, subPageUrls.First().Provider);
 
         Assert.AreEqual(1, childOfSecondRootUrls.Count);
         Assert.IsNotNull(childOfSecondRootUrls.First().Url);
         Assert.AreEqual("/second-root/text-page-1/", childOfSecondRootUrls.First().Url!.ToString());
+        Assert.AreEqual(Constants.UrlProviders.Default, childOfSecondRootUrls.First().Provider);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs
@@ -98,7 +98,7 @@ public void Ensure_Image_Sources()
                 It.IsAny<UrlMode>(),
                 It.IsAny<string>(),
                 It.IsAny<Uri>()))
-            .Returns(UrlInfo.AsUrl("/media/1001/my-image.jpg"));
+            .Returns(UrlInfo.AsUrl("/media/1001/my-image.jpg", "Test Provider"));
 
         var umbracoContextAccessor = new TestUmbracoContextAccessor();
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs
@@ -182,7 +182,7 @@ public void ParseLocalLinks(string input, string result)
                 It.IsAny<UrlMode>(),
                 It.IsAny<string>(),
                 It.IsAny<Uri>()))
-            .Returns(UrlInfo.AsUrl("/my-test-url"));
+            .Returns(UrlInfo.AsUrl("/my-test-url", "Test Provider"));
         var contentType = new PublishedContentType(
             Guid.NewGuid(),
             666,
@@ -212,7 +212,7 @@ public void ParseLocalLinks(string input, string result)
                 It.IsAny<UrlMode>(),
                 It.IsAny<string>(),
                 It.IsAny<Uri>()))
-            .Returns(UrlInfo.AsUrl("/media/1001/my-image.jpg"));
+            .Returns(UrlInfo.AsUrl("/media/1001/my-image.jpg", "Test Provider"));
 
         var umbracoContextAccessor = new TestUmbracoContextAccessor();
 

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@ namespace Umbraco.Cms.Api.Management.ViewModels.Document;`
`5`	`5`	`public class DocumentUrlInfo : ContentUrlInfoBase`
`6`	`6`	`{`
`7`	`7`	`public required string? Message { get; init; }`
	`8`	`+`
	`9`	`+ public required string Provider { get; init; }`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)`
`121`	`121`	`{`
`122`	`122`	`var path = "/" + alias;`
`123`	`123`	`var uri = new Uri(path, UriKind.Relative);`
`124`		`- yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig));`
	`124`	`+ yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig), Constants.UrlProviders.Default);`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`else`
`@@ -153,7 +153,7 @@ public IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)`
`153`	`153`	`{`
`154`	`154`	`var path = "/" + alias;`
`155`	`155`	`var uri = new Uri(CombinePaths(domainUri.Uri.GetLeftPart(UriPartial.Authority), path));`
`156`		`- yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig), domainUri.Culture);`
	`156`	`+ yield return UrlInfo.FromUri(_uriUtility.UriFromUmbraco(uri, _requestConfig), Constants.UrlProviders.Default, domainUri.Culture);`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public DefaultMediaUrlProvider(MediaUrlGeneratorCollection mediaPathGenerators,`
`39`	`39`	`if (_mediaPathGenerators.TryGetMediaPath(propType?.EditorAlias, value, out var path))`
`40`	`40`	`{`
`41`	`41`	`Uri url = _urlAssembler.AssembleUrl(path!, current, mode);`
`42`		`- return UrlInfo.FromUri(url, culture);`
	`42`	`+ return UrlInfo.FromUri(url, Constants.UrlProviders.Default, culture);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)`
`137`	`137`
`138`	`138`	`var uri = new Uri(CombinePaths(d.Uri.GetLeftPart(UriPartial.Path), path));`
`139`	`139`	`uri = _uriUtility.UriFromUmbraco(uri, _requestSettings);`
`140`		`- yield return UrlInfo.FromUri(uri, culture);`
	`140`	`+ yield return UrlInfo.FromUri(uri, Constants.UrlProviders.Default, culture);`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`@@ -198,7 +198,7 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)`
`198`	`198`	`culture.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase))`
`199`	`199`	`{`
`200`	`200`	`Uri url = AssembleUrl(domainUri, path, current, mode);`
`201`		`- return UrlInfo.FromUri(url, culture);`
	`201`	`+ return UrlInfo.FromUri(url, Constants.UrlProviders.Default, culture);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -134,15 +134,15 @@ public virtual IEnumerable<UrlInfo> GetOtherUrls(int id, Uri current)`
`134`	`134`
`135`	`135`	`var uri = new Uri(CombinePaths(d.Uri.GetLeftPart(UriPartial.Path), path));`
`136`	`136`	`uri = _uriUtility.UriFromUmbraco(uri, _requestSettings);`
`137`		`- yield return UrlInfo.FromUri(uri, culture);`
	`137`	`+ yield return UrlInfo.FromUri(uri, Constants.UrlProviders.Default, culture);`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`#region GetPreviewUrls`
`142`	`142`
`143`	`143`	`/// <inheritdoc />`
`144`	`144`	`public IEnumerable<UrlInfo> GetPreviewUrls(IContent content) => [`
`145`		`- UrlInfo.AsUrl($"/{Constants.System.UmbracoPathSegment}/preview?id={content.Key}")`
	`145`	`+ UrlInfo.AsUrl($"/{Constants.System.UmbracoPathSegment}/preview?id={content.Key}", Constants.UrlProviders.Default)`
`146`	`146`	`];`
`147`	`147`
`148`	`148`	`#endregion`
`@@ -232,7 +232,7 @@ private string GetLegacyRouteFormatById(Guid key, string? culture)`
`232`	`232`	`culture.Equals(defaultCulture, StringComparison.InvariantCultureIgnoreCase))`
`233`	`233`	`{`
`234`	`234`	`Uri url = AssembleUrl(domainUri, path, current, mode);`
`235`		`- return UrlInfo.FromUri(url, culture);`
	`235`	`+ return UrlInfo.FromUri(url, Constants.UrlProviders.Default, culture);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)`
`52`	`52`	`// Handle "could not get URL"`
`53`	`53`	`if (url is "#" or "#ex")`
`54`	`54`	`{`
`55`		`- urlInfos.Add(UrlInfo.AsMessage(_localizedTextService.Localize("content", "getUrlException"), culture));`
	`55`	`+ urlInfos.Add(UrlInfo.AsMessage(_localizedTextService.Localize("content", "getUrlException"), Constants.UrlProviders.Default, culture));`
`56`	`56`	`continue;`
`57`	`57`	`}`
`58`	`58`
`@@ -65,7 +65,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)`
`65`	`65`	`continue;`
`66`	`66`	`}`
`67`	`67`
`68`		`- urlInfos.Add(UrlInfo.AsUrl(url, culture));`
	`68`	`+ urlInfos.Add(UrlInfo.AsUrl(url, Constants.UrlProviders.Default, culture));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// If the content is trashed, we can't get the other URLs, as we have no parent structure to navigate through.`
`@@ -105,7 +105,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)`
`105`	`105`	`_logger.LogDebug(logMsg, url, uri, culture);`
`106`	`106`	`}`
`107`	`107`
`108`		`- var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeErrorCannotRoute"), culture);`
	`108`	`+ var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeErrorCannotRoute"), Constants.UrlProviders.Default, culture);`
`109`	`109`	`return Attempt.Succeed(urlInfo);`
`110`	`110`	`}`
`111`	`111`
`@@ -118,7 +118,7 @@ public async Task<ISet<UrlInfo>> GetAllAsync(IContent content)`
`118`	`118`	`{`
`119`	`119`	`var collidingContent = publishedRequest.PublishedContent?.Key.ToString();`
`120`	`120`
`121`		`- var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeError", [collidingContent]), culture);`
	`121`	`+ var urlInfo = UrlInfo.AsMessage(_localizedTextService.Localize("content", "routeError", [collidingContent]), Constants.UrlProviders.Default, culture);`
`122`	`122`	`return Attempt.Succeed(urlInfo);`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static async Task<IEnumerable<UrlInfo>> GetContentUrlsAsync(`
`50`	`50`
`51`	`51`	`if (content.Published == false)`
`52`	`52`	`{`
`53`		`- result.Add(UrlInfo.AsMessage(textService.Localize("content", "itemNotPublished")));`
	`53`	`+ result.Add(UrlInfo.AsMessage(textService.Localize("content", "itemNotPublished"), Constants.UrlProviders.Default));`
`54`	`54`	`return result;`
`55`	`55`	`}`
`56`	`56`
`@@ -155,7 +155,7 @@ private static async Task<IEnumerable<UrlInfo>> GetContentUrlsByCultureAsync(`
`155`	`155`
`156`	`156`	`// deal with exceptions`
`157`	`157`	`case "#ex":`
`158`		`- result.Add(UrlInfo.AsMessage(textService.Localize("content", "getUrlException"), culture));`
	`158`	`+ result.Add(UrlInfo.AsMessage(textService.Localize("content", "getUrlException"), Constants.UrlProviders.Default, culture));`
`159`	`159`	`break;`
`160`	`160`
`161`	`161`	`// got a URL, deal with collisions, add URL`
`@@ -168,7 +168,7 @@ private static async Task<IEnumerable<UrlInfo>> GetContentUrlsByCultureAsync(`
`168`	`168`	`}`
`169`	`169`	`else`
`170`	`170`	`{`
`171`		`- result.Add(UrlInfo.AsUrl(url, culture));`
	`171`	`+ result.Add(UrlInfo.AsUrl(url, Constants.UrlProviders.Default, culture));`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`break;`
`@@ -193,18 +193,19 @@ private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IC`
`193`	`193`	`if (parent == null)`
`194`	`194`	`{`
`195`	`195`	`// oops, internal error`
`196`		`- return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublishedAnomaly"), culture);`
	`196`	`+ return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublishedAnomaly"), Constants.UrlProviders.Default, culture);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`if (!parent.Published)`
`200`	`200`	`{`
`201`	`201`	`// totally not published`
`202`		`- return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublished", new[] { parent.Name }), culture);`
	`202`	`+ return UrlInfo.AsMessage(textService.Localize("content", "parentNotPublished", new[] { parent.Name }), Constants.UrlProviders.Default, culture);`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`// culture not published`
`206`	`206`	`return UrlInfo.AsMessage(`
`207`	`207`	`textService.Localize("content", "parentCultureNotPublished", new[] { parent.Name }),`
	`208`	`+ Constants.UrlProviders.Default,`
`208`	`209`	`culture);`
`209`	`210`	`}`
`210`	`211`
`@@ -242,7 +243,7 @@ private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IC`
`242`	`243`	`logger.LogDebug(logMsg, url, uri, culture);`
`243`	`244`	`}`
`244`	`245`
`245`		`- var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeErrorCannotRoute"), culture);`
	`246`	`+ var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeErrorCannotRoute"), Constants.UrlProviders.Default, culture);`
`246`	`247`	`return Attempt.Succeed(urlInfo);`
`247`	`248`	`}`
`248`	`249`
`@@ -264,7 +265,7 @@ private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IC`
`264`	`265`	`l.Reverse();`
`265`	`266`	`var s = "/" + string.Join("/", l) + " (id=" + pcr.PublishedContent?.Id + ")";`
`266`	`267`
`267`		`- var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeError", new[] { s }), culture);`
	`268`	`+ var urlInfo = UrlInfo.AsMessage(textService.Localize("content", "routeError", new[] { s }), Constants.UrlProviders.Default, culture);`
`268`	`269`	`return Attempt.Succeed(urlInfo);`
`269`	`270`	`}`
`270`	`271`