chore: Update UriExtensions along Review suggestions

TODO: Decide which of both Query checking Methods should be used

Author: DevTKSS

Yllibed.Handlers.Uno/Extensions/UriExtensions.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
+using System.Web;
 
 namespace Yllibed.Handlers.Uno.Extensions;
 
@@ -10,10 +12,19 @@ public static IDictionary<string, string> GetParameters(this Uri uri)
 	{
 
 		return uri
-				.OriginalString
+				.Query
 				.Split(_uriSplitChars, StringSplitOptions.RemoveEmptyEntries)
 				.Select(p => p.Split('='))
 				.Where(parts => parts.Length > 1)
 				.ToDictionary(parts => parts[0], parts => string.Join('=', parts.Skip(1)), StringComparer.Ordinal);
 	}
+	public static NameValueCollection GetQuery(this Uri? redirectUri, Uri callbackUri) // TODO: Check if we maybe should exchange using GetParameters to this method
+	{
+		if (redirectUri is null)
+			return [];
+		return redirectUri.IsBaseOf(callbackUri) // Reused from Uno.Extensions.Authentication.Web.WebAuthenticationProvider and changed to use Uri instead of string
+			 ? AuthHttpUtility.ExtractArguments(redirectUri.ToString())  // it's a fully qualified url, so need to extract query or fragment
+			 : AuthHttpUtility.ParseQueryString(redirectUri.ToString().TrimStart('#').TrimStart('?')); // it isn't a full url, so just process as query or fragment
+
+	}
 }

Yllibed.Handlers.Uno/IAuthCallbackHandler.cs

@@ -3,4 +3,5 @@ namespace Yllibed.Handlers.Uno;
 public interface IAuthCallbackHandler : IHttpHandler
 {
 	public Uri CallbackUri { get; }
+	public Task<WebAuthenticationResult> WaitForCallbackAsync();
 }

Yllibed.Handlers.Uno/OAuthCallbackHandler.cs

@@ -51,7 +51,23 @@ protected virtual WebAuthenticationResult GetWebAuthenticationResult(uint status
 			_ => new WebAuthenticationResult(requestUriString, statusCode, WebAuthenticationStatus.ErrorHttp),
 		};
 	}
+	//protected virtual uint GetStatusCode(NameValueCollection parameters) // TODO: Check if we maybe should exchange using GetParameters with return Dictionary to this method
+	//{
+	//	if (parameters.Get(OAuthErrorResponseDefaults.ErrorKey) is string error)
+	//	{
+	//		return error switch
+	//		{
+	//			OAuthErrorResponseDefaults.AccessDenied => 403,
+	//			OAuthErrorResponseDefaults.InvalidClient or OAuthErrorResponseDefaults.UnauthorizedClient or OAuthErrorResponseDefaults.InvalidScope => 401,
+	//			OAuthErrorResponseDefaults.TemporarilyUnavailable => 503,
+	//			OAuthErrorResponseDefaults.UnsupportedGrantType => 500,
+	//			_ => 400 // For all others: Bad Request
+	//		};
 
+	//	}
+
+	//	return 200;
+	//}
 	protected virtual uint GetStatusCode(IDictionary<string, string> parameters)
 	{
 		if (parameters.TryGetValue(OAuthErrorResponseDefaults.ErrorKey, out var error))
@@ -79,8 +95,6 @@ protected virtual string GetWebAuthenticationResponseMessage(WebAuthenticationRe
 			_ => "Authentication completed - you can close this browser now."
 		};
 	}
-	public Task<WebAuthenticationResult> WaitForCallbackAsync()
-	{
-		return _tcs.Task;
-	}
+	public Task<WebAuthenticationResult> WaitForCallbackAsync() => _tcs.Task;
+
 }

Yllibed.Handlers.Uno/Yllibed.Handlers.Uno.csproj

@@ -6,12 +6,9 @@
     <Nullable>enable</Nullable>
 	<UnoFeatures>
 		Logging;
-		Configuration;
+		Authentication;
 	</UnoFeatures>
   </PropertyGroup>
-	<ItemGroup Label="Packages">
-		<!-- <PackageReference Include="Uno.UI"/> TODO: Decide if using PackageReference or Uno.Sdk is able to provide the wanted Low dependency level.-->
-	</ItemGroup>
 	<ItemGroup Label="Projects">
 	  <ProjectReference Include="..\Yllibed.HttpServer\Yllibed.HttpServer.csproj" />
 	</ItemGroup>