From c834d3d2bcf04359205241aff9b506b8dca4adc0 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mn@iter.dk>
Date: Tue, 7 Nov 2023 12:14:09 -0800
Subject: [PATCH] Ensure WebAuthenticator URL is fully encoded to avoid issues
 with certain OAuth servers (#146)

Fixes #144
---
 src/Directory.Build.targets     | 4 ++--
 src/WinUIEx/WebAuthenticator.cs | 2 +-
 src/WinUIEx/WinUIEx.csproj      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 7b0873d..b9f63b0 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -17,8 +17,8 @@
     <Authors>Morten Nielsen - https://xaml.dev</Authors>
     <Company>Morten Nielsen - https://xaml.dev</Company>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.3.2</Version>
-    <PackageValidationBaselineVersion>2.3.1</PackageValidationBaselineVersion>
+    <Version>2.3.3</Version>
+    <PackageValidationBaselineVersion>2.3.2</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackageId)'!=''">
diff --git a/src/WinUIEx/WebAuthenticator.cs b/src/WinUIEx/WebAuthenticator.cs
index 71bfeba..4243499 100644
--- a/src/WinUIEx/WebAuthenticator.cs
+++ b/src/WinUIEx/WebAuthenticator.cs
@@ -260,7 +260,7 @@ private async Task<WebAuthenticatorResult> Authenticate(Uri authorizeUri, Uri ca
 
             var process = new System.Diagnostics.Process();
             process.StartInfo.FileName = "rundll32.exe";
-            process.StartInfo.Arguments = $"url.dll,FileProtocolHandler \"{authorizeUri.ToString().Replace("\"","%22")}\"";
+            process.StartInfo.Arguments = $"url.dll,FileProtocolHandler \"{authorizeUri.OriginalString}\"";
             process.StartInfo.UseShellExecute = true;
             process.Start();
             tasks.Add(taskId, tcs);
diff --git a/src/WinUIEx/WinUIEx.csproj b/src/WinUIEx/WinUIEx.csproj
index 08715f1..e345f58 100644
--- a/src/WinUIEx/WinUIEx.csproj
+++ b/src/WinUIEx/WinUIEx.csproj
@@ -24,7 +24,7 @@
     <PackageId>WinUIEx</PackageId>
     <Product>WinUI Extensions</Product>
     <PackageReleaseNotes>
-      - Fixed WebAuthenticator issue not working with FireFox (#117)
+      - Ensure WebAuthenticator URL is fully encoded to avoid issues with certain OAuth servers (#144)
     </PackageReleaseNotes>
   </PropertyGroup>