From e8197cacd53f31201341e6b2457fed3ede5cf6e8 Mon Sep 17 00:00:00 2001
From: Doug Slater <doug@slater.dev>
Date: Tue, 17 Jun 2025 21:57:32 -0400
Subject: [PATCH] Bugfix: Handle url-encoded URLs

---
 BrowseRouter/Infrastructure/AssemblyInfo.cs   |  2 +-
 BrowseRouter/Model/UriFactory.cs              |  6 ++--
 Directory.Build.props                         |  2 +-
 .../Model/UriFactoryTests.cs                  | 33 +++++++++++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 Tests/BrowseRouter.Tests/Model/UriFactoryTests.cs

diff --git a/BrowseRouter/Infrastructure/AssemblyInfo.cs b/BrowseRouter/Infrastructure/AssemblyInfo.cs
index c3d40b9..d1eea1d 100644
--- a/BrowseRouter/Infrastructure/AssemblyInfo.cs
+++ b/BrowseRouter/Infrastructure/AssemblyInfo.cs
@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("BrowserRouter.Tests")]
+[assembly: InternalsVisibleTo("BrowseRouter.Tests")]
diff --git a/BrowseRouter/Model/UriFactory.cs b/BrowseRouter/Model/UriFactory.cs
index 4823d43..f3fe14d 100644
--- a/BrowseRouter/Model/UriFactory.cs
+++ b/BrowseRouter/Model/UriFactory.cs
@@ -1,4 +1,6 @@
-namespace BrowseRouter.Model;
+using System.Net;
+
+namespace BrowseRouter.Model;
 
 public static class UriFactory
 {
@@ -6,7 +8,7 @@ public static Uri Get(string url)
   {
     try
     {
-      return new Uri(url);
+      return new Uri(WebUtility.UrlDecode(url));
     }
     catch (UriFormatException)
     {
diff --git a/Directory.Build.props b/Directory.Build.props
index d22e3cc..4ebdcb2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <Version>0.15.2</Version>
+    <Version>0.15.3</Version>
     <Product>BrowseRouter</Product>
     <Copyright>EnduraByte LLC 2025</Copyright>
     <!-- Reduces flagging as malware -->
diff --git a/Tests/BrowseRouter.Tests/Model/UriFactoryTests.cs b/Tests/BrowseRouter.Tests/Model/UriFactoryTests.cs
new file mode 100644
index 0000000..43376c7
--- /dev/null
+++ b/Tests/BrowseRouter.Tests/Model/UriFactoryTests.cs
@@ -0,0 +1,33 @@
+using BrowseRouter.Model;
+
+namespace BrowseRouter.Tests.Model;
+
+public class GetMethod
+{
+  [Fact]
+  public void HandlesValidUrl()
+  {
+    string url = "https://www.example.com/path";
+    var act = () => UriFactory.Get(url);
+
+    act.Should().NotThrow<UriFormatException>();
+  }
+
+  [Fact]
+  public void HandlesUrlWithoutHttps()
+  {
+    string url = "www.example.com/path";
+    var act = () => UriFactory.Get(url);
+
+    act.Should().NotThrow<UriFormatException>();
+  }
+
+  [Fact]
+  public void HandlesUrlEncodedUrl()
+  {
+    string url = "https%3A%2F%2Fwww.example.com%2Fpath%2F";
+    var act = () => UriFactory.Get(url);
+
+    act.Should().NotThrow<UriFormatException>();
+  }
+}