Refactor based on feedback and update tests acordingly

Co-authored-by: Francisco Javier Tirado Sarti <[email protected]>

Author: gabriel-farache

client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java

@@ -37,14 +37,13 @@ private String getPassword() {
 
     @Override
     public void filter(ClientRequestContext requestContext) throws IOException {
-        String basicToken;
+        String basicToken = AuthUtils.basicAuthAccessTokenWithoutPrefix(getUsername(), getPassword());
+
         if (isTokenPropagation()) {
             LOGGER.warn("Token propagation enabled for BasicAuthentication");
-            basicToken = getTokenForPropagation(requestContext.getHeaders());
-            basicToken = sanitizeBasicToken(basicToken);
-        } else {
-            basicToken = AuthUtils.basicAuthAccessTokenWithoutPrefix(getUsername(), getPassword());
+            basicToken = sanitizeBasicToken(getTokenForPropagation(requestContext.getHeaders()));
         }
+
         if (!basicToken.isBlank()) {
             requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION,
                     AuthUtils.basicAuthAccessToken(basicToken));

client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java

@@ -27,13 +27,12 @@ public BearerAuthenticationProvider(final String openApiSpecId, final String nam
 
     @Override
     public void filter(ClientRequestContext requestContext) throws IOException {
-        String bearerToken;
+        String bearerToken = getBearerToken();
+
         if (isTokenPropagation()) {
-            bearerToken = getTokenForPropagation(requestContext.getHeaders());
-            bearerToken = sanitizeBearerToken(bearerToken);
-        } else {
-            bearerToken = getBearerToken();
+            bearerToken = sanitizeBearerToken(getTokenForPropagation(requestContext.getHeaders()));
         }
+
         if (!bearerToken.isBlank()) {
             requestContext.getHeaders().add(HttpHeaders.AUTHORIZATION,
                     AuthUtils.authTokenOrBearer(this.scheme, bearerToken));

client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicOpenApiSpecProviderTest.java

@@ -28,6 +28,9 @@ class BasicOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest<Basic
     private static final String USER = "USER";
     private static final String PASSWORD = "PASSWORD";
 
+    private static final String USER_PROP = "username";
+    private static final String PASSWORD_PROP = "password";
+
     private static final String CUSTOM_SCHEMA = "custom_scheme";
     private static final String HEADER_NAME = "HEADER_NAME";
 
@@ -53,14 +56,9 @@ private void filter(String expectedAuthorizationHeader) throws IOException {
     @MethodSource("filterWithPropagationTestValues")
     void filterWithPropagation(String headerName,
             String expectedAuthorizationHeader) throws IOException {
-        String propagatedHeaderName;
-        if (headerName == null) {
-            propagatedHeaderName = propagationHeaderName(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME,
-                    HttpHeaders.AUTHORIZATION);
-        } else {
-            propagatedHeaderName = propagationHeaderName(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME,
-                    HEADER_NAME);
-        }
+        String propagatedHeaderName = headerName == null
+                ? propagationHeaderName(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, HttpHeaders.AUTHORIZATION)
+                : propagationHeaderName(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, HEADER_NAME);
         try (MockedStatic<ConfigProvider> configProviderMocked = Mockito.mockStatic(ConfigProvider.class)) {
             Config mockedConfig = Mockito.mock(Config.class);
             configProviderMocked.when(ConfigProvider::getConfig).thenReturn(mockedConfig);
@@ -69,7 +67,10 @@ void filterWithPropagation(String headerName,
                     Boolean.class)).thenReturn(Optional.of(true));
             when(mockedConfig.getOptionalValue(provider.getCanonicalAuthConfigPropertyName(AuthConfig.HEADER_NAME),
                     String.class)).thenReturn(Optional.of(headerName == null ? HttpHeaders.AUTHORIZATION : headerName));
-
+            when(mockedConfig.getOptionalValue(provider.getCanonicalAuthConfigPropertyName(USER_PROP),
+                    String.class)).thenReturn(Optional.of(USER));
+            when(mockedConfig.getOptionalValue(provider.getCanonicalAuthConfigPropertyName(PASSWORD_PROP),
+                    String.class)).thenReturn(Optional.of(PASSWORD));
             headers.putSingle(propagatedHeaderName, PROPAGATED_TOKEN);
             filter(expectedAuthorizationHeader);
         }

client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BearerOpenApiSpecProviderTest.java

@@ -28,6 +28,8 @@ class BearerOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest<Bear
     private static final String PROPAGATED_TOKEN = "PROPAGATED_TOKEN";
 
     private static final String BEARER_SCHEMA = "bearer";
+
+    private static final String BEARER_TOKEN = "bearer-token";
     private static final String CUSTOM_SCHEMA = "custom_scheme";
     private static final String HEADER_NAME = "HEADER_NAME";
 
@@ -80,6 +82,8 @@ void filterWithPropagation(String headerName,
                     Boolean.class)).thenReturn(Optional.of(true));
             when(mockedConfig.getOptionalValue(provider.getCanonicalAuthConfigPropertyName(AuthConfig.HEADER_NAME),
                     String.class)).thenReturn(Optional.of(headerName == null ? HttpHeaders.AUTHORIZATION : headerName));
+            when(mockedConfig.getOptionalValue(provider.getCanonicalAuthConfigPropertyName(BEARER_TOKEN),
+                    String.class)).thenReturn(Optional.of(INCOMING_TOKEN));
 
             headers.putSingle(propagatedHeaderName, PROPAGATED_TOKEN);
             filter(bearerScheme, expectedAuthorizationHeader);