Skip to content

Initialize refresh token response client lazily #19452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xfocus3 wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −2
Open

Initialize refresh token response client lazily #19452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...rg/springframework/security/oauth2/client/RefreshTokenOAuth2AuthorizedClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
public final class RefreshTokenOAuth2AuthorizedClientProvider
implements OAuth2AuthorizedClientProvider, ApplicationEventPublisherAware {

private OAuth2AccessTokenResponseClient<OAuth2RefreshTokenGrantRequest> accessTokenResponseClient = new RestClientRefreshTokenTokenResponseClient();
private @Nullable OAuth2AccessTokenResponseClient<OAuth2RefreshTokenGrantRequest> accessTokenResponseClient;

private @Nullable ApplicationEventPublisher applicationEventPublisher;

Expand Down Expand Up @@ -114,14 +114,21 @@ public final class RefreshTokenOAuth2AuthorizedClientProvider
private OAuth2AccessTokenResponse getTokenResponse(OAuth2AuthorizedClient authorizedClient,
OAuth2RefreshTokenGrantRequest refreshTokenGrantRequest) {
try {
return this.accessTokenResponseClient.getTokenResponse(refreshTokenGrantRequest);
return getAccessTokenResponseClient().getTokenResponse(refreshTokenGrantRequest);
}
catch (OAuth2AuthorizationException ex) {
throw new ClientAuthorizationException(ex.getError(),
authorizedClient.getClientRegistration().getRegistrationId(), ex);
}
}

private OAuth2AccessTokenResponseClient<OAuth2RefreshTokenGrantRequest> getAccessTokenResponseClient() {
if (this.accessTokenResponseClient == null) {
this.accessTokenResponseClient = new RestClientRefreshTokenTokenResponseClient();
}
return this.accessTokenResponseClient;
}

private boolean hasTokenExpired(OAuth2Token token) {
Instant expiresAt = token.getExpiresAt();
return expiresAt != null && this.clock.instant().isAfter(expiresAt.minus(this.clockSkew));
Expand Down
16 changes: 16 additions & 0 deletions ...ringframework/security/oauth2/client/RefreshTokenOAuth2AuthorizedClientProviderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.springframework.security.oauth2.core.TestOAuth2RefreshTokens;
import org.springframework.security.oauth2.core.endpoint.OAuth2AccessTokenResponse;
import org.springframework.security.oauth2.core.endpoint.TestOAuth2AccessTokenResponses;
import org.springframework.test.util.ReflectionTestUtils;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
Expand Down Expand Up @@ -160,6 +161,21 @@ public void authorizeWhenAuthorizedAndAccessTokenNotExpiredThenNotReauthorize()
assertThat(this.authorizedClientProvider.authorize(authorizationContext)).isNull();
}

@Test
public void authorizeWhenAuthorizedAndAccessTokenNotExpiredThenDoesNotInitializeDefaultAccessTokenResponseClient() {
RefreshTokenOAuth2AuthorizedClientProvider authorizedClientProvider = new RefreshTokenOAuth2AuthorizedClientProvider();
OAuth2AuthorizedClient authorizedClient = new OAuth2AuthorizedClient(this.clientRegistration,
this.principal.getName(), TestOAuth2AccessTokens.noScopes(), this.authorizedClient.getRefreshToken());
// @formatter:off
OAuth2AuthorizationContext authorizationContext = OAuth2AuthorizationContext
.withAuthorizedClient(authorizedClient)
.principal(this.principal)
.build();
// @formatter:on
assertThat(authorizedClientProvider.authorize(authorizationContext)).isNull();
assertThat(ReflectionTestUtils.getField(authorizedClientProvider, "accessTokenResponseClient")).isNull();
}

// gh-7511
@Test
public void authorizeWhenAuthorizedAndAccessTokenNotExpiredButClockSkewForcesExpiryThenReauthorize() {
Expand Down