Skip to content

updateAccessToken() --> ClientHandlerException() if non HTTP 200 #58

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

Merged
mmallis87 merged 1 commit into from
Mar 18, 2018
Merged

updateAccessToken() --> ClientHandlerException() if non HTTP 200 #58

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
19 changes: 16 additions & 3 deletions src/main/java/com/docusign/esign/client/auth/OAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import java.util.List;
import java.util.Map;

import javax.ws.rs.core.Response;

import org.apache.oltu.oauth2.client.HttpClient;
import org.apache.oltu.oauth2.client.OAuthClient;
import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
Expand Down Expand Up @@ -84,17 +86,28 @@ public synchronized void updateAccessToken() {
} catch (Exception e) {
throw new ClientHandlerException(e.getMessage(), e);
}
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
if (accessTokenResponse != null)
{
// FIXME: This does not work in case of non HTTP 200 :-( oauthClient needs to return the plain HTTP resonse
if (accessTokenResponse.getResponseCode() != Response.Status.OK.getStatusCode())
{
throw new ClientHandlerException("Error while requesting an access token, received HTTP code: " + accessTokenResponse.getResponseCode());
}

if (accessTokenResponse.getAccessToken() == null) {
throw new ClientHandlerException("Error while requesting an access token. No 'access_token' found.");
}
if (accessTokenResponse.getExpiresIn() == null) {
throw new ClientHandlerException("Error while requesting an access token. No 'expires_in' found.");
}

setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
if (accessTokenListener != null) {
accessTokenListener.notify((BasicOAuthToken) accessTokenResponse.getOAuthToken());
if (this.accessTokenListener != null) {
this.accessTokenListener.notify((BasicOAuthToken)accessTokenResponse.getOAuthToken());
}
} else {
// in case of HTTP error codes accessTokenResponse is null, thus no check of accessTokenResponse.getResponseCode() possible :-(
throw new ClientHandlerException("Error while requesting an access token. No accessTokenResponse object recieved, maybe a non HTTP 200 received?");
}
}

Expand Down