Implemented solution and tests for "OAuth2AuthorizedClientArgumentResolver should get new access token when expired and client_credentials #6609" #6839
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jgrandja
requested changes
May 6, 2019
...ork/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java
Outdated
Show resolved
Hide resolved
...ork/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java
Outdated
Show resolved
Hide resolved
...ork/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java
Outdated
Show resolved
Hide resolved
...work/security/oauth2/client/web/reactive/function/client/OAuth2AuthorizedClientResolver.java
Outdated
Show resolved
Hide resolved
...rity/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientResolver.java
Outdated
Show resolved
Hide resolved
...rity/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientResolver.java
Outdated
Show resolved
Hide resolved
...rity/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientResolver.java
Outdated
Show resolved
Hide resolved
jgrandja
added
the
in: oauth2
gburboz
reviewed
May 7, 2019
...ork/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java
Outdated
Show resolved
Hide resolved
|
Made all requested changes to source+test. |
jgrandja
requested changes
May 7, 2019
| @@ -105,6 +105,11 @@ public Object resolveArgument(MethodParameter parameter, | |||
| "@RegisteredOAuth2AuthorizedClient(registrationId = \"client1\")."); | |||
| } | |||
|
|
|||
| ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId); | |||
There was a problem hiding this comment.
Based on my explanation in this comment, we don't need any changes here as the current implementation does exactly what is required. Please reset the changes here.
| @@ -124,14 +124,14 @@ public void setClientCredentialsTokenResponseClient( | |||
|
|
|||
| private Mono<OAuth2AuthorizedClient> authorizedClientNotLoaded(String clientRegistrationId, Authentication authentication, ServerWebExchange exchange) { | |||
| return this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) | |||
| .switchIfEmpty(Mono.error(() -> new IllegalArgumentException("Client Registration with id " + clientRegistrationId + " was not found"))) | |||
There was a problem hiding this comment.
I don't see any code changes here - just formatting changes. Am I missing something?
| @@ -125,14 +125,14 @@ public void setClientCredentialsTokenResponseClient( | |||
|
|
|||
| private Mono<OAuth2AuthorizedClient> authorizedClientNotLoaded(String clientRegistrationId, Authentication authentication, ServerWebExchange exchange) { | |||
| return this.clientRegistrationRepository.findByRegistrationId(clientRegistrationId) | |||
| .switchIfEmpty(Mono.error(() -> new IllegalArgumentException("Client Registration with id " + clientRegistrationId + " was not found"))) | |||
There was a problem hiding this comment.
I don't see any code changes here - just formatting changes. Am I missing something?
| @@ -46,9 +46,7 @@ | |||
|
|
|||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; | |||
| import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; | |||
| import static org.mockito.ArgumentMatchers.any; | |||
There was a problem hiding this comment.
This should not be included since there are no code changes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.