added 'debug' method to service builder
This commit is contained in:
1 parent
61c0b4cc9f
commit
0a63f935d2
8 files changed
+136
-42
No files matched your search
@@ -4,6 +4,7 @@ import java.util.*;
|
||||
|
||||
import org.scribe.builder.api.*;
|
||||
import org.scribe.model.*;
|
||||
import org.scribe.utils.*;
|
||||
|
||||
/**
|
||||
* OAuth 1.0a implementation of {@link OAuthService}
|
||||
@@ -34,12 +35,21 @@ public class OAuth10aServiceImpl implements OAuthService
|
||||
*/
|
||||
public Token getRequestToken()
|
||||
{
|
||||
config.log("obtaining request token from " + api.getRequestTokenEndpoint());
|
||||
OAuthRequest request = new OAuthRequest(api.getRequestTokenVerb(), api.getRequestTokenEndpoint());
|
||||
|
||||
config.log("setting oauth_callback to " + config.getCallback());
|
||||
request.addOAuthParameter(OAuthConstants.CALLBACK, config.getCallback());
|
||||
addOAuthParams(request, OAuthConstants.EMPTY_TOKEN);
|
||||
addSignature(request);
|
||||
appendSignature(request);
|
||||
|
||||
config.log("sending request...");
|
||||
Response response = request.send();
|
||||
return api.getRequestTokenExtractor().extract(response.getBody());
|
||||
String body = response.getBody();
|
||||
|
||||
config.log("response status code: " + response.getCode());
|
||||
config.log("response body: " + body);
|
||||
return api.getRequestTokenExtractor().extract(body);
|
||||
}
|
||||
|
||||
private void addOAuthParams(OAuthRequest request, Token token)
|
||||
@@ -51,6 +61,8 @@ public class OAuth10aServiceImpl implements OAuthService
|
||||
request.addOAuthParameter(OAuthConstants.VERSION, getVersion());
|
||||
if(config.hasScope()) request.addOAuthParameter(OAuthConstants.SCOPE, config.getScope());
|
||||
request.addOAuthParameter(OAuthConstants.SIGNATURE, getSignature(request, token));
|
||||
|
||||
config.log("appended additional OAuth parameters: " + MapUtils.toString(request.getOauthParameters()));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -58,11 +70,14 @@ public class OAuth10aServiceImpl implements OAuthService
|
||||
*/
|
||||
public Token getAccessToken(Token requestToken, Verifier verifier)
|
||||
{
|
||||
config.log("obtaining access token from " + api.getAccessTokenEndpoint());
|
||||
OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
|
||||
request.addOAuthParameter(OAuthConstants.TOKEN, requestToken.getToken());
|
||||
request.addOAuthParameter(OAuthConstants.VERIFIER, verifier.getValue());
|
||||
|
||||
config.log("setting token to: " + requestToken + " and verifier to: " + verifier);
|
||||
addOAuthParams(request, requestToken);
|
||||
addSignature(request);
|
||||
appendSignature(request);
|
||||
Response response = request.send();
|
||||
return api.getAccessTokenExtractor().extract(response.getBody());
|
||||
}
|
||||
@@ -72,9 +87,12 @@ public class OAuth10aServiceImpl implements OAuthService
|
||||
*/
|
||||
public void signRequest(Token token, OAuthRequest request)
|
||||
{
|
||||
config.log("signing request: " + request.getCompleteUrl());
|
||||
request.addOAuthParameter(OAuthConstants.TOKEN, token.getToken());
|
||||
|
||||
config.log("setting token to: " + token);
|
||||
addOAuthParams(request, token);
|
||||
addSignature(request);
|
||||
appendSignature(request);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -95,19 +113,28 @@ public class OAuth10aServiceImpl implements OAuthService
|
||||
|
||||
private String getSignature(OAuthRequest request, Token token)
|
||||
{
|
||||
config.log("generating signature...");
|
||||
String baseString = api.getBaseStringExtractor().extract(request);
|
||||
return api.getSignatureService().getSignature(baseString, config.getApiSecret(), token.getSecret());
|
||||
String signature = api.getSignatureService().getSignature(baseString, config.getApiSecret(), token.getSecret());
|
||||
|
||||
config.log("base string is: " + baseString);
|
||||
config.log("signature is: " + signature);
|
||||
return signature;
|
||||
}
|
||||
|
||||
private void addSignature(OAuthRequest request)
|
||||
private void appendSignature(OAuthRequest request)
|
||||
{
|
||||
switch (config.getSignatureType())
|
||||
{
|
||||
case Header:
|
||||
config.log("using Http Header signature");
|
||||
|
||||
String oauthHeader = api.getHeaderExtractor().extract(request);
|
||||
request.addHeader(OAuthConstants.HEADER, oauthHeader);
|
||||
break;
|
||||
case QueryString:
|
||||
config.log("using Querystring signature");
|
||||
|
||||
for (Map.Entry<String, String> entry : request.getOauthParameters().entrySet())
|
||||
{
|
||||
request.addQuerystringParameter(entry.getKey(), entry.getValue());
|
||||
|
||||
Reference in new issue
Block a user