From 57b3a196bf920e380b274746fbb4c17f10a55b30 Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:46:31 +0100
Subject: [PATCH] V10: Pass in variation context to published cache (#15563)

* Make sure that we always have variation context

* Fix references
---
 .../PublishedCache/PublishedCacheBase.cs      | 22 ++++++++++++++++---
 .../ContentCache.cs                           |  2 +-
 .../MediaCache.cs                             |  2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs b/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs
index 3e961ce434..ffb2ef4278 100644
--- a/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs
+++ b/src/Umbraco.Core/PublishedCache/PublishedCacheBase.cs
@@ -1,6 +1,8 @@
 using System.Xml.XPath;
+using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Xml;
+using Umbraco.Cms.Web.Common.DependencyInjection;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.PublishedCache;
@@ -9,10 +11,24 @@ public abstract class PublishedCacheBase : IPublishedCache
 {
     private readonly IVariationContextAccessor? _variationContextAccessor;
 
-    public PublishedCacheBase(IVariationContextAccessor variationContextAccessor) => _variationContextAccessor =
-        variationContextAccessor ?? throw new ArgumentNullException(nameof(variationContextAccessor));
 
-    protected PublishedCacheBase(bool previewDefault) => PreviewDefault = previewDefault;
+    [Obsolete("Use ctor with all parameters. This will be removed in V15")]
+    public PublishedCacheBase(IVariationContextAccessor variationContextAccessor)
+        : this(variationContextAccessor, false)
+    {
+    }
+
+    [Obsolete("Use ctor with all parameters. This will be removed in V15")]
+    protected PublishedCacheBase(bool previewDefault)
+        : this(StaticServiceProvider.Instance.GetRequiredService<IVariationContextAccessor>(), previewDefault)
+    {
+    }
+
+    public PublishedCacheBase(IVariationContextAccessor variationContextAccessor, bool previewDefault)
+    {
+        _variationContextAccessor = variationContextAccessor;
+        PreviewDefault = previewDefault;
+    }
 
     public bool PreviewDefault { get; }
 
diff --git a/src/Umbraco.PublishedCache.NuCache/ContentCache.cs b/src/Umbraco.PublishedCache.NuCache/ContentCache.cs
index d8a5c0bc04..1686f6aacf 100644
--- a/src/Umbraco.PublishedCache.NuCache/ContentCache.cs
+++ b/src/Umbraco.PublishedCache.NuCache/ContentCache.cs
@@ -36,7 +36,7 @@ public class ContentCache : PublishedCacheBase, IPublishedContentCache, INavigab
         IDomainCache domainCache,
         IOptions<GlobalSettings> globalSettings,
         IVariationContextAccessor variationContextAccessor)
-        : base(previewDefault)
+        : base(variationContextAccessor, previewDefault)
     {
         _snapshot = snapshot;
         _snapshotCache = snapshotCache;
diff --git a/src/Umbraco.PublishedCache.NuCache/MediaCache.cs b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs
index 626e2fe36c..68c23c5a34 100644
--- a/src/Umbraco.PublishedCache.NuCache/MediaCache.cs
+++ b/src/Umbraco.PublishedCache.NuCache/MediaCache.cs
@@ -17,7 +17,7 @@ public class MediaCache : PublishedCacheBase, IPublishedMediaCache, INavigableDa
     #region Constructors
 
     public MediaCache(bool previewDefault, ContentStore.Snapshot snapshot, IVariationContextAccessor variationContextAccessor)
-        : base(previewDefault)
+        : base(variationContextAccessor, previewDefault)
     {
         _snapshot = snapshot;
         _variationContextAccessor = variationContextAccessor;