Skip to content

issue #504 #505

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

Closed
rsoika wants to merge 4 commits into from
Closed

issue #504 #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
056a195
issue #504
rsoika Aug 12, 2014
1d51c6c
issue #505
rsoika Aug 13, 2014
e85366c
issue #505 added a API implementation for Magento
rsoika Aug 14, 2014
a5837db
issue #505 removed API implementation for Magento
rsoika Aug 19, 2014
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
2 changes: 1 addition & 1 deletion src/main/java/org/scribe/model/Request.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ Response doSend(RequestTuner tuner) throws IOException
{
connection.setReadTimeout(readTimeout.intValue());
}
tuner.tune(this);
addHeaders(connection);
if (verb.equals(Verb.PUT) || verb.equals(Verb.POST))
{
addBody(connection, getByteBodyContents());
}
tuner.tune(this);
return new Response(connection);
}

Expand Down
25 changes: 22 additions & 3 deletions src/main/java/org/scribe/oauth/OAuth20ServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ public class OAuth20ServiceImpl implements OAuthService

private final DefaultApi20 api;
private final OAuthConfig config;

private static RequestTuner NOOP = new RequestTuner() {
@Override public void tune(Request _){}
};
/**
* Default constructor
*
Expand All @@ -26,24 +28,41 @@ public OAuth20ServiceImpl(DefaultApi20 api, OAuthConfig config)
* {@inheritDoc}
*/
public Token getAccessToken(Token requestToken, Verifier verifier)
{
return getAccessToken(requestToken,verifier,NOOP);
}
/**
* {@inheritDoc}
*/
public Token getAccessToken(Token requestToken, Verifier verifier, RequestTuner tuner)
{
OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
request.addQuerystringParameter(OAuthConstants.CLIENT_ID, config.getApiKey());
request.addQuerystringParameter(OAuthConstants.CLIENT_SECRET, config.getApiSecret());
request.addQuerystringParameter(OAuthConstants.CODE, verifier.getValue());
request.addQuerystringParameter(OAuthConstants.REDIRECT_URI, config.getCallback());
if(config.hasScope()) request.addQuerystringParameter(OAuthConstants.SCOPE, config.getScope());
Response response = request.send();
Response response = request.send(tuner);
return api.getAccessTokenExtractor().extract(response.getBody());
}




/**
* {@inheritDoc}
*/
public Token getRequestToken()
{
throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there");
}

/**
* {@inheritDoc}
*/
public Token getRequestToken(RequestTuner tuner)
{
throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there");
}

/**
* {@inheritDoc}
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/scribe/oauth/OAuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ public interface OAuthService
*/
public Token getRequestToken();

public Token getRequestToken(RequestTuner tuner);

/**
* Retrieve the access token
*
Expand All @@ -27,6 +29,8 @@ public interface OAuthService
*/
public Token getAccessToken(Token requestToken, Verifier verifier);

public Token getAccessToken(Token requestToken, Verifier verifier,RequestTuner tuner);

/**
* Signs am OAuth request
*
Expand Down