From e87196909ac67304a122d58df07a39ec445b1c56 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland73@gmail.com>
Date: Tue, 31 Jan 2023 09:46:45 +0100
Subject: [PATCH] Uses URL path separator when generating UDIs for files nested
 in folders. (#13689)

---
 .../Extensions/UdiGetterExtensions.cs         | 17 +++---
 .../Builders/PartialViewBuilder.cs            | 41 +++++++++++++++
 .../Builders/ScriptBuilder.cs                 | 33 ++++++++++++
 .../Builders/StylesheetBuilder.cs             |  2 +-
 .../Extensions/UdiGetterExtensionsTests.cs    | 52 +++++++++++++++++++
 5 files changed, 138 insertions(+), 7 deletions(-)
 create mode 100644 tests/Umbraco.Tests.Common/Builders/PartialViewBuilder.cs
 create mode 100644 tests/Umbraco.Tests.Common/Builders/ScriptBuilder.cs
 create mode 100644 tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs

diff --git a/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs b/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs
index 1ad94cbdc3..03ed07f2fe 100644
--- a/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs
+++ b/src/Umbraco.Core/Extensions/UdiGetterExtensions.cs
@@ -232,9 +232,7 @@ public static class UdiGetterExtensions
             throw new ArgumentNullException("entity");
         }
 
-        return new StringUdi(
-            Constants.UdiEntityType.Stylesheet,
-            entity.Path.TrimStart(Constants.CharArrays.ForwardSlash)).EnsureClosed();
+        return GetUdiFromPath(Constants.UdiEntityType.Stylesheet, entity.Path);
     }
 
     /// <summary>
@@ -249,8 +247,15 @@ public static class UdiGetterExtensions
             throw new ArgumentNullException("entity");
         }
 
-        return new StringUdi(Constants.UdiEntityType.Script, entity.Path.TrimStart(Constants.CharArrays.ForwardSlash))
-            .EnsureClosed();
+        return GetUdiFromPath(Constants.UdiEntityType.Script, entity.Path);
+    }
+
+    private static StringUdi GetUdiFromPath(string entityType, string path)
+    {
+        var id = path
+            .TrimStart(Constants.CharArrays.ForwardSlash)
+            .Replace("\\", "/");
+        return new StringUdi(entityType, id).EnsureClosed();
     }
 
     /// <summary>
@@ -300,7 +305,7 @@ public static class UdiGetterExtensions
             ? Constants.UdiEntityType.PartialViewMacro
             : Constants.UdiEntityType.PartialView;
 
-        return new StringUdi(entityType, entity.Path.TrimStart(Constants.CharArrays.ForwardSlash)).EnsureClosed();
+        return GetUdiFromPath(entityType, entity.Path);
     }
 
     /// <summary>
diff --git a/tests/Umbraco.Tests.Common/Builders/PartialViewBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PartialViewBuilder.cs
new file mode 100644
index 0000000000..ead5a4f189
--- /dev/null
+++ b/tests/Umbraco.Tests.Common/Builders/PartialViewBuilder.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using Umbraco.Cms.Core.Models;
+
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class PartialViewBuilder
+    : BuilderBase<IPartialView>
+{
+    private string _path;
+    private string _content;
+    private PartialViewType _viewType = PartialViewType.Unknown;
+
+    public PartialViewBuilder WithPath(string path)
+    {
+        _path = path;
+        return this;
+    }
+
+    public PartialViewBuilder WithContent(string content)
+    {
+        _content = content;
+        return this;
+    }
+
+    public PartialViewBuilder WithViewType(PartialViewType viewType)
+    {
+        _viewType = viewType;
+        return this;
+    }
+
+    public override IPartialView Build()
+    {
+        var path = _path ?? string.Empty;
+        var content = _content ?? string.Empty;
+        var viewType = _viewType;
+
+        return new PartialView(viewType, path) { Content = content };
+    }
+}
diff --git a/tests/Umbraco.Tests.Common/Builders/ScriptBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ScriptBuilder.cs
new file mode 100644
index 0000000000..9e521d0c0f
--- /dev/null
+++ b/tests/Umbraco.Tests.Common/Builders/ScriptBuilder.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using Umbraco.Cms.Core.Models;
+
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ScriptBuilder
+    : BuilderBase<Script>
+{
+    private string _path;
+    private string _content;
+
+    public ScriptBuilder WithPath(string path)
+    {
+        _path = path;
+        return this;
+    }
+
+    public ScriptBuilder WithContent(string content)
+    {
+        _content = content;
+        return this;
+    }
+
+    public override Script Build()
+    {
+        var path = _path ?? string.Empty;
+        var content = _content ?? string.Empty;
+
+        return new Script(path) { Content = content };
+    }
+}
diff --git a/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs b/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
index e7aafa443c..66389cc955 100644
--- a/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
@@ -8,8 +8,8 @@ namespace Umbraco.Cms.Tests.Common.Builders;
 public class StylesheetBuilder
     : BuilderBase<Stylesheet>
 {
-    private string _content;
     private string _path;
+    private string _content;
 
     public StylesheetBuilder WithPath(string path)
     {
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs
new file mode 100644
index 0000000000..cdda6f02f5
--- /dev/null
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UdiGetterExtensionsTests.cs
@@ -0,0 +1,52 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using NUnit.Framework;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Tests.Common.Builders;
+using Umbraco.Extensions;
+
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions;
+
+[TestFixture]
+public class UdiGetterExtensionsTests
+{
+    [TestCase("style.css", "umb://stylesheet/style.css")]
+    [TestCase("editor\\style.css", "umb://stylesheet/editor/style.css")]
+    [TestCase("editor/style.css", "umb://stylesheet/editor/style.css")]
+    public void GetUdiForStylesheet(string path, string expected)
+    {
+        var builder = new StylesheetBuilder();
+        var stylesheet = builder.WithPath(path).Build();
+        var result = stylesheet.GetUdi();
+        Assert.AreEqual(expected, result.ToString());
+    }
+
+    [TestCase("script.js", "umb://script/script.js")]
+    [TestCase("editor\\script.js", "umb://script/editor/script.js")]
+    [TestCase("editor/script.js", "umb://script/editor/script.js")]
+    public void GetUdiForScript(string path, string expected)
+    {
+        var builder = new ScriptBuilder();
+        var script = builder.WithPath(path).Build();
+        var result = script.GetUdi();
+        Assert.AreEqual(expected, result.ToString());
+    }
+
+    [TestCase("test.cshtml", PartialViewType.PartialView, "umb://partial-view/test.cshtml")]
+    [TestCase("editor\\test.cshtml", PartialViewType.PartialView, "umb://partial-view/editor/test.cshtml")]
+    [TestCase("editor/test.cshtml", PartialViewType.PartialView, "umb://partial-view/editor/test.cshtml")]
+    [TestCase("test.cshtml", PartialViewType.PartialViewMacro, "umb://partial-view-macro/test.cshtml")]
+    [TestCase("editor\\test.cshtml", PartialViewType.PartialViewMacro, "umb://partial-view-macro/editor/test.cshtml")]
+    [TestCase("editor/test.cshtml", PartialViewType.PartialViewMacro, "umb://partial-view-macro/editor/test.cshtml")]
+    public void GetUdiForPartialView(string path, PartialViewType viewType, string expected)
+    {
+        var builder = new PartialViewBuilder();
+        var partialView = builder
+            .WithPath(path)
+            .WithViewType(viewType)
+            .Build();
+        var result = partialView.GetUdi();
+        Assert.AreEqual(expected, result.ToString());
+    }
+}