From e892adbd96959ae0b1c2fe789cf89ecfa3cb6ba2 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Mon, 3 Feb 2025 16:01:08 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20ApiTokenHelper?= =?UTF-8?q?=20=D0=B8=D0=B7=20Clients=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B2=20IntegrationTests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiTokenHelper.cs | 37 +------------------ 1 file changed, 2 insertions(+), 35 deletions(-) rename {DD.Persistence.Client/Helpers => DD.Persistence.IntegrationTests}/ApiTokenHelper.cs (58%) diff --git a/DD.Persistence.Client/Helpers/ApiTokenHelper.cs b/DD.Persistence.IntegrationTests/ApiTokenHelper.cs similarity index 58% rename from DD.Persistence.Client/Helpers/ApiTokenHelper.cs rename to DD.Persistence.IntegrationTests/ApiTokenHelper.cs index 3487dcb..a93fb0d 100644 --- a/DD.Persistence.Client/Helpers/ApiTokenHelper.cs +++ b/DD.Persistence.IntegrationTests/ApiTokenHelper.cs @@ -6,7 +6,7 @@ using System.Net.Http.Headers; using System.Security.Claims; using System.Text.Json; -namespace DD.Persistence.Client.Helpers; +namespace DD.Persistence.IntegrationTests; /// ///  Класс, позволяющий генерировать api-token @@ -24,14 +24,8 @@ public static class ApiTokenHelper var authUser = configuration .GetSection(nameof(AuthUser)) .Get()!; - var needUseKeyCloak = configuration - .GetSection("NeedUseKeyCloak") - .Get()!; - var keycloakGetTokenUrl = configuration.GetSection("KeycloakGetTokenUrl").Get() ?? string.Empty; - var jwtToken = needUseKeyCloak - ? authUser.CreateKeyCloakJwtToken(keycloakGetTokenUrl, httpClient) - : authUser.CreateDefaultJwtToken(); + var jwtToken = authUser.CreateDefaultJwtToken(); httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", jwtToken); } @@ -66,31 +60,4 @@ public static class ApiTokenHelper var token = tokenHandler.CreateToken(tokenDescriptor); return tokenHandler.WriteToken(token); } - - /// - /// Авторизация через jwt-токен keycloak - /// - /// - /// - /// - private static string CreateKeyCloakJwtToken(this AuthUser authUser, string keycloakGetTokenUrl, HttpClient httpClient) - { - var parameters = new Dictionary { - { "username", authUser.Username }, - { "password", authUser.Password }, - { "client_id", authUser.ClientId }, - { "grant_type", authUser.GrantType }, - }; - var encodedContent = new FormUrlEncodedContent(parameters); - - using HttpResponseMessage response = httpClient.PostAsync(keycloakGetTokenUrl, encodedContent).GetAwaiter().GetResult(); - - if (response.IsSuccessStatusCode == true) - { - var data = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult(); - var token = JsonSerializer.Deserialize(data)!; - return token.AccessToken; - } - return String.Empty; - } }