diff --git a/DD.Persistence.Client/Helpers/ApiTokenHelper.cs b/DD.Persistence.Client/Helpers/ApiTokenHelper.cs index 85fa428..4a46016 100644 --- a/DD.Persistence.Client/Helpers/ApiTokenHelper.cs +++ b/DD.Persistence.Client/Helpers/ApiTokenHelper.cs @@ -19,7 +19,7 @@ public static class ApiTokenHelper /// /// /// - public static async Task Authorize(this HttpClient httpClient, IConfiguration configuration) + public static void Authorize(this HttpClient httpClient, IConfiguration configuration) { var authUser = configuration .GetSection(nameof(AuthUser)) @@ -30,7 +30,7 @@ public static class ApiTokenHelper var keycloakGetTokenUrl = configuration.GetSection("KeycloakGetTokenUrl").Get() ?? string.Empty; var jwtToken = needUseKeyCloak - ? await authUser.CreateKeyCloakJwtToken(keycloakGetTokenUrl) + ? authUser.CreateKeyCloakJwtToken(keycloakGetTokenUrl) : authUser.CreateDefaultJwtToken(); httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", jwtToken); @@ -73,7 +73,7 @@ public static class ApiTokenHelper /// /// /// - private static async Task CreateKeyCloakJwtToken(this AuthUser authUser, string keycloakGetTokenUrl) + private static string CreateKeyCloakJwtToken(this AuthUser authUser, string keycloakGetTokenUrl) { var sharedClient = new HttpClient(); var parameters = new Dictionary { @@ -84,11 +84,11 @@ public static class ApiTokenHelper }; var encodedContent = new FormUrlEncodedContent(parameters); - using HttpResponseMessage response = await sharedClient.PostAsync(keycloakGetTokenUrl, encodedContent); + using HttpResponseMessage response = sharedClient.PostAsync(keycloakGetTokenUrl, encodedContent).GetAwaiter().GetResult(); if (response.IsSuccessStatusCode == true) { - var data = await response.Content.ReadAsStreamAsync(); + var data = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult(); var token = JsonSerializer.Deserialize(data)!; return token.AccessToken; } diff --git a/DD.Persistence.IntegrationTests/TestHttpClientFactory.cs b/DD.Persistence.IntegrationTests/TestHttpClientFactory.cs index 4c0cd04..51b8783 100644 --- a/DD.Persistence.IntegrationTests/TestHttpClientFactory.cs +++ b/DD.Persistence.IntegrationTests/TestHttpClientFactory.cs @@ -19,7 +19,7 @@ namespace DD.Persistence.IntegrationTests public HttpClient CreateClient(string name) { var client = factory.CreateClient(); - client.Authorize(configuration).GetAwaiter().GetResult(); + client.Authorize(configuration); return client; }