#17391 (#17413)

Fixes issue with the delivery api can find unpublished content

Author: bergmania

src/Umbraco.Core/Routing/NewDefaultUrlProvider.cs

@@ -177,7 +177,7 @@ private string GetLegacyRouteFormatById(Guid key, string? culture)
         UrlMode mode,
         string? culture)
     {
-        if (string.IsNullOrWhiteSpace(route))
+        if (string.IsNullOrWhiteSpace(route) || route.Equals("#"))
         {
             if (_logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Debug))
             {

src/Umbraco.Core/Services/DocumentUrlService.cs

@@ -426,21 +426,26 @@ public async Task DeleteUrlsFromCacheAsync(IEnumerable<Guid> documentKeysEnumera
 
     private bool IsContentPublished(Guid contentKey, string culture) => _publishStatusQueryService.IsDocumentPublished(contentKey, culture);
 
-    public string GetLegacyRouteFormat(Guid docuemntKey, string? culture, bool isDraft)
+    public string GetLegacyRouteFormat(Guid documentKey, string? culture, bool isDraft)
     {
-        Attempt<int> documentIdAttempt = _idKeyMap.GetIdForKey(docuemntKey, UmbracoObjectTypes.Document);
+        Attempt<int> documentIdAttempt = _idKeyMap.GetIdForKey(documentKey, UmbracoObjectTypes.Document);
 
         if(documentIdAttempt.Success is false)
         {
             return "#";
         }
 
-        if (_documentNavigationQueryService.TryGetAncestorsOrSelfKeys(docuemntKey,
+        if (_documentNavigationQueryService.TryGetAncestorsOrSelfKeys(documentKey,
                 out IEnumerable<Guid> ancestorsOrSelfKeys) is false)
         {
             return "#";
         }
 
+        if(isDraft is false && culture != null && _publishStatusQueryService.IsDocumentPublished(documentKey, culture) is false)
+        {
+            return "#";
+        }
+
         var cultureOrDefault = string.IsNullOrWhiteSpace(culture) is false ? culture : _languageService.GetDefaultIsoCodeAsync().GetAwaiter().GetResult();
 
         Guid[] ancestorsOrSelfKeysArray = ancestorsOrSelfKeys as Guid[] ?? ancestorsOrSelfKeys.ToArray();

src/Umbraco.PublishedCache.HybridCache/DocumentCache.cs

@@ -3,9 +3,9 @@
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
+using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Navigation;
-using Umbraco.Cms.Infrastructure.HybridCache.Services;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Infrastructure.HybridCache;
@@ -95,30 +95,31 @@ public IEnumerable<IPublishedContent> GetAtRoot(string? culture = null)
     public IEnumerable<IPublishedContent> GetByContentType(IPublishedContentType contentType)
         => _documentCacheService.GetByContentType(contentType);
 
-    [Obsolete("Use IDocumentUrlService.GetDocumentKeyByRoute instead, scheduled for removal in v17")]
+    [Obsolete("Use IPublishedUrlProvider.GetUrl instead, scheduled for removal in v17")]
     public IPublishedContent? GetByRoute(bool preview, string route, bool? hideTopLevelNode = null, string? culture = null)
     {
         IDocumentUrlService documentUrlService = StaticServiceProvider.Instance.GetRequiredService<IDocumentUrlService>();
         Guid? key = documentUrlService.GetDocumentKeyByRoute(route, culture, null, preview);
         return key is not null ? GetById(preview, key.Value) : null;
     }
 
-    [Obsolete("Use IDocumentUrlService.GetDocumentKeyByRoute instead, scheduled for removal in v17")]
+    [Obsolete("Use IPublishedUrlProvider.GetUrl instead, scheduled for removal in v17")]
     public IPublishedContent? GetByRoute(string route, bool? hideTopLevelNode = null, string? culture = null)
     {
         IDocumentUrlService documentUrlService = StaticServiceProvider.Instance.GetRequiredService<IDocumentUrlService>();
         Guid? key = documentUrlService.GetDocumentKeyByRoute(route, culture, null, false);
         return key is not null ? GetById(key.Value) : null;
     }
 
-    [Obsolete("Use IDocumentUrlService.GetDocumentKeyByRoute instead, scheduled for removal in v17")]
+    [Obsolete("Use IPublishedUrlProvider.GetUrl instead, scheduled for removal in v17")]
     public string? GetRouteById(bool preview, int contentId, string? culture = null)
     {
-        IDocumentUrlService documentUrlService = StaticServiceProvider.Instance.GetRequiredService<IDocumentUrlService>();
+        IPublishedUrlProvider publishedUrlProvider = StaticServiceProvider.Instance.GetRequiredService<IPublishedUrlProvider>();
         IPublishedContent? content = GetById(preview, contentId);
-        return content is not null ? documentUrlService.GetLegacyRouteFormat(content.Key, culture, preview) : null;
+
+        return content is not null ? publishedUrlProvider.GetUrl(content, UrlMode.Relative, culture) : null;
     }
 
-    [Obsolete("Use IDocumentUrlService.GetDocumentKeyByRoute instead, scheduled for removal in v17")]
+    [Obsolete("Use IPublishedUrlProvider.GetUrl instead, scheduled for removal in v17")]
     public string? GetRouteById(int contentId, string? culture = null) => GetRouteById(false, contentId, culture);
 }

src/Umbraco.PublishedCache.HybridCache/Services/DocumentCacheService.cs

@@ -270,11 +270,17 @@ public async Task RefreshContentAsync(IContent content)
 
         await _databaseCacheRepository.RefreshContentAsync(draftCacheNode, content.PublishedState);
 
-        if (content.PublishedState == PublishedState.Publishing)
+        if (content.PublishedState == PublishedState.Publishing || content.PublishedState == PublishedState.Unpublishing)
         {
             var publishedCacheNode = _cacheNodeFactory.ToContentCacheNode(content, false);
 
             await _databaseCacheRepository.RefreshContentAsync(publishedCacheNode, content.PublishedState);
+
+            if (content.PublishedState == PublishedState.Unpublishing)
+            {
+                await _hybridCache.RemoveAsync(GetCacheKey(publishedCacheNode.Key, false));
+            }
+
         }
 
         scope.Complete();

tests/Umbraco.Tests.Integration/Umbraco.PublishedCache.HybridCache/DocumentHybridCacheTests.cs

@@ -83,6 +83,19 @@ public async Task Can_Get_Draft_Of_Published_Content_By_Id()
         Assert.IsFalse(textPage.IsPublished());
     }
 
+    [Test]
+    public async Task Cannot_get_unpublished_content()
+    {
+        // Arrange
+        var unpublishAttempt = await ContentPublishingService.UnpublishAsync(PublishedTextPage.Key.Value, null, Constants.Security.SuperUserKey);
+
+        //Act
+        var textPage = await PublishedContentHybridCache.GetByIdAsync(PublishedTextPageId, false);
+
+        // Assert
+        Assert.IsNull(textPage);
+    }
+
     [Test]
     public async Task Can_Get_Draft_Of_Published_Content_By_Key()
     {