diff --git a/DD.Persistence.Client/Helpers/ApiTokenHelper.cs b/DD.Persistence.Client/Helpers/ApiTokenHelper.cs index 4a46016..3487dcb 100644 --- a/DD.Persistence.Client/Helpers/ApiTokenHelper.cs +++ b/DD.Persistence.Client/Helpers/ApiTokenHelper.cs @@ -9,12 +9,12 @@ using System.Text.Json; namespace DD.Persistence.Client.Helpers; /// -/// , api-token +///  Класс, позволяющий генерировать api-token /// public static class ApiTokenHelper { /// - /// + /// Метод авторизации /// /// /// @@ -30,14 +30,14 @@ public static class ApiTokenHelper var keycloakGetTokenUrl = configuration.GetSection("KeycloakGetTokenUrl").Get() ?? string.Empty; var jwtToken = needUseKeyCloak - ? authUser.CreateKeyCloakJwtToken(keycloakGetTokenUrl) + ? authUser.CreateKeyCloakJwtToken(keycloakGetTokenUrl, httpClient) : authUser.CreateDefaultJwtToken(); httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", jwtToken); } /// - /// jwt- + /// Авторизация через собственный jwt-токен /// /// /// @@ -68,14 +68,13 @@ public static class ApiTokenHelper } /// - /// jwt- keycloak + /// Авторизация через jwt-токен keycloak /// /// /// /// - private static string CreateKeyCloakJwtToken(this AuthUser authUser, string keycloakGetTokenUrl) + private static string CreateKeyCloakJwtToken(this AuthUser authUser, string keycloakGetTokenUrl, HttpClient httpClient) { - var sharedClient = new HttpClient(); var parameters = new Dictionary { { "username", authUser.Username }, { "password", authUser.Password }, @@ -84,7 +83,7 @@ public static class ApiTokenHelper }; var encodedContent = new FormUrlEncodedContent(parameters); - using HttpResponseMessage response = sharedClient.PostAsync(keycloakGetTokenUrl, encodedContent).GetAwaiter().GetResult(); + using HttpResponseMessage response = httpClient.PostAsync(keycloakGetTokenUrl, encodedContent).GetAwaiter().GetResult(); if (response.IsSuccessStatusCode == true) {