Skip to content

Add ability to pass custom parameters into Oauth2 refresh token request #1032

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
derekdata wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ability to pass custom parameters into Oauth2 refresh token request #1032

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
23 changes: 20 additions & 3 deletions scribejava-core/src/main/java/com/github/scribejava/core/oauth/OAuth20Service.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,14 @@ public Future<OAuth2AccessToken> getAccessToken(String code,
return getAccessToken(AccessTokenRequestParams.create(code), callback);
}

// ===== refresh AccessToken methods =====

protected OAuthRequest createRefreshTokenRequest(String refreshToken, String scope) {
return createRefreshTokenRequest(refreshToken, scope, null);
}

// ===== refresh AccessToken methods =====
protected OAuthRequest createRefreshTokenRequest(String refreshToken, String scope,
Map<String, String> additionalParams) {
if (refreshToken == null || refreshToken.isEmpty()) {
throw new IllegalArgumentException("The refreshToken cannot be null or empty");
}
Expand All @@ -273,6 +279,12 @@ protected OAuthRequest createRefreshTokenRequest(String refreshToken, String sco
request.addParameter(OAuthConstants.REFRESH_TOKEN, refreshToken);
request.addParameter(OAuthConstants.GRANT_TYPE, OAuthConstants.REFRESH_TOKEN);

if (additionalParams != null && !additionalParams.isEmpty()) {
for (Map.Entry<String, String> entry : additionalParams.entrySet()) {
request.addParameter(entry.getKey(), entry.getValue());
}
}

logRequestWithParams("refresh token", request);

return request;
Expand All @@ -283,7 +295,7 @@ public Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshToken) {
}

public Future<OAuth2AccessToken> refreshAccessTokenAsync(String refreshToken, String scope) {
return refreshAccessToken(refreshToken, scope, null);
return refreshAccessToken(refreshToken, scope, (OAuthAsyncRequestCallback<OAuth2AccessToken>) null);
}

public OAuth2AccessToken refreshAccessToken(String refreshToken)
Expand All @@ -293,7 +305,12 @@ public OAuth2AccessToken refreshAccessToken(String refreshToken)

public OAuth2AccessToken refreshAccessToken(String refreshToken, String scope)
throws IOException, InterruptedException, ExecutionException {
final OAuthRequest request = createRefreshTokenRequest(refreshToken, scope);
return refreshAccessToken(refreshToken, scope, (Map<String, String>) null);
}

public OAuth2AccessToken refreshAccessToken(String refreshToken, String scope, Map<String, String> additionalParams)
throws IOException, InterruptedException, ExecutionException {
final OAuthRequest request = createRefreshTokenRequest(refreshToken, scope, additionalParams);

return sendAccessTokenRequestSync(request);
}
Expand Down