Fix configuration handling with Feign (#17860)

* Fix configuration handling with Feign

* Fix test

* Fix compile error

* Fix compile error
This commit is contained in:
Dennis Melzer
2024-02-15 10:01:01 +01:00
committed by GitHub
parent 82bb813aeb
commit 7d76d0af61
22 changed files with 123 additions and 71 deletions

View File

@@ -15,4 +15,3 @@ src/main/java/org/openapitools/model/Order.java
src/main/java/org/openapitools/model/Pet.java
src/main/java/org/openapitools/model/Tag.java
src/main/java/org/openapitools/model/User.java
src/main/resources/oauth2-client.properties

View File

@@ -21,7 +21,6 @@ import feign.RequestTemplate;
import org.springframework.context.annotation.Configuration;
@Configuration
public class ClientConfiguration {
private static final String CLIENT_PRINCIPAL_IMPLICIT = "oauth2FeignClient";

View File

@@ -1,10 +1,21 @@
package org.openapitools.configuration;
import org.springframework.context.annotation.PropertySource;
import java.util.Properties;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.PropertiesPropertySource;
@PropertySource( "classpath:/oauth2-client.properties" )
@Configuration
@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration")
public class ClientPropertiesConfiguration {
public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) {
final Properties properties = new Properties();
properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" );
properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" );
properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" );
properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" );
final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties );
configurableEnvironment.getPropertySources().addLast( propertiesPropertySource );
}
}