diff --git a/client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java b/client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java index 1096cca18..2d60e0e44 100644 --- a/client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java +++ b/client/integration-tests/security/src/main/java/io/quarkiverse/openapi/generator/it/security/auth/DummyApiKeyAuthenticationProvider.java @@ -12,6 +12,7 @@ import io.quarkiverse.openapi.generator.providers.ApiKeyAuthenticationProvider; import io.quarkiverse.openapi.generator.providers.ApiKeyIn; import io.quarkiverse.openapi.generator.providers.AuthProvider; +import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider; @Priority(Priorities.AUTHENTICATION) public class DummyApiKeyAuthenticationProvider implements ClientRequestFilter { @@ -21,7 +22,7 @@ public class DummyApiKeyAuthenticationProvider implements ClientRequestFilter { @PostConstruct public void init() { authProvider = new ApiKeyAuthenticationProvider("open_weather_custom_security_yaml", "app_id", ApiKeyIn.query, "appid", - List.of()); + List.of(), new ConfigCredentialsProvider()); } @Override diff --git a/client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java b/client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java index 42efbbf2a..ec6107ad5 100644 --- a/client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java +++ b/client/oidc/src/main/java/io/quarkiverse/openapi/generator/oidc/providers/OAuth2AuthenticationProvider.java @@ -13,7 +13,6 @@ import io.quarkiverse.openapi.generator.providers.AbstractAuthProvider; import io.quarkiverse.openapi.generator.providers.AuthUtils; -import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider; import io.quarkiverse.openapi.generator.providers.CredentialsProvider; import io.quarkiverse.openapi.generator.providers.OperationAuthInfo; @@ -31,11 +30,6 @@ public OAuth2AuthenticationProvider(String name, validateConfig(); } - public OAuth2AuthenticationProvider(String name, - String openApiSpecId, OidcClientRequestFilterDelegate delegate, List operations) { - this(name, openApiSpecId, delegate, operations, new ConfigCredentialsProvider()); - } - @Override public void filter(ClientRequestContext requestContext) throws IOException { String bearerToken; diff --git a/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/OAuth2AuthenticationProviderTest.java b/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/OAuth2AuthenticationProviderTest.java index 8eaa1e2dc..aa54b54b7 100644 --- a/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/OAuth2AuthenticationProviderTest.java +++ b/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/OAuth2AuthenticationProviderTest.java @@ -29,6 +29,7 @@ import io.quarkiverse.openapi.generator.AuthConfig; import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider; +import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider; import io.quarkus.oidc.client.Tokens; @ExtendWith(MockitoExtension.class) @@ -70,7 +71,8 @@ void setUp() { } private OAuth2AuthenticationProvider createClassicProvider() { - return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, classicDelegate, List.of()); + return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, classicDelegate, List.of(), + new ConfigCredentialsProvider()); } private void assertHeader(MultivaluedMap headers, String headerName, String value) { diff --git a/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/ReactiveOAuth2AuthenticationProviderTest.java b/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/ReactiveOAuth2AuthenticationProviderTest.java index 68169a3d8..a450f3cb2 100644 --- a/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/ReactiveOAuth2AuthenticationProviderTest.java +++ b/client/oidc/src/test/java/io/quarkiverse/openapi/generator/oidc/ReactiveOAuth2AuthenticationProviderTest.java @@ -31,6 +31,7 @@ import io.quarkiverse.openapi.generator.AuthConfig; import io.quarkiverse.openapi.generator.oidc.providers.OAuth2AuthenticationProvider; +import io.quarkiverse.openapi.generator.providers.ConfigCredentialsProvider; import io.quarkus.oidc.client.Tokens; import io.smallrye.mutiny.Uni; @@ -79,7 +80,8 @@ void setUp() { } protected OAuth2AuthenticationProvider createReactiveProvider() { - return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, reactiveDelegate, List.of()); + return new OAuth2AuthenticationProvider(AUTH_SCHEME_NAME, OPEN_API_FILE_SPEC_ID, reactiveDelegate, List.of(), + new ConfigCredentialsProvider()); } protected void assertHeader(MultivaluedMap headers, String headerName, String value) { diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java index f2467eb14..2b2368e44 100644 --- a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java +++ b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/ApiKeyAuthenticationProvider.java @@ -31,11 +31,6 @@ public ApiKeyAuthenticationProvider(final String openApiSpecId, final String nam validateConfig(); } - public ApiKeyAuthenticationProvider(final String openApiSpecId, final String name, final ApiKeyIn apiKeyIn, - final String apiKeyName, List operations) { - this(openApiSpecId, name, apiKeyIn, apiKeyName, operations, new ConfigCredentialsProvider()); - } - @Override public void filter(ClientRequestContext requestContext) throws IOException { switch (apiKeyIn) { diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java index 0ec39ed28..22fc3f001 100644 --- a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java +++ b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BasicAuthenticationProvider.java @@ -22,10 +22,6 @@ public BasicAuthenticationProvider(final String openApiSpecId, String name, List super(name, openApiSpecId, operations, credentialsProvider); } - public BasicAuthenticationProvider(final String openApiSpecId, String name, List operations) { - this(openApiSpecId, name, operations, new ConfigCredentialsProvider()); - } - private String getUsername(ClientRequestContext requestContext) { return credentialsProvider.getBasicUsername(CredentialsProvider.CredentialsContext.builder() .requestContext(requestContext) diff --git a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java index b51bf17b5..ea68883cd 100644 --- a/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java +++ b/client/runtime/src/main/java/io/quarkiverse/openapi/generator/providers/BearerAuthenticationProvider.java @@ -21,11 +21,6 @@ public BearerAuthenticationProvider(final String openApiSpecId, final String nam this.scheme = scheme; } - public BearerAuthenticationProvider(final String openApiSpecId, final String name, final String scheme, - List operations) { - this(openApiSpecId, name, scheme, operations, new ConfigCredentialsProvider()); - } - @Override public void filter(ClientRequestContext requestContext) throws IOException { String bearerToken = getBearerToken(requestContext); diff --git a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyOpenApiSpecProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyOpenApiSpecProviderTest.java index d6ffd6fab..d8060fb4f 100644 --- a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyOpenApiSpecProviderTest.java +++ b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/ApiKeyOpenApiSpecProviderTest.java @@ -42,7 +42,7 @@ class ApiKeyOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest headers = new MultivaluedTreeMap<>(); doReturn(headers).when(requestContext).getHeaders(); provider = new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.cookie, API_KEY_NAME, - List.of()); + List.of(), new ConfigCredentialsProvider()); provider.filter(requestContext); final List cookies = headers.get(HttpHeaders.COOKIE); assertThat(cookies).singleElement().satisfies(cookie -> assertCookie(cookie, API_KEY_NAME, API_KEY_VALUE)); @@ -114,7 +114,7 @@ void filterCookieCaseExisting() throws IOException { headers.add(HttpHeaders.COOKIE, existingCookie); doReturn(headers).when(requestContext).getHeaders(); provider = new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.cookie, API_KEY_NAME, - List.of()); + List.of(), new ConfigCredentialsProvider()); provider.filter(requestContext); final List cookies = headers.get(HttpHeaders.COOKIE); assertThat(cookies).satisfiesExactlyInAnyOrder(cookie -> assertCookie(cookie, existingCookieName, existingCookieValue), @@ -130,7 +130,8 @@ void tokenPropagationNotSupported() { Boolean.class)).thenReturn(Optional.of(true)); assertThatThrownBy(() -> new ApiKeyAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, ApiKeyIn.header, - API_KEY_NAME, List.of())).hasMessageContaining("quarkus.openapi-generator.%s.auth.%s.token-propagation", + API_KEY_NAME, List.of(), new ConfigCredentialsProvider())) + .hasMessageContaining("quarkus.openapi-generator.%s.auth.%s.token-propagation", OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME); } } diff --git a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicOpenApiSpecProviderTest.java b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicOpenApiSpecProviderTest.java index 20a26d577..2677a7786 100644 --- a/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicOpenApiSpecProviderTest.java +++ b/client/runtime/src/test/java/io/quarkiverse/openapi/generator/providers/BasicOpenApiSpecProviderTest.java @@ -39,7 +39,8 @@ class BasicOpenApiSpecProviderTest extends AbstractOpenApiSpecProviderTest filterWithPropagationTestValues() { @Override protected BearerAuthenticationProvider createProvider() { return new BearerAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, null, - List.of()); + List.of(), new ConfigCredentialsProvider()); } @Test @@ -64,7 +64,7 @@ void filterCustomSchemaCase() throws IOException { private void filter(String bearerScheme, String expectedAuthorizationHeader) throws IOException { provider = new BearerAuthenticationProvider(OPEN_API_FILE_SPEC_ID, AUTH_SCHEME_NAME, bearerScheme, - List.of()); + List.of(), new ConfigCredentialsProvider()); provider.filter(requestContext); assertHeader(headers, HttpHeaders.AUTHORIZATION, expectedAuthorizationHeader); }