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

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

Browse Source 
# Conflicts:
#	docs/package.json
This commit is contained in:
Olga Maciaszek-Sharma
2024-09-06 15:30:31 +02:00
parent 076dd29fc2 0333ed19af
commit a11a44223b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/package.json
View File

@@ -4,7 +4,7 @@
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.0-beta.2",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.11.1",
"@springio/antora-extensions": "1.14.2",
"@springio/asciidoctor-extensions": "1.0.0-alpha.13"
}
}

9
spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/security/OAuth2AccessTokenInterceptorTests.java
View File

@@ -81,8 +81,7 @@ class OAuth2AccessTokenInterceptorTests {
@Test
void shouldAcquireValidToken() {
oAuth2AccessTokenInterceptor = new OAuth2AccessTokenInterceptor(mockOAuth2AuthorizedClientManager);
when(mockOAuth2AuthorizedClientManager
.authorize(argThat(matchAuthorizeRequest("test"))))
when(mockOAuth2AuthorizedClientManager.authorize(argThat(matchAuthorizeRequest("test"))))
.thenReturn(validTokenOAuth2AuthorizedClient());
oAuth2AccessTokenInterceptor.apply(requestTemplate);
@@ -92,8 +91,7 @@ class OAuth2AccessTokenInterceptorTests {
@Test
void shouldAcquireValidTokenFromServiceId() {
when(mockOAuth2AuthorizedClientManager
.authorize(argThat(matchAuthorizeRequest("test"))))
when(mockOAuth2AuthorizedClientManager.authorize(argThat(matchAuthorizeRequest("test"))))
.thenReturn(validTokenOAuth2AuthorizedClient());
oAuth2AccessTokenInterceptor = new OAuth2AccessTokenInterceptor(mockOAuth2AuthorizedClientManager);
@@ -149,7 +147,8 @@ class OAuth2AccessTokenInterceptorTests {
return matchAuthorizeRequestWithPrincipalName(clientRegistrationId, "anonymousUser");
}
private ArgumentMatcher<OAuth2AuthorizeRequest> matchAuthorizeRequestWithPrincipalName(String clientRegistrationId, String principalName) {
private ArgumentMatcher<OAuth2AuthorizeRequest> matchAuthorizeRequestWithPrincipalName(String clientRegistrationId,
String principalName) {
return (OAuth2AuthorizeRequest request) -> clientRegistrationId.equals(request.getClientRegistrationId())
&& principalName.equals(request.getPrincipal().getName());
}