SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1.x'

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2022-09-30 19:45:52 +02:00
parent 6098d910ac 77072d96e4
commit 1e31a0d245
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/security/OAuth2AccessTokenInterceptor.java
View File

@@ -27,7 +27,6 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager;
import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest; import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient; import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager; import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager;
@@ -37,9 +36,9 @@ import org.springframework.util.StringUtils;
/** /**
* A {@link RequestInterceptor} for OAuth2 Feign Requests. By default, it uses the * A {@link RequestInterceptor} for OAuth2 Feign Requests. By default, it uses the
* {@link AuthorizedClientServiceOAuth2AuthorizedClientManager } to get * {@link OAuth2AuthorizedClientManager } to get {@link OAuth2AuthorizedClient } that
* {@link OAuth2AuthorizedClient } that holds an {@link OAuth2AccessToken }. If the user * holds an {@link OAuth2AccessToken }. If the user has specified an OAuth2
* has specified an OAuth2 {@code clientRegistrationId} using the * {@code clientRegistrationId} using the
* {@code spring.cloud.openfeign.oauth2.clientRegistrationId} property, it will be used to * {@code spring.cloud.openfeign.oauth2.clientRegistrationId} property, it will be used to
* retrieve the token. If the token is not retrieved or the {@code clientRegistrationId} * retrieve the token. If the token is not retrieved or the {@code clientRegistrationId}
* has not been specified, the {@code serviceId} retrieved from the {@code url} host * has not been specified, the {@code serviceId} retrieved from the {@code url} host

2
spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -75,7 +75,7 @@
"defaultValue": "false" "defaultValue": "false"
}, },
{ {
"name": "spring.cloud.openfeign.oauth2.clientId", "name": "spring.cloud.openfeign.oauth2.registrationClientId",
"type": "java.lang.String", "type": "java.lang.String",
"description": "Provides a clientId to be used with OAuth2.", "description": "Provides a clientId to be used with OAuth2.",
"defaultValue": "" "defaultValue": ""