From 1e271f499b46f6dd7b0408d2adc688801ec676f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Istv=C3=A1n=20R=C3=A1tkai?= Date: Wed, 22 Mar 2023 10:15:44 +0000 Subject: [PATCH] Refine basic authorization auto-configuration --- .../client/configuration/XapiClientAutoConfiguration.java | 6 ++---- .../XapiClientAutoConfigurationUsernamePasswordTest.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java index a3868b9e..ab2438ac 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/configuration/XapiClientAutoConfiguration.java @@ -5,7 +5,6 @@ package dev.learning.xapi.client.configuration; import dev.learning.xapi.client.XapiClient; -import java.util.Base64; import java.util.List; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -35,9 +34,8 @@ public XapiClient xapiClient(XapiClientProperties properties, WebClient.Builder builder.defaultHeader(HttpHeaders.AUTHORIZATION, properties.getAuthorization()); } else if (properties.getUsername() != null && properties.getPassword() != null) { - final var auth = "basic " + Base64.getEncoder() - .encodeToString((properties.getUsername() + ":" + properties.getPassword()).getBytes()); - builder.defaultHeader(HttpHeaders.AUTHORIZATION, auth); + builder + .defaultHeaders(h -> h.setBasicAuth(properties.getUsername(), properties.getPassword())); } if (properties.getBaseUrl() != null) { diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java index a2942a65..afcdd7e5 100644 --- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java @@ -68,7 +68,7 @@ void whenConfiguringXapiClientThenAuthenticationIsSet() throws InterruptedExcept // Then Authorization Is Set assertThat(recordedRequest.getHeaders().get(HttpHeaders.AUTHORIZATION), - is("basic dXNlcm5hbWU6cGFzc3dvcmQ=")); + is("Basic dXNlcm5hbWU6cGFzc3dvcmQ=")); } }