diff --git a/Apps.Jira/JiraClient.cs b/Apps.Jira/JiraClient.cs index e28400b..9554987 100644 --- a/Apps.Jira/JiraClient.cs +++ b/Apps.Jira/JiraClient.cs @@ -12,11 +12,8 @@ public JiraClient(IEnumerable authenticationC : base(new RestClientOptions { ThrowOnAnyError = false, BaseUrl = new Uri(authenticationCredentialsProviders.First(p => p.KeyName == "JiraUrl").Value) }) { - var username = authenticationCredentialsProviders.First(p => p.KeyName == "User").Value; - var password = authenticationCredentialsProviders.First(p => p.KeyName == "Authorization").Value; - var encodedCredentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")); - - this.AddDefaultHeader("Authorization", $"Basic {encodedCredentials}"); + this.AddDefaultHeader("Authorization", + authenticationCredentialsProviders.First(p => p.KeyName == "Authorization").Value); } public async Task ExecuteWithHandling(RestRequest request) @@ -46,11 +43,11 @@ private static string GetJiraCloudId(IEnumerable p.KeyName == "JiraUrl").Value; - var authorizationHeader = GetAuthorizationHeader(authenticationCredentialsProviders); + string authorizationHeader = authenticationCredentialsProviders.First(p => p.KeyName == "Authorization").Value; var restClient = new RestClient(new RestClientOptions { ThrowOnAnyError = true, BaseUrl = new Uri(atlassianResourcesUrl) }); var request = new RestRequest(""); - request.AddHeader("Authorization", $"Basic {authorizationHeader}"); + request.AddHeader("Authorization", authorizationHeader); var atlassianCloudResources = restClient.Get>(request); var cloudId = atlassianCloudResources.First(jiraResource => jiraUrl.Contains(jiraResource.Url)).Id ?? throw new ArgumentException("The Jira URL is incorrect."); @@ -63,12 +60,5 @@ private Exception ConfigureErrorException(RestResponse response) var errorMessages = string.Join(" ", error.ErrorMessages); return new(errorMessages); } - - private static string GetAuthorizationHeader(IEnumerable authenticationCredentialsProviders) - { - var username = authenticationCredentialsProviders.First(p => p.KeyName == "User").Value; - var password = authenticationCredentialsProviders.First(p => p.KeyName == "Authorization").Value; - return Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")); - } } }