Merge pull request #1 from JonathanVil/main

Fix Invalid URI exception on non-unix based systems
clinically-au · Jun 2, 2024 · cec5efb · cec5efb
2 parents a4b3086 + 2ad4672
commit cec5efb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/KindeAuthenticationBuilderExtensions.cs b/KindeAuthenticationBuilderExtensions.cs
@@ -37,13 +37,13 @@ public static AuthenticationBuilder AddKindeJwtBearerAuthentication(this IServic
         kindeAuthenticationOptions(configOptions);
 
         if (string.IsNullOrEmpty(configOptions.Domain))
-            configOptions.Domain = GetRequiredConfiguration("Kinde:Domain", configuration);
+            configOptions.Domain = GetRequiredConfiguration("Kinde:Domain", configuration).TrimEnd('/');
         if (string.IsNullOrEmpty(configOptions.ClientId))
             configOptions.ClientId = GetRequiredConfiguration("Kinde:ClientId", configuration);
         if (string.IsNullOrEmpty(configOptions.ClientSecret))
             configOptions.ClientSecret = GetRequiredConfiguration("Kinde:ClientSecret", configuration);
         if (string.IsNullOrEmpty(configOptions.ManagementApiAudience))
-            configOptions.ManagementApiAudience = Path.Combine(configOptions.Domain, "api");
+            configOptions.ManagementApiAudience = $"{configOptions.Domain}/api";
         if (string.IsNullOrEmpty(configOptions.JwtAudience))
             configOptions.JwtAudience = GetRequiredConfiguration("Kinde:JwtAudience", configuration);
 
@@ -65,7 +65,7 @@ public static AuthenticationBuilder AddKindeJwtBearerAuthentication(this IServic
                 {
                     var client = new HttpClient();
                     // TODO: cache this?
-                    var response = client.GetAsync(new Uri(Path.Combine(configOptions.Domain, ".well-known/jwks"))).Result;
+                    var response = client.GetAsync(new Uri($"{configOptions.Domain}/.well-known/jwks")).Result;
                     var responseString = response.Content.ReadAsStringAsync().Result;
                     return JwksHelper.LoadKeysFromJson(responseString);
                 }
@@ -205,15 +205,15 @@ public static AuthenticationBuilder AddKindeIdentityAuthentication(this IService
         kindeAuthenticationOptions(configOptions);
 
         if (string.IsNullOrEmpty(configOptions.Domain))
-            configOptions.Domain = GetRequiredConfiguration("Kinde:Domain", configuration);
+            configOptions.Domain = GetRequiredConfiguration("Kinde:Domain", configuration).TrimEnd('/');
         if (string.IsNullOrEmpty(configOptions.ClientId))
             configOptions.ClientId = GetRequiredConfiguration("Kinde:ClientId", configuration);
         if (string.IsNullOrEmpty(configOptions.ClientSecret))
             configOptions.ClientSecret = GetRequiredConfiguration("Kinde:ClientSecret", configuration);
         if (string.IsNullOrEmpty(configOptions.SignedOutRedirectUri))
             configOptions.SignedOutRedirectUri = GetRequiredConfiguration("Kinde:SignedOutRedirectUri", configuration);
         if (string.IsNullOrEmpty(configOptions.ManagementApiAudience))
-            configOptions.ManagementApiAudience = Path.Combine(configOptions.Domain, "api");
+            configOptions.ManagementApiAudience = $"{configOptions.Domain}/api";
 
         services.AddHttpClient();
         services.AddHttpContextAccessor();

diff --git a/ManagementApi/KindeManagementApiAuthenticationHelper.cs b/ManagementApi/KindeManagementApiAuthenticationHelper.cs
@@ -26,7 +26,7 @@ public async Task<string> GetAuthTokenAsync()
         content.Headers.Clear();
         content.Headers.Add("Content-Type", "application/x-www-form-urlencoded");
 
-        var response = await client.PostAsync(Path.Combine(options.Domain, "oauth2/token"), content).ConfigureAwait(false);
+        var response = await client.PostAsync($"{options.Domain}/oauth2/token", content).ConfigureAwait(false);
         if (!response.IsSuccessStatusCode)
         {
             logger.LogCritical(@"Unable to authenticate with Kinde Management API {StatusCode} {Error}",